[SCM] hydrogen/master: Fix install all architecture-independent data in hydrogen-data. Bump breaks+replaces.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 31a32c3aad1cb6a1b875eb798368fcf1672652a1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Sep 19 14:04:02 2017 +0200

    Fix install all architecture-independent data in hydrogen-data. Bump breaks+replaces.

diff --git a/debian/control.in b/debian/control.in
index 91097bc..6e53d8c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,8 +60,8 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: hydrogen
-Breaks: hydrogen (<< 0.9.7-1~)
-Replaces: hydrogen (<< 0.9.7-1~)
+Breaks: hydrogen (<< 0.9.7-5~)
+Replaces: hydrogen (<< 0.9.7-5~)
 Description: advanced drum machine/step sequencer (data)
  Hydrogen is an advanced drum machine.  It's main goal is to bring
  professional yet simple and intuitive pattern-based drum programming.
diff --git a/debian/hydrogen-data.install b/debian/hydrogen-data.install
index 58cd684..878d439 100644
--- a/debian/hydrogen-data.install
+++ b/debian/hydrogen-data.install
@@ -1,9 +1,6 @@
-usr/share/hydrogen/data/img/*.bmp
-usr/share/hydrogen/data/img/*.ico
-usr/share/hydrogen/data/img/gray/*/*
-usr/share/hydrogen/data/img/gray/*.png
-usr/share/hydrogen/data/img/gray/*.icns
-usr/share/hydrogen/data/img/gray/icon.svg
+usr/share/applications
+usr/share/appdata/hydrogen.appdata.xml
+usr/share/hydrogen/data/img
 usr/share/hydrogen/data/demo_songs
 usr/share/hydrogen/data/drumkits
 usr/share/hydrogen/data/i18n/*.qm
@@ -11,3 +8,4 @@ usr/share/hydrogen/data/xsd
 usr/share/hydrogen/data/*.wav
 usr/share/hydrogen/data/*.h2song
 usr/share/hydrogen/data/*.conf
+usr/share/man/man1/hydrogen.1
diff --git a/debian/hydrogen.links b/debian/hydrogen-data.links
similarity index 100%
rename from debian/hydrogen.links
rename to debian/hydrogen-data.links
diff --git a/debian/hydrogen.install b/debian/hydrogen.install
index d0ce281..e772481 100644
--- a/debian/hydrogen.install
+++ b/debian/hydrogen.install
@@ -1,5 +1 @@
 usr/bin
-usr/share/applications
-usr/share/hydrogen/data/img/gray/h2-icon.svg
-usr/share/appdata/hydrogen.appdata.xml
-usr/share/man/man1/hydrogen.1

-- 
hydrogen packaging