[Pkg-xfce-commits] r7346 - goodies/trunk/parole/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2013-03-09 13:49:16 +0000 (Sat, 09 Mar 2013)
New Revision: 7346

Modified:
   goodies/trunk/parole/debian/changelog
   goodies/trunk/parole/debian/compat
   goodies/trunk/parole/debian/control
   goodies/trunk/parole/debian/parole.install
   goodies/trunk/parole/debian/rules
Log:
merge with branches/experimental

Modified: goodies/trunk/parole/debian/changelog
===================================================================
--- goodies/trunk/parole/debian/changelog	2013-03-08 21:43:24 UTC (rev 7345)
+++ goodies/trunk/parole/debian/changelog	2013-03-09 13:49:16 UTC (rev 7346)
@@ -2,6 +2,9 @@
 
   [ Lionel Le Folgoc ]
   * debian/patches: add missing DEP3 headers.
+  * debian/control:
+    - add b-dep on libxfconf-0-dev since parole now uses Xfconf
+    - suggests gnome-codec-install for the missing codec feature.
 
   [ Yves-Alexis Perez ]
   * New upstream release.
@@ -10,10 +13,17 @@
   * debian/rules:
     - drop call to xdt-autogen, not needed anymore.
     - use parallel build.
+    - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
+    - use multiarch paths.
   * debian/control:
+    - update standards version to 3.9.3.
+    - update debhelper build-dep to 9 and dpkg-dev one to 1.16.1
+    - drop hardening-includes build-dep.
     - drop xfce4-dev-tools, libtool and gtk-doc-tools build-deps.
     - replace libxfcegui4 build-dep by libxfce4ui.
-    - add libxfconf-0-dev (>= 4.10) build-dep. 
+  * debian/compat bumped to 9.
+  * debian/parole.install:
+    - update paths for multiarch.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 07 Mar 2013 22:27:05 +0100
 

Modified: goodies/trunk/parole/debian/compat
===================================================================
--- goodies/trunk/parole/debian/compat	2013-03-08 21:43:24 UTC (rev 7345)
+++ goodies/trunk/parole/debian/compat	2013-03-09 13:49:16 UTC (rev 7346)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/parole/debian/control
===================================================================
--- goodies/trunk/parole/debian/control	2013-03-08 21:43:24 UTC (rev 7345)
+++ goodies/trunk/parole/debian/control	2013-03-09 13:49:16 UTC (rev 7346)
@@ -4,12 +4,12 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, 
- libgtk2.0-dev (>= 2.16), libgstreamer0.10-dev, 
+Build-Depends: debhelper (>= 9), intltool, pkg-config, 
+ libgtk2.0-dev (>= 2.20), libgstreamer0.10-dev, 
  libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
  libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.10),
- libnotify-dev, libtagc0-dev, hardening-includes
-Standards-Version: 3.9.2
+ libnotify-dev, libtagc0-dev, dpkg-dev (>= 1.16.1)
+Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/projects/applications/parole
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/parole/
@@ -17,7 +17,8 @@
 Package: parole
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-x
-Suggests: gstreamer0.10-plugins-ugly, gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
+Suggests: gstreamer0.10-plugins-ugly, gstreamer0.10-plugins-bad,
+ gstreamer0.10-ffmpeg, gnome-codec-install
 Description: media player based on GStreamer framework
  Parole is a media player for the Xfce desktop environment, written using the
  GStreamer framework.

Modified: goodies/trunk/parole/debian/parole.install
===================================================================
--- goodies/trunk/parole/debian/parole.install	2013-03-08 21:43:24 UTC (rev 7345)
+++ goodies/trunk/parole/debian/parole.install	2013-03-09 13:49:16 UTC (rev 7346)
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/parole-0/*.so
+usr/lib/*/parole-0/*.so
 usr/share

Modified: goodies/trunk/parole/debian/rules
===================================================================
--- goodies/trunk/parole/debian/rules	2013-03-08 21:43:24 UTC (rev 7345)
+++ goodies/trunk/parole/debian/rules	2013-03-09 13:49:16 UTC (rev 7346)
@@ -1,19 +1,13 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-O1 -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@ --parallel
 
 override_dh_makeshlibs:
-	dh_makeshlibs -X usr/lib/parole-0
+	dh_makeshlibs -X usr/lib/$(DEB_HOST_MULTIARCH)/parole-0
 
 override_dh_install:
 	find debian/tmp/usr/lib -name '*.la' -delete