[Pkg-xfce-commits] r4521 - in goodies/branches/experimental/xfce4-smartbookmark-plugin/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Nov 6 06:04:12 UTC 2010
Author: corsac
Date: 2010-11-06 18:03:40 +0000 (Sat, 06 Nov 2010)
New Revision: 4521
Added:
goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch
Modified:
goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/changelog
goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/control
goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/series
goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/rules
Log:
- add build-dep on libtool, intltool and xfce4-dev-tools
* 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.
Modified: goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/changelog 2010-11-06 17:56:26 UTC (rev 4520)
+++ goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/changelog 2010-11-06 18:03:40 UTC (rev 4521)
@@ -2,9 +2,17 @@
* debian/control:
- add build-dep on libxfcegui4-dev.
+ - add build-dep on libtool, intltool and xfce4-dev-tools
* 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, 06 Nov 2010 17:06:22 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 06 Nov 2010 18:36:41 +0100
xfce4-smartbookmark-plugin (0.4.2-3) unstable; urgency=low
Modified: goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/control 2010-11-06 17:56:26 UTC (rev 4520)
+++ goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/control 2010-11-06 18:03:40 UTC (rev 4521)
@@ -6,7 +6,8 @@
Yves-Alexis Perez <corsac at debian.org>, Stefan Ott <stefan at ott.net>,
Evgeni Golov <evgeni at debian.org>
Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev,
- xfce4-panel-dev, libxml2-dev, libxml-parser-perl, libxt-dev, libxfcegui4-dev
+ xfce4-panel-dev, libxml2-dev, libxml-parser-perl, libxt-dev, libxfcegui4-dev,
+ hardening-includes, intltool, xfce4-dev-tools, libtool
Standards-Version: 3.8.3
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/
Added: goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch
===================================================================
--- goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch (rev 0)
+++ goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/02_fix-linking.patch 2010-11-06 18:03:40 UTC (rev 4521)
@@ -0,0 +1,33 @@
+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/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/series 2010-11-06 17:56:26 UTC (rev 4520)
+++ goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/patches/series 2010-11-06 18:03:40 UTC (rev 4521)
@@ -1 +1,2 @@
fix-4.6-loading.patch
+02_fix-linking.patch
Modified: goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/rules 2010-11-06 17:56:26 UTC (rev 4520)
+++ goodies/branches/experimental/xfce4-smartbookmark-plugin/debian/rules 2010-11-06 18:03:40 UTC (rev 4521)
@@ -2,6 +2,16 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.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)
+
+post-patches::
+ NOCONFIGURE=1 xdt-autogen
+
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