[Pkg-xfce-commits] r6004 - in desktop/branches/experimental/xfce4-session/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-09-10 13:01:44 +0000 (Sat, 10 Sep 2011)
New Revision: 6004

Added:
   desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch
Modified:
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/control
   desktop/branches/experimental/xfce4-session/debian/patches/series
   desktop/branches/experimental/xfce4-session/debian/rules
Log:
rebase with trunk

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2011-09-07 08:55:22 UTC (rev 6003)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2011-09-10 13:01:44 UTC (rev 6004)
@@ -1,11 +1,5 @@
-xfce4-session (4.8.1-4~exp1) UNRELEASED; urgency=low
+xfce4-session (4.8.1-5~exp1) UNRELEASED; urgency=low
 
-  [ Yves-Alexis Perez ]
-  * debian/README.Debian updated
-    - mention LightDM.
-    - fix path for xfsm-shutdown-helper.                        closes: #637197
-
-  [ Lionel Le Folgoc ]
   * debian/patches:
     - 05_force-xfsettingsd-start.patch: updated for xfce4-settings 4.9.0
       ('--force' has been changed to '--replace').
@@ -13,8 +7,22 @@
     - series: refreshed.
   * debian/control: bump xfce4-settings' dep to >= 4.9.0.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Aug 2011 13:59:29 +0200
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 10 Sep 2011 15:00:26 +0200
 
+xfce4-session (4.8.1-4) unstable; urgency=low
+
+  * debian/README.Debian updated
+    - mention LightDM.
+    - fix path for xfsm-shutdown-helper.                        closes: #637197
+  * debian/patches:
+    - 04_fix-missing-lm added, fix FTBFS.
+  * debian/control:
+    - add build-dep on xfce4-dev-tools and libtool.
+  * debian/rules:
+    - run xdt-autogen before configure.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 04 Sep 2011 21:51:37 +0200
+
 xfce4-session (4.8.1-3) unstable; urgency=low
 
   * debian/patches:

Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control	2011-09-07 08:55:22 UTC (rev 6003)
+++ desktop/branches/experimental/xfce4-session/debian/control	2011-09-10 13:01:44 UTC (rev 6004)
@@ -7,7 +7,7 @@
  fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0),
  libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libwnck-dev, 
  x11-xserver-utils, libxfconf-0-dev (>= 4.8.0), libglade2-dev, 
- intltool (>= 0.31), hardening-includes
+ intltool (>= 0.31), hardening-includes, xfce4-dev-tools, libtool
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/

Added: desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch	2011-09-10 13:01:44 UTC (rev 6004)
@@ -0,0 +1,12 @@
+diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
+index 96ae5c5..0e75249 100644
+--- a/engines/balou/Makefile.am
++++ b/engines/balou/Makefile.am
+@@ -29,6 +29,7 @@ libbalou_la_LDFLAGS =							\
+ 	-module
+ 
+ libbalou_la_LIBADD =							\
++	-lm															\
+ 	$(top_builddir)/libxfsm/libxfsm-4.6.la				\
+ 	$(LIBXFCE4UI_LIBS)						\
+ 	$(XFCONF_LIBS)

Modified: desktop/branches/experimental/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series	2011-09-07 08:55:22 UTC (rev 6003)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series	2011-09-10 13:01:44 UTC (rev 6004)
@@ -1,5 +1,6 @@
 01_correct_shadows.patch
 02_fix-fortune-path.patch
 03_dont-die-on-dbus-disconnect.patch
+04_fix-missing-lm.patch
 05_force-xfsettingsd-start.patch
 06_no-settings-helper-in-490.patch

Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules	2011-09-07 08:55:22 UTC (rev 6003)
+++ desktop/branches/experimental/xfce4-session/debian/rules	2011-09-10 13:01:44 UTC (rev 6004)
@@ -11,6 +11,7 @@
 
 
 override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;