[Pkg-xfce-commits] r6885 - in desktop/branches/experimental/thunar/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-04-30 12:39:04 +0000 (Mon, 30 Apr 2012)
New Revision: 6885

Removed:
   desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch
Modified:
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/control
   desktop/branches/experimental/thunar/debian/patches/series
   desktop/branches/experimental/thunar/debian/rules
Log:
* New upstream stable release.
* debian/patches:
  - 02_fix-link-gmodule.patch: dropped, included upstream.
* debian/control:
  - debian/control: revert to unversioned libxfce4util-dev, bump required
    versions for Xfce 4.10.
  - drop b-deps on xfce4-dev-tools, libtool, automake, autoconf and
    gtk-doc-tools, unneeded.

Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2012-04-30 12:30:04 UTC (rev 6884)
+++ desktop/branches/experimental/thunar/debian/changelog	2012-04-30 12:39:04 UTC (rev 6885)
@@ -1,3 +1,16 @@
+thunar (1.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream stable release.
+  * debian/patches:
+    - 02_fix-link-gmodule.patch: dropped, included upstream.
+  * debian/control:
+    - debian/control: revert to unversioned libxfce4util-dev, bump required
+      versions for Xfce 4.10.
+    - drop b-deps on xfce4-dev-tools, libtool, automake, autoconf and
+      gtk-doc-tools, unneeded.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 30 Apr 2012 14:31:29 +0200
+
 thunar (1.3.2-1) experimental; urgency=low
 
   * New upstream development release.

Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	2012-04-30 12:30:04 UTC (rev 6884)
+++ desktop/branches/experimental/thunar/debian/control	2012-04-30 12:39:04 UTC (rev 6885)
@@ -2,14 +2,13 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
+Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.6.0), libxml-parser-perl,
+Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.8.0), libxml-parser-perl,
  libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath,
  libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
- libxfce4util6-dev, libxfce4ui-1-dev (>= 4.9.0), libnotify-dev, 
- libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.8.0), libtdb-dev,
- xfce4-dev-tools, libtool, automake, autoconf, gtk-doc-tools
+ libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libnotify-dev,
+ libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.10.0), libtdb-dev,
 Standards-Version: 3.9.3
 Homepage: http://thunar.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/

Deleted: desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch	2012-04-30 12:30:04 UTC (rev 6884)
+++ desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch	2012-04-30 12:39:04 UTC (rev 6885)
@@ -1,32 +0,0 @@
-Description: Explicitly link with gmodule
-Author; Lionel Le Folgoc <mrpouit at ubuntu.com>
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8467
-
---- thunar-1.2.3.orig/configure.in
-+++ thunar-1.2.3/configure.in
-@@ -150,6 +150,7 @@ dnl ***********************************
- XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
-+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.10.0])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
- XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
---- thunar-1.2.3.orig/thunarx/Makefile.am
-+++ thunar-1.2.3/thunarx/Makefile.am
-@@ -49,6 +49,7 @@ libthunarx_2_la_SOURCES =						\
- libthunarx_2_la_CFLAGS =						\
- 	$(GLIB_CFLAGS)							\
- 	$(GIO_CFLAGS)							\
-+	$(GMODULE_CFLAGS)						\
- 	$(GTK_CFLAGS)							\
- 	$(PLATFORM_CFLAGS)
- 
-@@ -61,6 +62,7 @@ libthunarx_2_la_LDFLAGS =						\
- libthunarx_2_la_LIBADD =						\
- 	$(GLIB_LIBS)							\
- 	$(GIO_LIBS)							\
-+	$(GMODULE_LIBS)							\
- 	$(GTK_LIBS)
- 
- pkgconfigdir = $(libdir)/pkgconfig

Modified: desktop/branches/experimental/thunar/debian/patches/series
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/series	2012-04-30 12:30:04 UTC (rev 6884)
+++ desktop/branches/experimental/thunar/debian/patches/series	2012-04-30 12:39:04 UTC (rev 6885)
@@ -1,2 +1 @@
 01_support-non-multiarch-modules.patch
-02_fix-link-gmodule.patch

Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules	2012-04-30 12:30:04 UTC (rev 6884)
+++ desktop/branches/experimental/thunar/debian/rules	2012-04-30 12:39:04 UTC (rev 6885)
@@ -9,7 +9,6 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --enable-dbus --enable-startup-notification --enable-apr-plugin \
     --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin \
     --docdir=\$${prefix}/share/doc/thunar-data