Bug#776767: unblock: volumeicon/0.4.6-2.2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package volumeicon.
It fixes a few bugs which shouldn't be in jessie.
unblock volumeicon/0.4.6-2.2
thanks,
Mateusz
diff -Nru volumeicon-0.4.6/debian/changelog volumeicon-0.4.6/debian/changelog
--- volumeicon-0.4.6/debian/changelog 2014-05-06 20:41:27.000000000 +0200
+++ volumeicon-0.4.6/debian/changelog 2014-10-26 13:33:03.000000000 +0100
@@ -1,3 +1,16 @@
+volumeicon (0.4.6-2.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Add patch to replace x-terminal-emulator instead xterm - thanks to
+ Luca Capello <luca@pca.it> for the patch. (Closes: #754231)
+ * Typo in Depends: xfce4-nofityd => xfce4-notifyd. (Closes: #758494)
+ * Add .desktop file. (Closes: #749324)
+ * Bump Debian standards to 3.9.6. (no changes needed)
+ * Use canoninal Vcs fields.
+ * Bump debhelper version to 9.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl> Sun, 26 Oct 2014 13:32:59 +0100
+
volumeicon (0.4.6-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru volumeicon-0.4.6/debian/control volumeicon-0.4.6/debian/control
--- volumeicon-0.4.6/debian/control 2014-05-06 20:34:30.000000000 +0200
+++ volumeicon-0.4.6/debian/control 2014-10-26 11:27:42.000000000 +0100
@@ -3,18 +3,18 @@
Priority: optional
Maintainer: Andrew Gainer <gainer.andrew@gmail.com>
Uploaders: Julien Valroff <julien@debian.org>
-Build-Depends: debhelper (>= 8.0.0~), autotools-dev,
+Build-Depends: debhelper (>= 9), autotools-dev,
libgtk2.0-dev, libasound2-dev, libnotify-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
Homepage: http://softwarebakery.com/maato/volumeicon.html
-Vcs-Git: git://git.debian.org/collab-maint/volumeicon.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/volumeicon.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/volumeicon.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/volumeicon.git;a=summary
Package: volumeicon-alsa
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: alsamixergui | aumix-gtk | kmix | gnome-alsamixer,
- notify-osd | xfce4-nofityd | notification-daemon
+ notify-osd | xfce4-notifyd | notification-daemon
Description: systray volume icon for alsa
This is a lightweight volume control that sits in your systray. This
version is compatible with ALSA.
diff -Nru volumeicon-0.4.6/debian/patches/002_replace-hardcoded-xterm.diff volumeicon-0.4.6/debian/patches/002_replace-hardcoded-xterm.diff
--- volumeicon-0.4.6/debian/patches/002_replace-hardcoded-xterm.diff 1970-01-01 01:00:00.000000000 +0100
+++ volumeicon-0.4.6/debian/patches/002_replace-hardcoded-xterm.diff 2014-10-26 10:57:02.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Replace hardcoded xterm with x-terminal-emulator
+Bug-Debian: https://bugs.debian.org/754231
+Author: Luca Capello <luca@pca.it>
+Last-Update: 2014-07-08
+
+--- a/src/config.c
++++ b/src/config.c
+@@ -59,7 +59,7 @@
+ static void config_load_default()
+ {
+ if(!m_helper_program)
+- config_set_helper("xterm -e 'alsamixer'");
++ config_set_helper("x-terminal-emulator -e 'alsamixer'");
+ if(!m_channel)
+ config_set_channel(NULL);
+ if(!m_card)
diff -Nru volumeicon-0.4.6/debian/patches/series volumeicon-0.4.6/debian/patches/series
--- volumeicon-0.4.6/debian/patches/series 2013-02-16 09:21:30.000000000 +0100
+++ volumeicon-0.4.6/debian/patches/series 2014-10-26 10:56:21.000000000 +0100
@@ -1 +1,2 @@
001_remove-individual-glib-headers.diff
+002_replace-hardcoded-xterm.diff
diff -Nru volumeicon-0.4.6/debian/volumeicon.desktop volumeicon-0.4.6/debian/volumeicon.desktop
--- volumeicon-0.4.6/debian/volumeicon.desktop 1970-01-01 01:00:00.000000000 +0100
+++ volumeicon-0.4.6/debian/volumeicon.desktop 2014-10-26 11:15:33.000000000 +0100
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Volume Icon
+Name[fr]=Icône pour le contrôle du volume
+Comment=Lightweight volume control for the systray
+Comment[fr]=Simple contrôle du volume pour la barre d'état
+Icon=volume
+Exec=volumeicon
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=AudioVideo;
+Keywords=audio;sound;mixer;music;
diff -Nru volumeicon-0.4.6/debian/volumeicon.install volumeicon-0.4.6/debian/volumeicon.install
--- volumeicon-0.4.6/debian/volumeicon.install 1970-01-01 01:00:00.000000000 +0100
+++ volumeicon-0.4.6/debian/volumeicon.install 2014-10-26 11:14:41.000000000 +0100
@@ -0,0 +1 @@
+debian/volumeicon.desktop usr/share/applications
Reply to: