[Pkg-xfce-commits] r5256 - in goodies/trunk/xfce4-clipman-plugin: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Apr 2 03:42:17 UTC 2011
Author: corsac
Date: 2011-04-02 15:42:16 +0000 (Sat, 02 Apr 2011)
New Revision: 5256
Added:
goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch
Removed:
goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman-plugin.docs
goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman.docs
Modified:
goodies/trunk/xfce4-clipman-plugin/
goodies/trunk/xfce4-clipman-plugin/debian/changelog
goodies/trunk/xfce4-clipman-plugin/debian/control
goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
goodies/trunk/xfce4-clipman-plugin/debian/patches/series
goodies/trunk/xfce4-clipman-plugin/debian/rules
Log:
merge experimental branch to trunk
Property changes on: goodies/trunk/xfce4-clipman-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-clipman-plugin:4300-5255
/goodies/tags/xfce4-clipman-plugin/2:1.1.3-3:4106-4299
Modified: goodies/trunk/xfce4-clipman-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/changelog 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/changelog 2011-04-02 15:42:16 UTC (rev 5256)
@@ -1,21 +1,34 @@
+xfce4-clipman-plugin (2:1.1.3-4) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - add build-dep on libxfcegui4-dev.
+ - update standards version to 3.9.1.
+ - update dh build-dep to 7.0.50~ for overrides.
+ - add build-dep on hardening-includes.
+ * debian/rules:
+ - switch to dh7 tiny rules
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS
+ * Switch to 3.0 (quilt) source format.
+
+ [ Lionel Le Folgoc ]
+ * Port to exo 0.5.x:
+ - debian/patches/02_use-exo-1.patch: added.
+ - debian/patches/series: refreshed.
+ - debian/control: change libexo-0.3-dev b-dep to libexo-1-dev.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 17 Oct 2010 16:20:05 +0200
+
xfce4-clipman-plugin (2:1.1.3-3) unstable; urgency=low
- [ Lionel Le Folgoc ]
* debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch:
fix crash occurring on panel shutdown. lp: #532537
+ * debian/rules: include simple-patchsys.mk.
- [ Yves-Alexis Perez ]
- * Switch format to 3.0 (quilt).
- * debian/control:
- - add Lionel to Uploaders, with his permission.
- - update standards version to 3.8.4.
- - update debhelper build-dep for overrides.
- * debian/rules:
- - switch to dh7 rules.
- * debian/*.docs: add docs using dh_installdocs.
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 28 Mar 2010 16:00:50 +0200
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 30 May 2010 19:44:10 +0200
-
xfce4-clipman-plugin (2:1.1.3-2) unstable; urgency=low
* debian/rules:
Modified: goodies/trunk/xfce4-clipman-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/control 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/control 2011-04-02 15:42:16 UTC (rev 5256)
@@ -6,9 +6,10 @@
Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~),
xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, intltool,
- libx11-dev, pkg-config, libgtk2.0-dev, libexo-0.3-dev,
- libxfconf-0-dev (>= 4.6.0), libglade2-dev, libunique-dev
-Standards-Version: 3.8.4
+ libx11-dev, pkg-config, libgtk2.0-dev, libexo-1-dev,
+ libxfconf-0-dev (>= 4.6.0), libglade2-dev, libunique-dev, libxfcegui4-dev,
+ hardening-includes
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/
Modified: goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch 2011-04-02 15:42:16 UTC (rev 5256)
@@ -35,6 +35,3 @@
for (; list->next != NULL; list = list->next) {
sdata = list->data;
gtk_target_list_add (target_list, sdata->target, 0, 0);
---
-1.6.3.3
-
Copied: goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch (from rev 5255, goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch)
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch (rev 0)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch 2011-04-02 15:42:16 UTC (rev 5256)
@@ -0,0 +1,70 @@
+Description: Fix build with exo 0.5.x
+Origin: backport, http://bugzilla.xfce.org/attachment.cgi?id=3201
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6853
+--- xfce4-clipman-plugin-1.1.3.orig/configure
++++ xfce4-clipman-plugin-1.1.3/configure
+@@ -12435,26 +12435,26 @@ $as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&
+ fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-0.3 >= 0.3.0" >&5
+-$as_echo_n "checking for exo-0.3 >= 0.3.0... " >&6; }
+- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
+- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.5.0" >&5
++$as_echo_n "checking for exo-1 >= 0.5.0... " >&6; }
++ if $PKG_CONFIG "--atleast-version=0.5.0" "exo-1" >/dev/null 2>&1; then
++ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5
+ $as_echo "$EXO_VERSION" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_CFLAGS" >&5
+ $as_echo_n "checking EXO_CFLAGS... " >&6; }
+- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
++ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_CFLAGS" >&5
+ $as_echo "$EXO_CFLAGS" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_LIBS" >&5
+ $as_echo_n "checking EXO_LIBS... " >&6; }
+- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
++ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5
+ $as_echo "$EXO_LIBS" >&6; }
+
+- EXO_REQUIRED_VERSION=0.3.0
++ EXO_REQUIRED_VERSION=0.5.0
+
+
+
+@@ -12462,15 +12462,15 @@ $as_echo "$EXO_LIBS" >&6; }
+
+
+
+- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
+- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
++ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
++ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+ $as_echo "found, but $xdt_cv_version" >&6; }
+
+
+- echo "*** The required package exo-0.3 was found on your system,"
++ echo "*** The required package exo-1 was found on your system,"
+ echo "*** but the installed version ($xdt_cv_version) is too old."
+- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
++ echo "*** Please upgrade exo-1 to atleast version 0.5.0, or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+ echo "*** the new version of the package in a nonstandard prefix so"
+ echo "*** pkg-config is able to find it."
+@@ -12481,8 +12481,8 @@ $as_echo "found, but $xdt_cv_version" >&
+ $as_echo "not found" >&6; }
+
+
+- echo "*** The required package exo-0.3 was not found on your system."
+- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
++ echo "*** The required package exo-1 was not found on your system."
++ echo "*** Please install exo-1 (atleast version 0.5.0) or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you"
+ echo "*** installed the package in a nonstandard prefix so that"
+ echo "*** pkg-config is able to find it."
Modified: goodies/trunk/xfce4-clipman-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/series 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/series 2011-04-02 15:42:16 UTC (rev 5256)
@@ -1 +1,2 @@
0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
+02_use-exo-1.patch
Modified: goodies/trunk/xfce4-clipman-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/rules 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/rules 2011-04-02 15:42:16 UTC (rev 5256)
@@ -1,16 +1,18 @@
#!/usr/bin/make -f
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- else
- CFLAGS += -O2
-endif
+include /usr/share/hardening-includes/hardening.make
-override_dh_install:
- -rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.a
- -rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.la
- dh_install --fail-missing
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+= -fPIC $(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+export CFLAGS LDFLAGS
+
%:
dh $@
+
+override_dh_auto_install:
+ -rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.a
+ -rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.la
+ dh_auto_install
Deleted: goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman-plugin.docs
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman-plugin.docs 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman-plugin.docs 2011-04-02 15:42:16 UTC (rev 5256)
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO
Deleted: goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman.docs
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman.docs 2011-04-02 15:06:45 UTC (rev 5255)
+++ goodies/trunk/xfce4-clipman-plugin/debian/xfce4-clipman.docs 2011-04-02 15:42:16 UTC (rev 5256)
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO
More information about the Pkg-xfce-commits
mailing list