Merge lp:~noskcaj/ubuntu/utopic/xfce4-mixer/merge into lp:ubuntu/utopic/xfce4-mixer

[Jackson Doak]

Merge from debian

[Sebastien Bacher (seb128)]

thanks, merged in https://launchpad.net/ubuntu/utopic/+source/xfce4-mixer/1:4.10.0-3ubuntu1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-15 22:53:04 +0000
+++ debian/changelog	2014-06-02 00:20:53 +0000
@@ -1,3 +1,38 @@
+xfce4-mixer (1:4.10.0-3ubuntu1) utopic; urgency=medium
+
+  * Resync with Debian experimental.
+  * Readd the epoch…
+
+ -- Jackson Doak <[e-mail]>  Mon, 02 Jun 2014 10:14:57 +1000
+
+xfce4-mixer (4.10.0-3) unstable; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * debian/control:
+    - Bump standards-version to 3.9.5
+    - build-depend on dh-autoreconf
+  * Create debian/source/options
+  * debian/rules: --with autoreconf
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - add gstreamer0.10-alsa to recommends so it gets picked up by
+      default, and keep it as alternative dependency.           closes: #651495
+    - add build-dep on xfce4-dev-tools.
+
+ -- Yves-Alexis Perez <[e-mail]>  Sun, 09 Mar 2014 10:33:17 +0100
+
+xfce4-mixer (4.10.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/rules:
+    - enable all hardening flags.
+
+ -- Yves-Alexis Perez <[e-mail]>  Tue, 21 May 2013 22:44:31 +0200
+
 xfce4-mixer (1:4.10.0-1ubuntu2) saucy; urgency=low
 
   * Use dh_autotools-dev to update config.{sub,guess} for AArch64.

=== modified file 'debian/control'
--- debian/control	2013-10-15 22:53:04 +0000
+++ debian/control	2014-06-02 00:20:53 +0000
@@ -10,17 +10,17 @@
  libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), 
  xfce4-panel-dev (>= 4.10.0), libxml-parser-perl, 
  libxfconf-0-dev (>= 4.10.0), intltool, dpkg-dev (>= 1.16.1),
- libunique-dev, libkeybinder-dev
-Standards-Version: 3.9.3
+ libunique-dev, libkeybinder-dev, dh-autoreconf, xfce4-dev-tools
+Standards-Version: 3.9.5
 Homepage: http://www.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-mixer/
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/xfce4-mixer/
 
 Package: xfce4-mixer
-Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
- gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-plugins-base
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-alsa | gstreamer0.10-audiosink,
+ gstreamer0.10-plugins-base
+Recommends: gstreamer0.10-alsa
 Replaces: xfce4-mixer-alsa, xfce4-mixer-oss
 Description: Xfce mixer application
  This is the frontend for mixer settings delivered together

=== modified file 'debian/copyright'
--- debian/copyright	2009-03-01 20:57:17 +0000
+++ debian/copyright	2014-06-02 00:20:53 +0000
@@ -11,4 +11,4 @@
 License: GPL-2+
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

=== modified file 'debian/rules' (properties changed: +x to -x)
--- debian/rules	2013-10-15 22:53:04 +0000
+++ debian/rules	2014-06-02 00:20:53 +0000
@@ -1,10 +1,7 @@
 #!/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
-
-%:
-	dh $@ --parallel --with autotools_dev
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_install:
 	dh_auto_install
@@ -12,3 +9,10 @@
 	install -c -m 644 $(CURDIR)/debian/xfce4-mixer.xpm \
 		$(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
 	find debian/xfce4-mixer/usr/lib -name '*.la' -delete
+
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
+%:
+	dh $@ --parallel --with autoreconf

=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2014-06-02 00:20:53 +0000
@@ -0,0 +1,1 @@
+extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile)$"