[Pkg-xfce-commits] r5996 - in desktop/trunk/exo/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-06 05:24:47 +0000 (Tue, 06 Sep 2011)
New Revision: 5996

Added:
   desktop/trunk/exo/debian/patches/01_fix-link-lm.patch
   desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch
   desktop/trunk/exo/debian/patches/series
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/rules
Log:
* debian/patches:
  - 01_fix-link-lm added, explicit link against lm.           closes: #640435
* debian/control:
  - add build-dep on xfce4-dev-tools, libtool and gtk-doc-tools.
* debian/rules:
  - run xdt-autogen before configure.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2011-09-06 05:14:57 UTC (rev 5995)
+++ desktop/trunk/exo/debian/changelog	2011-09-06 05:24:47 UTC (rev 5996)
@@ -2,6 +2,12 @@
 
   * Include patch from Steve Langasek to make exo multi-arch ready, thanks to
     him!                                                        closes: #632486
+  * debian/patches:
+    - 01_fix-link-lm added, explicit link against lm.           closes: #640435
+  * debian/control:
+    - add build-dep on xfce4-dev-tools, libtool and gtk-doc-tools.
+  * debian/rules:
+    - run xdt-autogen before configure.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Jul 2011 21:57:18 +0200
 

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2011-09-06 05:14:57 UTC (rev 5995)
+++ desktop/trunk/exo/debian/control	2011-09-06 05:24:47 UTC (rev 5996)
@@ -4,9 +4,10 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 8.1.3), libxfce4util-dev (>= 4.8.0), 
+Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.8.0), 
  libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool, 
- hardening-includes, libglib2.0-dev (>= 2.27)
+ hardening-includes, libglib2.0-dev (>= 2.27),
+ xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Added: desktop/trunk/exo/debian/patches/01_fix-link-lm.patch
===================================================================
--- desktop/trunk/exo/debian/patches/01_fix-link-lm.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/01_fix-link-lm.patch	2011-09-06 05:24:47 UTC (rev 5996)
@@ -0,0 +1,14 @@
+Index: exo-0.6.2/exo/Makefile.am
+===================================================================
+--- exo-0.6.2.orig/exo/Makefile.am	2011-09-05 22:11:21.302991166 +0200
++++ exo-0.6.2/exo/Makefile.am	2011-09-05 22:26:13.416502894 +0200
+@@ -105,7 +105,8 @@
+ 	$(GIO_LIBS)							\
+ 	$(GTK_LIBS)							\
+ 	$(LIBX11_LIBS)							\
+-	$(LIBXFCE4UTIL_LIBS)
++	$(LIBXFCE4UTIL_LIBS)						\
++	-lm
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = exo-$(LIBEXO_VERSION_API).pc

Added: desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch
===================================================================
--- desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch	2011-09-06 05:24:47 UTC (rev 5996)
@@ -0,0 +1,20 @@
+Index: exo-0.6.2/tests/Makefile.am
+===================================================================
+--- exo-0.6.2.orig/tests/Makefile.am	2011-06-10 19:05:27.000000000 +0200
++++ exo-0.6.2/tests/Makefile.am	2011-09-06 07:13:52.064039427 +0200
+@@ -39,6 +39,7 @@
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_noop_LDADD =							\
++	$(GLIB_LIBS)							\
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_string_SOURCES =						\
+@@ -52,6 +53,7 @@
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_string_LDADD =							\
++	$(GLIB_LIBS)							\
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_icon_chooser_dialog_SOURCES =					\

Added: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/series	2011-09-06 05:24:47 UTC (rev 5996)
@@ -0,0 +1,2 @@
+01_fix-link-lm.patch
+02_fix-glib-link-test.patch

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2011-09-06 05:14:57 UTC (rev 5995)
+++ desktop/trunk/exo/debian/rules	2011-09-06 05:24:47 UTC (rev 5996)
@@ -19,6 +19,7 @@
 	dh $@
 
 override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --disable-gtk-doc --disable-python
 
 override_dh_install: