[debian-edu-commits] debian-edu/pkg-team/ 01/01: Ship icons in the default hicolor icon theme directories

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit a0d76d3c033453966598b4830ef5aa1486848b40
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Thu Apr 28 21:06:00 2016 +0200

    Ship icons in the default hicolor icon theme directories
---
 debian/changelog                  | 4 +++-
 debian/control                    | 2 +-
 debian/lmms.install               | 4 ++--
 debian/patches/switch-pulse.patch | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6afedcc..4c81701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,13 @@ lmms (1.1.3-1.1) unstable; urgency=low
   * Made Calf and vocoder plugins available to other programs (Closes: #758888).
   * Fixed version of metalish_dong01.ogg (Closes: #802588).
   * Bumped Standards-Version to 3.9.7. Doxygen documentation is not very useful.
+  * Upgraded to Standards-Version 3.9.8. Ship icons in the default hicolor icon
+    theme directories.
   * Use presets from zynaddsubfx-data.
   * Fixed build problems with GCC 6 (Closes: #811697).
   * Switch to PulseAudio back end on likely ALSA interception (Closes: #781479).
 
- -- Javier Serrano Polo <javier at jasp.net>  Mon, 04 Apr 2016 19:42:09 +0200
+ -- Javier Serrano Polo <javier at jasp.net>  Thu, 28 Apr 2016 21:27:34 +0200
 
 lmms (1.1.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ad8d72c..4985a71 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  portaudio19-dev,
  qt4-qmake,
  wine32-tools [i386]
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: http://lmms.io/
 Vcs-Browser: http://anonscm.debian.org/cgit/debian-edu/pkg-team/lmms.git/
 Vcs-Git: git://anonscm.debian.org/debian-edu/pkg-team/lmms.git
diff --git a/debian/lmms.install b/debian/lmms.install
index 3e61152..3c3cb2c 100644
--- a/debian/lmms.install
+++ b/debian/lmms.install
@@ -10,7 +10,7 @@ usr/lib/*/lmms/lib*
 usr/lib/*/lmms/RemoteZynAddSubFx
 usr/share/man/*
 usr/share/applications/*
-data/application-x-lmms-project.svg	usr/share/icons/gnome/scalable/mimetypes
+data/application-x-lmms-project.svg	usr/share/icons/hicolor/64x64/mimetypes
 
-data/lmms.png usr/share/icons
+data/lmms.png usr/share/icons/hicolor/512x512/apps
 data/lmms.png usr/share/pixmaps
diff --git a/debian/patches/switch-pulse.patch b/debian/patches/switch-pulse.patch
index b68338f..4048d5b 100644
--- a/debian/patches/switch-pulse.patch
+++ b/debian/patches/switch-pulse.patch
@@ -6,7 +6,7 @@ Author: Javier Serrano Polo <javier at jasp.net>
 Index: lmms-1.1.3/src/core/Mixer.cpp
 ===================================================================
 --- lmms-1.1.3.orig/src/core/Mixer.cpp	2016-04-27 23:15:31.000000000 +0200
-+++ lmms-1.1.3/src/core/Mixer.cpp	2016-04-27 23:47:47.000000000 +0200
++++ lmms-1.1.3/src/core/Mixer.cpp	2016-04-28 02:17:00.000000000 +0200
 @@ -723,7 +723,21 @@
  	}
  
@@ -15,11 +15,11 @@ Index: lmms-1.1.3/src/core/Mixer.cpp
 +	bool tryAlsa = true;
 +
 +#ifdef LMMS_HAVE_PULSEAUDIO
-+	if ( AudioAlsa::probeDevice() == "default" &&
-+		QFile( "/usr/share/alsa/alsa.conf.d/pulse.conf" ).exists())
++	if( AudioAlsa::probeDevice() == "default" &&
++		QFile( "/usr/share/alsa/alsa.conf.d/pulse.conf" ).exists() )
 +	{
 +		tryAlsa = false;
-+		if ( dev_name == AudioAlsa::name() )
++		if( dev_name == AudioAlsa::name() )
 +		{
 +			dev_name = AudioPulseAudio::name();
 +		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git