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

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sun Apr 3 12:39:14 UTC 2011 

Author: mrpouit-guest
Date: 2011-04-03 12:39:02 +0000 (Sun, 03 Apr 2011)
New Revision: 5320

Added:
   goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch
   goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series
   goodies/trunk/xfce4-smartbookmark-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-smartbookmark-plugin/
   goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog
   goodies/trunk/xfce4-smartbookmark-plugin/debian/control
   goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/fix-4.6-loading.patch
   goodies/trunk/xfce4-smartbookmark-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-smartbookmark-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-smartbookmark-plugin:4344-5319
/goodies/tags/xfce4-smartbookmark-plugin/0.4.2-3:3789-4343

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog	2011-04-03 12:30:47 UTC (rev 5319)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog	2011-04-03 12:39:02 UTC (rev 5320)
@@ -1,10 +1,26 @@
 xfce4-smartbookmark-plugin (0.4.2-4) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * debian/control:
     - switch to xfce section.
+    - add build-dep on libxfcegui4-dev.
+    - add build-dep on libtool, intltool and xfce4-dev-tools
+    - update standards version to 3.9.1.
+  * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+    - run xdt-autogen after applying patches touching Makefile.am.
+  * debian/patches:
+    - 02_fix-linking added, fix linking.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 09 Jan 2010 17:05:04 +0100
+  [ Lionel Le Folgoc ]
+  * debian/rules: clean up autogenerated files changed by xdt-autogen.
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 22:20:35 +0100
+
 xfce4-smartbookmark-plugin (0.4.2-3) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/control	2011-04-03 12:30:47 UTC (rev 5319)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/control	2011-04-03 12:39:02 UTC (rev 5320)
@@ -4,10 +4,11 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Stefan Ott <stefan at ott.net>,
- Evgeni Golov <evgeni at debian.org>
+ Evgeni Golov <evgeni at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, 
- xfce4-panel-dev, libxml2-dev, libxml-parser-perl, libxt-dev
-Standards-Version: 3.8.3
+ xfce4-panel-dev, libxml2-dev, libxml-parser-perl, libxt-dev, libxfcegui4-dev,
+ hardening-includes, intltool, xfce4-dev-tools, libtool
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-smartbookmark-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-smartbookmark-plugin/
 

Copied: goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch (from rev 5319, goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch)
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch	                        (rev 0)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch	2011-04-03 12:39:02 UTC (rev 5320)
@@ -0,0 +1,36 @@
+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

Modified: 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-04-03 12:30:47 UTC (rev 5319)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/fix-4.6-loading.patch	2011-04-03 12:39:02 UTC (rev 5320)
@@ -1,7 +1,10 @@
+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	2009-03-06 09:14:24.000000000 +0100
-+++ xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in	2009-03-06 09:14:58.000000000 +0100
+--- 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

Copied: goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series (from rev 5319, goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/patches/series	2011-04-03 12:39:02 UTC (rev 5320)
@@ -0,0 +1,2 @@
+fix-4.6-loading.patch
+02_fix-linking.patch

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/rules	2011-04-03 12:30:47 UTC (rev 5319)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/rules	2011-04-03 12:39:02 UTC (rev 5320)
@@ -1,8 +1,25 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+include /usr/share/hardening-includes/hardening.make
+
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
+clean::
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
+	rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
+	rm -f missing mkinstalldirs
+
 binary-post-install/xfce4-smartbookmark-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la

More information about the Pkg-xfce-commits mailing list