[Pkg-xfce-commits] r4734 - in goodies/branches/experimental/xfce4-places-plugin/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Mon Dec 20 10:06:35 UTC 2010
Author: mrpouit-guest
Date: 2010-12-20 10:06:33 +0000 (Mon, 20 Dec 2010)
New Revision: 4734
Added:
goodies/branches/experimental/xfce4-places-plugin/debian/patches/02_fix-implicit-dso-linking.patch
Modified:
goodies/branches/experimental/xfce4-places-plugin/debian/changelog
goodies/branches/experimental/xfce4-places-plugin/debian/control
goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch
goodies/branches/experimental/xfce4-places-plugin/debian/patches/series
goodies/branches/experimental/xfce4-places-plugin/debian/rules
Log:
- add xfce4-dev-tools, automake, autoconf and libtool to b-deps for the
xdt-autogen call.
* debian/rules:
- add .pc files to POTFILES.skip, and clean it after the build.
- call xdt-autogen, and clean up autogenerated files after the build.
- 02_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/changelog 2010-12-20 09:52:50 UTC (rev 4733)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/changelog 2010-12-20 10:06:33 UTC (rev 4734)
@@ -13,12 +13,17 @@
[ Lionel Le Folgoc ]
* debian/control:
- b-dep on libexo-1-dev instead of libexo-0.3-dev.
+ - add xfce4-dev-tools, automake, autoconf and libtool to b-deps for the
+ xdt-autogen call.
- add myself to Uploaders.
* Switch to 3.0 (quilt).
- * debian/rules: add .pc files to POTFILES.skip, and clean it after the build.
+ * debian/rules:
+ - add .pc files to POTFILES.skip, and clean it after the build.
+ - call xdt-autogen, and clean up autogenerated files after the build.
* debian/patches:
- 01_port-to-exo-1.patch: added, replaces a dropped exo symbol by a gtk
equivalent.
+ - 02_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
- series: added.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 07 Nov 2010 12:27:21 +0100
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/control 2010-12-20 09:52:50 UTC (rev 4733)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/control 2010-12-20 10:06:33 UTC (rev 4734)
@@ -8,7 +8,7 @@
libgtk2.0-dev (>= 2.6.0), libxfce4util-dev (>= 4.4.2),
xfce4-panel-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2),
libthunar-vfs-1-dev (>= 0.4.0), libexo-1-dev (>= 0.5.0),
- libxml-parser-perl, intltool
+ libxml-parser-perl, intltool, xfce4-dev-tools, automake, autoconf, libtool
Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
Vcs-Svn: svn://svn.debian.org/svn/pkg-xfce/goodies/trunk/xfce4-places-plugin/
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch 2010-12-20 09:52:50 UTC (rev 4733)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch 2010-12-20 10:06:33 UTC (rev 4734)
@@ -1,73 +1,6 @@
Description: Port to exo-1
Origin: backport, http://bugzilla.xfce.org/show_bug.cgi?id=5754
Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5754
---- xfce4-places-plugin-1.2.0.orig/configure
-+++ xfce4-places-plugin-1.2.0/configure
-@@ -21406,26 +21406,26 @@ echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSIO
- fi
-
-
-- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.1.1" >&5
--echo $ECHO_N "checking for exo-0.3 >= 0.3.1.1... $ECHO_C" >&6; }
-- if $PKG_CONFIG "--atleast-version=0.3.1.1" "exo-0.3" >/dev/null 2>&1; then
-- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
-+ { echo "$as_me:$LINENO: checking for exo-1 >= 0.5.0" >&5
-+echo $ECHO_N "checking for exo-1 >= 0.5.0... $ECHO_C" >&6; }
-+ if $PKG_CONFIG "--atleast-version=0.5.0" "exo-1" >/dev/null 2>&1; then
-+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
- { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
- echo "${ECHO_T}$EXO_VERSION" >&6; }
-
- { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
- echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
-- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
-+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
- { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
- echo "${ECHO_T}$EXO_CFLAGS" >&6; }
-
- { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
- echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
-- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
-+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
- { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
- echo "${ECHO_T}$EXO_LIBS" >&6; }
-
-- EXO_REQUIRED_VERSION=0.3.1.1
-+ EXO_REQUIRED_VERSION=0.5.0
-
-
-
-@@ -21433,15 +21433,15 @@ echo "${ECHO_T}$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"`
- { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
- echo "${ECHO_T}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.1.1, 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."
-@@ -21452,8 +21452,8 @@ echo "${ECHO_T}found, but $xdt_cv_versio
- echo "${ECHO_T}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.1.1) 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."
--- xfce4-places-plugin-1.2.0.orig/panel-plugin/support.c
+++ xfce4-places-plugin-1.2.0/panel-plugin/support.c
@@ -48,14 +48,11 @@
@@ -98,3 +31,14 @@
}
/**
+--- xfce4-places-plugin-1.2.0.orig/configure.in
++++ xfce4-places-plugin-1.2.0/configure.in
+@@ -25,7 +25,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxf
+ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
+ XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2])
+-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
++XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
+
+ dnl check for optional packages/versions
+ XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes])
Added: goodies/branches/experimental/xfce4-places-plugin/debian/patches/02_fix-implicit-dso-linking.patch
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/patches/02_fix-implicit-dso-linking.patch (rev 0)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/patches/02_fix-implicit-dso-linking.patch 2010-12-20 10:06:33 UTC (rev 4734)
@@ -0,0 +1,64 @@
+Description: Upstream changes introduced in version 1.2.0-2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ xfce4-places-plugin (1.2.0-2) UNRELEASED; urgency=low
+ .
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - switch to xfce section.
+ - add exo-utils versionned dependencies since exo-mount is gone in 0.5.
+ - update standards version to 3.9.1.
+ * debian/watch edited to track Xfce archive reorganisation.
+ * debian/rules:
+ - switch to dh7 tiny rules.
+ * debian/compat bumped to 7.
+ .
+ [ Lionel Le Folgoc ]
+ * debian/control:
+ - b-dep on libexo-1-dev instead of libexo-0.3-dev.
+ - add myself to Uploaders.
+ * Switch to 3.0 (quilt).
+ * debian/rules: add .pc files to POTFILES.skip, and clean it after the build.
+ * debian/patches:
+ - 01_port-to-exo-1.patch: added, replaces a dropped exo symbol by a gtk
+ equivalent.
+ - series: added.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Yves-Alexis Perez <corsac at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- xfce4-places-plugin-1.2.0.orig/configure.in
++++ xfce4-places-plugin-1.2.0/configure.in
+@@ -26,6 +26,7 @@ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfc
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
+ XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2])
+ XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
++XDT_CHECK_LIBX11()
+
+ dnl check for optional packages/versions
+ XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes])
+--- xfce4-places-plugin-1.2.0.orig/panel-plugin/Makefile.am
++++ xfce4-places-plugin-1.2.0/panel-plugin/Makefile.am
+@@ -59,6 +59,7 @@ xfce4_places_plugin_LDADD = \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4PANEL_LIBS) \
++ $(LIBX11_LIBS) \
+ @THUNAR_VFS_LIBS@
+
+
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/patches/series 2010-12-20 09:52:50 UTC (rev 4733)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/patches/series 2010-12-20 10:06:33 UTC (rev 4734)
@@ -1 +1,2 @@
01_port-to-exo-1.patch
+02_fix-implicit-dso-linking.patch
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/rules 2010-12-20 09:52:50 UTC (rev 4733)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/rules 2010-12-20 10:06:33 UTC (rev 4734)
@@ -2,11 +2,14 @@
override_dh_auto_configure:
find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+ NOCONFIGURE=1 xdt-autogen
dh_auto_configure
override_dh_auto_clean:
- rm -f po/POTFILES.skip
dh_auto_clean
+ rm -f $$(find -name 'Makefile.in*')
+ rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
+ rm -f ltmain.sh missing mkinstalldirs po/POTFILES.skip
%:
dh $@
More information about the Pkg-xfce-commits
mailing list