[Pkg-xfce-commits] r6626 - in desktop/branches/experimental/gtk2-engines-xfce/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-04-05 22:25:19 +0000 (Thu, 05 Apr 2012)
New Revision: 6626

Added:
   desktop/branches/experimental/gtk2-engines-xfce/debian/patches/01_link-against-libm.patch
   desktop/branches/experimental/gtk2-engines-xfce/debian/patches/series
Modified:
   desktop/branches/experimental/gtk2-engines-xfce/debian/changelog
   desktop/branches/experimental/gtk2-engines-xfce/debian/control
   desktop/branches/experimental/gtk2-engines-xfce/debian/rules
Log:
  - run xdt-autogen since we patch configure.in/Makefile.am files
  - pass --fail-missing to dh_install.
* debian/patches:
  - 01_link-against-libm.patch: added, fix missing -lm for the gtk2 engine.
* debian/control: add b-dep on libgtk-3-dev (>= 3.0.0), xfce4-dev-tools,
  autoconf, automake and libtool.

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2012-04-05 17:35:14 UTC (rev 6625)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2012-04-05 22:25:19 UTC (rev 6626)
@@ -1,10 +1,15 @@
-gtk2-engines-xfce (2.99.1-1) UNRELEASED; urgency=low
+gtk2-engines-xfce (2.99.2-1) UNRELEASED; urgency=low
 
   * New upstream development release, introducing gtk+3.0 support.
   * Add a new gtk3-engines-xfce binary package for the new ported themes.
   * debian/rules:
+    - run xdt-autogen since we patch configure.in/Makefile.am files
     - updated the path to clean up .la files.
-  * debian/control: add b-dep on libgtk-3-dev (>= 3.0.0).
+    - pass --fail-missing to dh_install.
+  * debian/patches:
+    - 01_link-against-libm.patch: added, fix missing -lm for the gtk2 engine.
+  * debian/control: add b-dep on libgtk-3-dev (>= 3.0.0), xfce4-dev-tools,
+    autoconf, automake and libtool.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 12 Feb 2012 17:23:03 +0100
 

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/control	2012-04-05 17:35:14 UTC (rev 6625)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/control	2012-04-05 22:25:19 UTC (rev 6626)
@@ -5,7 +5,7 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.24.0),
  libgtk2.0-dev (>= 2.20.0), libgtk-3-dev (>= 3.0.0), libx11-dev (>> 2:1.0.0-6),
- hardening-includes
+ hardening-includes, xfce4-dev-tools, autoconf, automake, libtool
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/

Added: desktop/branches/experimental/gtk2-engines-xfce/debian/patches/01_link-against-libm.patch
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/patches/01_link-against-libm.patch	                        (rev 0)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/patches/01_link-against-libm.patch	2012-04-05 22:25:19 UTC (rev 6626)
@@ -0,0 +1,39 @@
+Description: Link the gtk2 engine to libm
+Author: Lionel Le Folgoc <mrpouit at gmail.com>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8638
+Forwarded: yes, https://bugzilla.xfce.org/attachment.cgi?id=4303
+
+--- gtk2-engines-xfce-2.99.2.orig/configure.in
++++ gtk2-engines-xfce-2.99.2/configure.in
+@@ -67,6 +67,9 @@ dnl *** Check for optional packages ***
+ dnl ***********************************
+ XDT_CHECK_OPTIONAL_PACKAGE([GTK2], [gtk+-2.0], [2.20.0], [gtk2], [Gtk 2 theme engine])
+ XDT_CHECK_OPTIONAL_PACKAGE([GTK3], [gtk+-3.0], [3.0.0], [gtk3], [Gtk 3 theme engine])
++dnl libm is needed for floor() and ceil()
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
+ 
+ GTK_SUBDIRS=""
+ if test x"$GTK2_FOUND" = x"yes"
+@@ -80,9 +83,6 @@ then
+   GTK3_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+   AC_SUBST([GTK3_BINARY_VERSION])
+   GTK_SUBDIRS="$GTK_SUBDIRS gtk-3.0"
+-  dnl libm is needed for floor() and ceil()
+-  AC_CHECK_LIBM
+-  AC_SUBST(LIBM)
+ fi
+ AC_SUBST([GTK_SUBDIRS])
+ 
+--- gtk2-engines-xfce-2.99.2.orig/gtk-2.0/Makefile.am
++++ gtk2-engines-xfce-2.99.2/gtk-2.0/Makefile.am
+@@ -30,7 +30,8 @@ libxfce_la_CFLAGS = \
+ libxfce_la_LIBADD = \
+ 	$(GTK2_LIBS) \
+ 	$(GLIB_LIBS) \
+-	$(GMODULE_LIBS)
++	$(GMODULE_LIBS) \
++	$(LIBM)
+ 
+ libxfce_la_LDFLAGS = \
+ 	-module \

Added: desktop/branches/experimental/gtk2-engines-xfce/debian/patches/series
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/patches/series	2012-04-05 22:25:19 UTC (rev 6626)
@@ -0,0 +1 @@
+01_link-against-libm.patch

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2012-04-05 17:35:14 UTC (rev 6625)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2012-04-05 22:25:19 UTC (rev 6626)
@@ -9,10 +9,12 @@
 
 export CFLAGS LDFLAGS
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
 override_dh_install:
-	rm -f debian/tmp/usr/lib/gtk-2.0/2.10.0/engines/libxfce.la
-	rm -f debian/tmp/usr/lib/gtk-3.0/3.0.0/theming-engines/libxfce.la
-	dh_install
+	dh_install --fail-missing -X .la
 
 %:
 	dh $@