[Pkg-xfce-commits] r6879 - in desktop/branches/experimental/libxfcegui4/debian: . patches

[Lionel Le Folgoc]

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

Removed:
   desktop/branches/experimental/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch
   desktop/branches/experimental/libxfcegui4/debian/patches/03_fix-link-lm.patch
Modified:
   desktop/branches/experimental/libxfcegui4/debian/changelog
   desktop/branches/experimental/libxfcegui4/debian/control
   desktop/branches/experimental/libxfcegui4/debian/patches/series
Log:
* New upstream stable release.
* debian/patches:
  - 01_xfce-exec-use-thunar.patch: dropped, now use exo-open.
  - 03_fix-link-lm.patch: dropped, included upstream.
* debian/control: revert to unversioned libxfce4util-dev, bump required
  version to >= 4.10.0.

Modified: desktop/branches/experimental/libxfcegui4/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/changelog	2012-04-30 11:59:49 UTC (rev 6878)
+++ desktop/branches/experimental/libxfcegui4/debian/changelog	2012-04-30 12:03:04 UTC (rev 6879)
@@ -1,3 +1,14 @@
+libxfcegui4 (4.10.0-1) UNRELEASED; urgency=low
+
+  * New upstream stable release.
+  * debian/patches:
+    - 01_xfce-exec-use-thunar.patch: dropped, now use exo-open.
+    - 03_fix-link-lm.patch: dropped, included upstream.
+  * debian/control: revert to unversioned libxfce4util-dev, bump required
+    version to >= 4.10.0.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 30 Apr 2012 13:30:24 +0200
+
 libxfcegui4 (4.9.0-1) experimental; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: desktop/branches/experimental/libxfcegui4/debian/control
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/control	2012-04-30 11:59:49 UTC (rev 6878)
+++ desktop/branches/experimental/libxfcegui4/debian/control	2012-04-30 12:03:04 UTC (rev 6879)
@@ -5,7 +5,7 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.10.6), 
- libxfce4util6-dev (>= 4.9.0), libxfconf-0-dev (>=4.8.0),
+ libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0),
  libstartup-notification0-dev, libglade2-dev, intltool, dpkg-dev (>= 1.16.1),
  xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.3
@@ -16,7 +16,7 @@
 Package: libxfcegui4-dev
 Section: libdevel
 Architecture: any
-Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util6-dev (>= 4.9.0),
+Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.10.0),
  libgtk2.0-dev, ${misc:Depends}
 Suggests: devhelp
 Description: Development files for libxfcegui4-4

Deleted: desktop/branches/experimental/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch	2012-04-30 11:59:49 UTC (rev 6878)
+++ desktop/branches/experimental/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch	2012-04-30 12:03:04 UTC (rev 6879)
@@ -1,17 +0,0 @@
-Descrption: xfce-exec calls xftree4 instead of thunar
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=4048
-
-diff --git xfce_4_4/libxfcegui4/xfce-exec.c b/branches/xfce_4_4/libxfcegui4/xfce-exec.c
-index 3d58cf4..bcfad09 100644
---- xfce_4_4/libxfcegui4/xfce-exec.c
-+++ xfce_4_4/libxfcegui4/xfce-exec.c
-@@ -218,7 +218,7 @@ xfce_exec_create_argv (const char *cmd, gboolean in_terminal, GError **error)
-         if (in_terminal)
-             argv[0] = g_strdup ("xfterm4");
- 	else
--	    argv[0] = g_strdup ("xftree4");
-+	    argv[0] = g_strdup ("thunar");
-         
-         argv[1] = realcmd;
-         argv[2] = NULL;

Deleted: desktop/branches/experimental/libxfcegui4/debian/patches/03_fix-link-lm.patch
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/patches/03_fix-link-lm.patch	2012-04-30 11:59:49 UTC (rev 6878)
+++ desktop/branches/experimental/libxfcegui4/debian/patches/03_fix-link-lm.patch	2012-04-30 12:03:04 UTC (rev 6879)
@@ -1,14 +0,0 @@
-Index: libxfcegui4-4.8.1/libxfcegui4/Makefile.am
-===================================================================
---- libxfcegui4-4.8.1.orig/libxfcegui4/Makefile.am	2011-09-05 21:06:48.451070643 +0200
-+++ libxfcegui4-4.8.1/libxfcegui4/Makefile.am	2011-09-05 21:07:08.935197556 +0200
-@@ -183,7 +183,8 @@
- 	$(LIBX11_LIBS)							\
- 	$(LIBXFCE4UTIL_LIBS)						\
- 	$(LIBSTARTUP_NOTIFICATION_LIBS)					\
--	$(PLATFORM_LIBS)
-+	$(PLATFORM_LIBS)						\
-+	-lm
- 
- libxfcegui4_la_CFLAGS =							\
- 	$(NETK_CFLAGS)							\

Modified: desktop/branches/experimental/libxfcegui4/debian/patches/series
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/patches/series	2012-04-30 11:59:49 UTC (rev 6878)
+++ desktop/branches/experimental/libxfcegui4/debian/patches/series	2012-04-30 12:03:04 UTC (rev 6879)
@@ -1,3 +1 @@
-01_xfce-exec-use-thunar.patch
 02_fix-menu-icons.patch
-03_fix-link-lm.patch