[Pkg-xfce-commits] r4304 - in goodies/branches/experimental/xfce4-cellmodem-plugin/debian: . patches

Sun Oct 17 11:31:07 UTC 2010

Author: corsac
Date: 2010-10-17 11:31:03 +0000 (Sun, 17 Oct 2010)
New Revision: 4304

Added:
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/01_typo-linking.patch
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/02_explicit-linking-to-libxfcegui4.patch
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules
Log:
  - add build-dep on intltool and xfce4-dev-tools in order to
    run xdt-autogen after patching configure.ac/Makefile.am.
* debian/patches:
  - 01_explicit-linking-to-libxfcegui4 and 02_typo-linking added, fix
    linking with libxfcegui4 before port to Xfce 4.7 and libxfce4ui is done.

Modified: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog
===================================================================

--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog	2010-10-17 09:54:02 UTC (rev 4303)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog	2010-10-17 11:31:03 UTC (rev 4304)
@@ -10,12 +10,17 @@
     - add myself to Uploaders.
     - update debhelper build dep to 7.0.50~ for dh7 rules and overrides.
     - add build-dep on libxfcegui4-dev.
+    - add build-dep on intltool and xfce4-dev-tools in order to
+      run xdt-autogen after patching configure.ac/Makefile.am.
   * Switch to 3.0 (quilt) source format.
   * Update standards version to 3.9.1.
   * debian/rules:
     - switch to dh 7 rules
+  * debian/patches:
+    - 01_explicit-linking-to-libxfcegui4 and 02_typo-linking added, fix
+      linking with libxfcegui4 before port to Xfce 4.7 and libxfce4ui is done.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 11:52:36 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 12:13:49 +0200
 
 xfce4-cellmodem-plugin (0.0.5-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control	2010-10-17 09:54:02 UTC (rev 4303)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control	2010-10-17 11:31:03 UTC (rev 4304)
@@ -4,7 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni at debian.org>, 
  Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, libusb-dev, libxml-parser-perl, pkg-config, xfce4-panel-dev, libxfcegui4-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, libusb-dev,
+ libxml-parser-perl, pkg-config, xfce4-panel-dev, libxfcegui4-dev,
+ intltool, xfce4-dev-tools
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
 Vcs-Svn: svn://svn.debian.org/svn/pkg-xfce/goodies/trunk/xfce4-cellmodem-plugin/

Added: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/01_typo-linking.patch
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/01_typo-linking.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/01_typo-linking.patch	2010-10-17 11:31:03 UTC (rev 4304)
@@ -0,0 +1,12 @@
+diff -ur xfce4-cellmodem-plugin-0.0.5.orig/panel-plugin/Makefile.am xfce4-cellmodem-plugin-0.0.5/panel-plugin/Makefile.am
+--- xfce4-cellmodem-plugin-0.0.5.orig/panel-plugin/Makefile.am	2007-01-16 21:58:53.000000000 +0200
++++ xfce4-cellmodem-plugin-0.0.5/panel-plugin/Makefile.am	2007-02-27 22:55:19.000000000 +0200
+@@ -5,7 +5,7 @@
+         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ 	@LIBXFCE4PANEL_CFLAGS@
+ 
+-xfce4_cellmodem_plugin_LDFLAGS = \
++xfce4_cellmodem_plugin_LDADD = \
+ 	@LIBXFCE4PANEL_LIBS@ 
+ 
+ xfce4_cellmodem_plugin_SOURCES = \

Added: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/02_explicit-linking-to-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/02_explicit-linking-to-libxfcegui4.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/02_explicit-linking-to-libxfcegui4.patch	2010-10-17 11:31:03 UTC (rev 4304)
@@ -0,0 +1,31 @@
+xfce4_cellmodem_plugin-pin_helper.o: In function `pin_helper_pin_entry_callback':
+pin_helper.c:(.text+0xa6): undefined reference to `xfce_warn'
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,8 @@
+ AC_CHECK_FUNCS([vasprintf])
+ 
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
++
+ XDT_I18N([cs pt])
+ 
+ AC_ARG_ENABLE([debug],
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -3,10 +3,12 @@
+ 
+ xfce4_cellmodem_plugin_CFLAGS = \
+         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_cellmodem_plugin_LDADD = \
+-	@LIBXFCE4PANEL_LIBS@ 
++	@LIBXFCE4PANEL_LIBS@ \
++	@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_cellmodem_plugin_SOURCES = \
+ 	cellmodem.c modem_driver.c \

Added: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/patches/series	2010-10-17 11:31:03 UTC (rev 4304)
@@ -0,0 +1,2 @@
+01_typo-linking.patch
+02_explicit-linking-to-libxfcegui4.patch

Modified: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules	2010-10-17 09:54:02 UTC (rev 4303)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules	2010-10-17 11:31:03 UTC (rev 4304)
@@ -6,6 +6,7 @@
 #LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
 override_dh_auto_configure:
+	xdt-autogen
 	dh_auto_configure -- --mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib
 


