[Pkg-xfce-commits] r6220 - goodies/trunk/squeeze/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-18 13:57:04 +0000 (Fri, 18 Nov 2011)
New Revision: 6220

Modified:
   goodies/trunk/squeeze/debian/changelog
   goodies/trunk/squeeze/debian/control
   goodies/trunk/squeeze/debian/rules
Log:
  - run xdt-autogen before configure, fixing the Makefiles to build
    correctly with PIE.
  - use multi arch dirs in various rules
  - drop the squeeze.tap move, not needed anymore.
  - add build-dep on xfce4-dev-tools, autoconf, libtool, intltool and
    gtk-doc-tools to be able to regenerate Makefiles.

Modified: goodies/trunk/squeeze/debian/changelog
===================================================================
--- goodies/trunk/squeeze/debian/changelog	2011-11-18 13:38:45 UTC (rev 6219)
+++ goodies/trunk/squeeze/debian/changelog	2011-11-18 13:57:04 UTC (rev 6220)
@@ -5,10 +5,16 @@
       Correctly handle path with '/' in them.          closes: #607483, #608005
   * debian/rules:
     - use dh 9 and dpkg-dev 1.16.1 hardening support
+    - run xdt-autogen before configure, fixing the Makefiles to build
+      correctly with PIE.
+    - use multi arch dirs in various rules
+    - drop the squeeze.tap move, not needed anymore.
   * debian/control:
     - update debhelper build-dep for v9 hardening support.
     - add build-dep on dpkg-dev 1.16.1 for hardening support.
     - drop build-dep on hardening-wrapper.
+    - add build-dep on xfce4-dev-tools, autoconf, libtool, intltool and
+      gtk-doc-tools to be able to regenerate Makefiles.
   * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 18 Nov 2011 12:58:09 +0100

Modified: goodies/trunk/squeeze/debian/control
===================================================================
--- goodies/trunk/squeeze/debian/control	2011-11-18 13:38:45 UTC (rev 6219)
+++ goodies/trunk/squeeze/debian/control	2011-11-18 13:57:04 UTC (rev 6220)
@@ -6,7 +6,8 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 8.9.4), dpkg-dev (>= 1.16.1), 
  libexo-1-dev (>= 0.5.0),
- libthunar-vfs-1-dev (>= 0.4.0), libdbus-glib-1-dev (>= 0.34), libgtk2.0-dev
+ libthunar-vfs-1-dev (>= 0.4.0), libdbus-glib-1-dev (>= 0.34), libgtk2.0-dev,
+ xfce4-dev-tools, autoconf, libtool, intltool, gtk-doc-tools
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/squeeze/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/squeeze/

Modified: goodies/trunk/squeeze/debian/rules
===================================================================
--- goodies/trunk/squeeze/debian/rules	2011-11-18 13:38:45 UTC (rev 6219)
+++ goodies/trunk/squeeze/debian/rules	2011-11-18 13:57:04 UTC (rev 6220)
@@ -6,13 +6,13 @@
 override_dh_install:
 	dh_install
 	install -D -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/squeeze/usr/share/lintian/overrides/squeeze
-	mkdir -p $(CURDIR)/debian/squeeze/usr/lib/thunar-archive-plugin
-	mv $(CURDIR)/debian/squeeze/usr/lib/squeeze/thunar-archive-plugin/squeeze.tap $(CURDIR)/debian/squeeze/usr/lib/thunar-archive-plugin/
-	rmdir $(CURDIR)/debian/squeeze/usr/lib/squeeze/thunar-archive-plugin/
-	rmdir $(CURDIR)/debian/squeeze/usr/lib/squeeze/
-	rm $(CURDIR)/debian/squeeze/usr/lib/*.la
+	rm $(CURDIR)/debian/squeeze/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 override_dh_auto_test:
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
 %:
 	dh $@