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

Sat Dec 17 08:07:30 UTC 2011

Author: mrpouit-guest
Date: 2011-12-17 20:07:30 +0000 (Sat, 17 Dec 2011)
New Revision: 6261

Added:
   desktop/branches/experimental/gtk2-engines-xfce/debian/gtk2-engines-xfce.install
   desktop/branches/experimental/gtk2-engines-xfce/debian/gtk3-engines-xfce.install
   desktop/branches/experimental/gtk2-engines-xfce/debian/patches/
   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:
* New upstream unstable release (2.9.0).
* New upstream development release (2.99.0), introducing gtk+3.0 support.
* Add a new gtk3-engines-xfce binary package for the new ported themes.
* debian/patches:
  - 01_link-against-libm.patch: added, fix missing -lm for the gtk3 engine.
  - series: apply the above patch.
* 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), xfce4-dev-tools,
  autoconf, automake and libtool.

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/changelog
===================================================================

--- desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2011-12-17 19:11:04 UTC (rev 6260)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2011-12-17 20:07:30 UTC (rev 6261)
@@ -1,10 +1,23 @@
-gtk2-engines-xfce (2.9.0-1) experimental; urgency=low
+gtk2-engines-xfce (2.99.0-1) experimental; urgency=low
 
-  * New upstream unstable release.
+  [ Yves-Alexis Perez ]
+  * New upstream unstable release (2.9.0).
   * debian/copyright updated.
   * debian/copyright:
     - build-dep refreshed for new upstream release.
 
+  [ Lionel Le Folgoc ]
+  * New upstream development release (2.99.0), introducing gtk+3.0 support.
+  * Add a new gtk3-engines-xfce binary package for the new ported themes.
+  * debian/patches:
+    - 01_link-against-libm.patch: added, fix missing -lm for the gtk3 engine.
+    - series: apply the above patch.
+  * 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), xfce4-dev-tools,
+    autoconf, automake and libtool.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 18 Nov 2011 16:58:57 +0100
 
 gtk2-engines-xfce (2.8.1-3) unstable; urgency=low

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/control	2011-12-17 19:11:04 UTC (rev 6260)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/control	2011-12-17 20:07:30 UTC (rev 6261)
@@ -4,7 +4,8 @@
 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 (>= 7.0.50~), libglib2.0-dev (>= 2.24.0),
- libgtk2.0-dev (>= 2.20.0), libx11-dev (>> 2:1.0.0-6), hardening-includes
+ libgtk2.0-dev (>= 2.20.0), libgtk-3-dev (>= 3.0.0), libx11-dev (>> 2:1.0.0-6),
+ 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/
@@ -19,3 +20,12 @@
  This package contains a theme engine allowing users to apply various GTK2.0
  themes to Xfce. It also contains some ready themes, but users are of course
  free to use other themes or design their own.
+
+Package: gtk3-engines-xfce
+Section: xfce
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: GTK+-3.0 theme engine for Xfce
+ This package contains a theme engine allowing users to apply various GTK3.0
+ themes to Xfce. It also contains some ready themes, but users are of course
+ free to use other themes or design their own.

Added: desktop/branches/experimental/gtk2-engines-xfce/debian/gtk2-engines-xfce.install
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/gtk2-engines-xfce.install	                        (rev 0)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/gtk2-engines-xfce.install	2011-12-17 20:07:30 UTC (rev 6261)
@@ -0,0 +1,2 @@
+usr/lib/gtk-2.0
+usr/share/themes/*/gtk-2.0

Added: desktop/branches/experimental/gtk2-engines-xfce/debian/gtk3-engines-xfce.install
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/gtk3-engines-xfce.install	                        (rev 0)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/gtk3-engines-xfce.install	2011-12-17 20:07:30 UTC (rev 6261)
@@ -0,0 +1,2 @@
+usr/lib/gtk-3.0
+usr/share/themes/*/gtk-3.0

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	2011-12-17 20:07:30 UTC (rev 6261)
@@ -0,0 +1,44 @@
+From 031abafab55cff066c83528eca5c1fdcf2f9db2e Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <lionel at lefolgoc.net>
+Date: Sat, 17 Dec 2011 20:38:14 +0100
+Subject: Link against libm for floor() and ceil()
+
+ Slightly updated for Debian to apply cleanly, as configure.in.in doesn't exist,
+ we patch configure.in directly instead.
+
+---
+ configure.in.in     |    3 +++
+ gtk-3.0/Makefile.am |    3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d917580..b6d2125 100644
+--- a/configure.in
++++ b/configure.in
+@@ -75,6 +75,9 @@ 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])
+ 
+diff --git a/gtk-3.0/Makefile.am b/gtk-3.0/Makefile.am
+index 49091d9..e5ca000 100644
+--- a/gtk-3.0/Makefile.am
++++ b/gtk-3.0/Makefile.am
+@@ -29,7 +29,8 @@ libxfce_la_CFLAGS = \
+ libxfce_la_LIBADD = \
+ 	$(GTK3_LIBS) \
+ 	$(GLIB_LIBS) \
+-	$(GMODULE_LIBS)
++	$(GMODULE_LIBS) \
++	$(LIBM)
+ 
+ libxfce_la_LDFLAGS = \
+ 	-module \
+-- 
+1.7.7.3
+

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	2011-12-17 20:07:30 UTC (rev 6261)
@@ -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	2011-12-17 19:11:04 UTC (rev 6260)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2011-12-17 20:07:30 UTC (rev 6261)
@@ -9,9 +9,13 @@
 
 export CFLAGS LDFLAGS
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
 override_dh_install:
-	rm -f debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.a
-	rm -f debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.la
+	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
 
 %:


