[Pkg-xfce-commits] r5687 - in goodies/trunk/thunar-archive-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-24 10:55:09 +0000 (Sun, 24 Apr 2011)
New Revision: 5687

Added:
   goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch
   goodies/trunk/thunar-archive-plugin/debian/patches/series
Modified:
   goodies/trunk/thunar-archive-plugin/debian/changelog
   goodies/trunk/thunar-archive-plugin/debian/control
   goodies/trunk/thunar-archive-plugin/debian/rules
Log:
* debian/rules:
  - pick build flags from dpkg-buildflags
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - run xdt-autogen before configure.
  - add hardening flags to build flags.
* debian/control:
  - add build-dep on hardening-includes.
  - add build-dep on xfce4-dev-tools, libtool and gtk-doc-tools
* debian/patches:
  - 01_fix-missing-links, fix ftbfs with --as-needed.

Modified: goodies/trunk/thunar-archive-plugin/debian/changelog
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/changelog	2011-04-23 21:59:44 UTC (rev 5686)
+++ goodies/trunk/thunar-archive-plugin/debian/changelog	2011-04-24 10:55:09 UTC (rev 5687)
@@ -1,3 +1,18 @@
+thunar-archive-plugin (0.3.0-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - pick build flags from dpkg-buildflags
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - run xdt-autogen before configure.
+    - add hardening flags to build flags.
+  * debian/control:
+    - add build-dep on hardening-includes.
+    - add build-dep on xfce4-dev-tools, libtool and gtk-doc-tools
+  * debian/patches:
+    - 01_fix-missing-links, fix ftbfs with --as-needed.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 24 Apr 2011 12:54:12 +0200
+
 thunar-archive-plugin (0.3.0-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: goodies/trunk/thunar-archive-plugin/debian/control
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/control	2011-04-23 21:59:44 UTC (rev 5686)
+++ goodies/trunk/thunar-archive-plugin/debian/control	2011-04-24 10:55:09 UTC (rev 5687)
@@ -4,7 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org> 
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, 
- intltool, libthunarx-2-dev, libexo-1-dev
+ intltool, libthunarx-2-dev, libexo-1-dev, hardening-includes,
+ xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-archive-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-archive-plugin/

Added: goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch	                        (rev 0)
+++ goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch	2011-04-24 10:55:09 UTC (rev 5687)
@@ -0,0 +1,17 @@
+diff --git a/thunar-archive-plugin/Makefile.am b/thunar-archive-plugin/Makefile.am
+index 4cbfefa..c08f8d0 100644
+--- a/thunar-archive-plugin/Makefile.am
++++ b/thunar-archive-plugin/Makefile.am
+@@ -26,6 +26,12 @@ thunar_archive_plugin_la_CFLAGS =					\
+ 	$(EXO_CFLAGS)							\
+ 	$(LIBXFCE4UTIL_CFLAGS)
+ 
++thunar_archive_plugin_la_LIBADD =					\
++	$(PLATFORM_LIBS)						\
++	$(THUNARX_LIBS)							\
++	$(EXO_LIBS)							\
++	$(LIBXFCE4UTIL_LIBS)
++
+ thunar_archive_plugin_la_LDFLAGS =					\
+ 	-avoid-version							\
+ 	-export-dynamic							\

Added: goodies/trunk/thunar-archive-plugin/debian/patches/series
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/thunar-archive-plugin/debian/patches/series	2011-04-24 10:55:09 UTC (rev 5687)
@@ -0,0 +1 @@
+01_fix-missing-links.patch

Modified: goodies/trunk/thunar-archive-plugin/debian/rules
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/rules	2011-04-23 21:59:44 UTC (rev 5686)
+++ goodies/trunk/thunar-archive-plugin/debian/rules	2011-04-24 10:55:09 UTC (rev 5687)
@@ -1,6 +1,15 @@
 #!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
 
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --libexecdir=/usr/lib/
 
 override_dh_makeshlibs: