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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2013-05-22 18:27:38 +0000 (Wed, 22 May 2013)
New Revision: 7523

Removed:
   goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch
Modified:
   goodies/trunk/thunar-archive-plugin/debian/changelog
   goodies/trunk/thunar-archive-plugin/debian/control
   goodies/trunk/thunar-archive-plugin/debian/patches/series
   goodies/trunk/thunar-archive-plugin/debian/rules
Log:
* New upstream release.
* debian/control:
  - drop xfce4-dev-tools, libtool and gtk-doc-tools from build-depends.
  - bump debhelper to (>= 9).
* debian/patches:
  - add missing DEP3 headers.
  - 01_fix-missing-links.patch: dropped, included upstream.
* debian/rules:
  - drop dh_auto_configure override, unneeded.
  - enable all hardening options.

Modified: goodies/trunk/thunar-archive-plugin/debian/changelog
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/changelog	2013-05-22 18:23:53 UTC (rev 7522)
+++ goodies/trunk/thunar-archive-plugin/debian/changelog	2013-05-22 18:27:38 UTC (rev 7523)
@@ -1,8 +1,17 @@
-thunar-archive-plugin (0.3.0-5) UNRELEASED; urgency=low
+thunar-archive-plugin (0.3.1-1) UNRELEASED; urgency=low
 
-  * debian/patches: add missing DEP3 headers.
+  * New upstream release.
+  * debian/control:
+    - drop xfce4-dev-tools, libtool and gtk-doc-tools from build-depends.
+    - bump debhelper to (>= 9).
+  * debian/patches:
+    - add missing DEP3 headers.
+    - 01_fix-missing-links.patch: dropped, included upstream.
+  * debian/rules:
+    - drop dh_auto_configure override, unneeded.
+    - enable all hardening options.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 20 Feb 2012 22:33:22 +0100
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 22 May 2013 20:12:09 +0200
 
 thunar-archive-plugin (0.3.0-4) unstable; urgency=low
 

Modified: goodies/trunk/thunar-archive-plugin/debian/control
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/control	2013-05-22 18:23:53 UTC (rev 7522)
+++ goodies/trunk/thunar-archive-plugin/debian/control	2013-05-22 18:27:38 UTC (rev 7523)
@@ -4,9 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 8.9.4), autotools-dev, pkg-config, 
- intltool, libthunarx-2-dev, libexo-1-dev, xfce4-dev-tools, libtool, 
- gtk-doc-tools
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, 
+ intltool, libthunarx-2-dev, libexo-1-dev
 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/

Deleted: goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch	2013-05-22 18:23:53 UTC (rev 7522)
+++ goodies/trunk/thunar-archive-plugin/debian/patches/01_fix-missing-links.patch	2013-05-22 18:27:38 UTC (rev 7523)
@@ -1,21 +0,0 @@
-Description: Fix build with --as-needed
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7533
-
-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							\

Modified: goodies/trunk/thunar-archive-plugin/debian/patches/series
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/patches/series	2013-05-22 18:23:53 UTC (rev 7522)
+++ goodies/trunk/thunar-archive-plugin/debian/patches/series	2013-05-22 18:27:38 UTC (rev 7523)
@@ -1,2 +1 @@
-01_fix-missing-links.patch
 02_support-non-multiarch-wrappers.patch

Modified: goodies/trunk/thunar-archive-plugin/debian/rules
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/rules	2013-05-22 18:23:53 UTC (rev 7522)
+++ goodies/trunk/thunar-archive-plugin/debian/rules	2013-05-22 18:27:38 UTC (rev 7523)
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure
-
 override_dh_makeshlibs:
 	dh_makeshlibs -n -X /usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/