[Pkg-xfce-commits] r6188 - in goodies/trunk/xfce4-smartbookmark-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-01 15:57:02 +0000 (Tue, 01 Nov 2011)
New Revision: 6188

Removed:
   goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch
   goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/fix-4.6-loading.patch
   goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog
Log:
* New upstream release.
* debian/patches:
  - fix-4.6-loading and 02_fix-linking dropped, included upstream.

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog	2011-11-01 15:45:41 UTC (rev 6187)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog	2011-11-01 15:57:02 UTC (rev 6188)
@@ -1,11 +1,17 @@
-xfce4-smartbookmark-plugin (0.4.2-5) UNRELEASED; urgency=low
+xfce4-smartbookmark-plugin (0.4.4-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches:
     - xubuntu-default-bts.patch: change the default bts link.
     - ubuntu.series: copy from series and add the extra vendor patch.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 19 Jun 2011 17:13:37 +0200
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/patches:
+    - fix-4.6-loading and 02_fix-linking dropped, included upstream.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 01 Nov 2011 16:53:53 +0100
+
 xfce4-smartbookmark-plugin (0.4.2-4) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Deleted: goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch	2011-11-01 15:45:41 UTC (rev 6187)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch	2011-11-01 15:57:02 UTC (rev 6188)
@@ -1,36 +0,0 @@
-Description: port to 4.7 panel by linking explicitely to libxfcegui4
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6939
-Author: Yves-Alexis Perez <corsac at debian.org>
-diff --git a/configure.ac b/configure.ac
-index 1ba88d4..cb344f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
- dnl Check for required packages
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- XDT_FEATURE_DEBUG()
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 30c058c..91d97d5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,11 +6,13 @@ plugin_LTLIBRARIES =							\
- libsmartbookmark_la_LDFLAGS =							\
- 	-O0		\
- 	-avoid-version							\
--	-module						\
-+	-module
-+
-+libsmartbookmark_la_LIBADD = \
- 	@LIBXFCE4PANEL_LIBS@ \
- 	@LIBXFCEGUI4_LIBS@	\
- 	@GDK_LIBS@	\
--	@LIBX11_LDFLAGS@
-+	@LIBX11_LIBS@
- 
- libsmartbookmark_la_SOURCES =							\
- 	smartbookmark.c

Deleted: goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/fix-4.6-loading.patch
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/fix-4.6-loading.patch	2011-11-01 15:45:41 UTC (rev 6187)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/fix-4.6-loading.patch	2011-11-01 15:57:02 UTC (rev 6188)
@@ -1,15 +0,0 @@
-Description: fix plugin loading under Xfce 4.6
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6940
-Index: xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in
-===================================================================
---- xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.desktop.in.in	2006-08-12 19:41:44.000000000 +0200
-+++ xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in	2010-11-06 17:18:35.000000000 +0100
-@@ -4,5 +4,6 @@
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
- Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+X-XFCE-Module=smartbookmark
-+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
- X-XFCE-Unique=false

Deleted: goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series	2011-11-01 15:45:41 UTC (rev 6187)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series	2011-11-01 15:57:02 UTC (rev 6188)
@@ -1,2 +0,0 @@
-fix-4.6-loading.patch
-02_fix-linking.patch