[Pkg-xfce-commits] r6120 - desktop/trunk/tumbler/debian

Fri Oct 14 02:50:36 UTC 2011

Author: corsac
Date: 2011-10-14 14:50:36 +0000 (Fri, 14 Oct 2011)
New Revision: 6120

Modified:
   desktop/trunk/tumbler/debian/changelog
   desktop/trunk/tumbler/debian/compat
   desktop/trunk/tumbler/debian/control
   desktop/trunk/tumbler/debian/libtumbler-1-0.install
   desktop/trunk/tumbler/debian/libtumbler-1-dev.install
   desktop/trunk/tumbler/debian/rules
   desktop/trunk/tumbler/debian/tumbler.install
Log:
* debian/rules:
  - use hardening method from dpkg-dev 1.16.1 and debhelper 9.
  - use multiarch dirs.
* debian/compat bumped to 9.
* debian/control:
  - drop build-dep on hardening-includes
  - add build-dep on dpkg-dev (>= 1.16.1)
  - add Pre-Depends on misc:Pre-Depends
* debian/libtumbler-1-0.install, debian/libtumbler-1-dev.install,
  debian/tumbler.install: use multiarch paths.

Modified: desktop/trunk/tumbler/debian/changelog
===================================================================

--- desktop/trunk/tumbler/debian/changelog	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/changelog	2011-10-14 14:50:36 UTC (rev 6120)
@@ -1,5 +1,6 @@
 tumbler (0.1.22-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream release:
     - add new gstreamer-based video thumbnailer.
   * debian/copyright: updated.
@@ -9,6 +10,18 @@
     libgstreamer0.10-dev, and switch to libjpeg-dev.            closes: #644968
   * debian/patches/02_start-gst-pipeline.patch: added, fix thumbnail generation.
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use hardening method from dpkg-dev 1.16.1 and debhelper 9.
+    - use multiarch dirs.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop build-dep on hardening-includes
+    - add build-dep on dpkg-dev (>= 1.16.1)
+    - add Pre-Depends on misc:Pre-Depends
+  * debian/libtumbler-1-0.install, debian/libtumbler-1-dev.install,
+    debian/tumbler.install: use multiarch paths.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 21 Sep 2011 22:42:01 +0200
 
 tumbler (0.1.21-3) unstable; urgency=low

Modified: desktop/trunk/tumbler/debian/compat
===================================================================
--- desktop/trunk/tumbler/debian/compat	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/compat	2011-10-14 14:50:36 UTC (rev 6120)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/tumbler/debian/control
===================================================================
--- desktop/trunk/tumbler/debian/control	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/control	2011-10-14 14:50:36 UTC (rev 6120)
@@ -4,9 +4,9 @@
 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 (>= 7.0.50~), intltool (>= 0.31), pkg-config,
+Build-Depends: debhelper (>= 8.9.4), intltool (>= 0.31), pkg-config,
  libglib2.0-dev, libgtk2.0-dev, libdbus-glib-1-dev, libpoppler-glib-dev,
- libgstreamer0.10-dev, libjpeg-dev, hardening-includes, xfce4-dev-tools,
+ libgstreamer0.10-dev, libjpeg-dev, dpkg-dev (>= 1.16.1), xfce4-dev-tools,
  libtool, gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
@@ -36,6 +36,7 @@
 Package: libtumbler-1-0
 Section: xfce
 Architecture: any
+Pre-depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: library for tumbler, a D-Bus thumbnailing service
  Tumbler is a D-Bus service for applications to request thumbnails for various

Modified: desktop/trunk/tumbler/debian/libtumbler-1-0.install
===================================================================
--- desktop/trunk/tumbler/debian/libtumbler-1-0.install	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/libtumbler-1-0.install	2011-10-14 14:50:36 UTC (rev 6120)
@@ -1 +1 @@
-usr/lib/libtumbler-1.so.*
+usr/lib/*/libtumbler-1.so.*

Modified: desktop/trunk/tumbler/debian/libtumbler-1-dev.install
===================================================================
--- desktop/trunk/tumbler/debian/libtumbler-1-dev.install	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/libtumbler-1-dev.install	2011-10-14 14:50:36 UTC (rev 6120)
@@ -1,6 +1,6 @@
 usr/include
-usr/lib/libtumbler-1.a
-usr/lib/libtumbler-1.so
-usr/lib/pkgconfig
-usr/lib/tumbler-1/plugins/*.a
-usr/lib/tumbler-1/plugins/cache/*.a
+usr/lib/*/libtumbler-1.a
+usr/lib/*/libtumbler-1.so
+usr/lib/*/pkgconfig
+usr/lib/*/tumbler-1/plugins/*.a
+usr/lib/*/tumbler-1/plugins/cache/*.a

Modified: desktop/trunk/tumbler/debian/rules
===================================================================
--- desktop/trunk/tumbler/debian/rules	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/rules	2011-10-14 14:50:36 UTC (rev 6120)
@@ -1,18 +1,13 @@
 #!/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 DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 override_dh_install:
 	dh_install --list-missing -X .la
 
 override_dh_makeshlibs:
-	dh_makeshlibs -p libtumbler-1-0 -X usr/lib/tumbler-1/plugins
+	dh_makeshlibs -p libtumbler-1-0 -X usr/lib/$(DEB_HOST_MULTIARCH)/tumbler-1/plugins
 
 override_dh_strip:
 	dh_strip --dbg-package=libtumbler-1-dbg
@@ -21,6 +16,6 @@
 	dh $@
 
 override_dh_auto_configure:
-	mkdir m4
+	mkdir -p m4
 	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --disable-ffmpeg-thumbnailer

Modified: desktop/trunk/tumbler/debian/tumbler.install
===================================================================
--- desktop/trunk/tumbler/debian/tumbler.install	2011-10-11 20:56:49 UTC (rev 6119)
+++ desktop/trunk/tumbler/debian/tumbler.install	2011-10-14 14:50:36 UTC (rev 6120)
@@ -1,4 +1,4 @@
 usr/share/dbus-1/*
-usr/lib/tumbler-1/tumblerd
-usr/lib/tumbler-1/plugins/*.so
-usr/lib/tumbler-1/plugins/cache/*.so
+usr/lib/*/tumbler-1/tumblerd
+usr/lib/*/tumbler-1/plugins/*.so
+usr/lib/*/tumbler-1/plugins/cache/*.so


