[SCM] qxgedit/master: Patches refreshed/removed.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8e5be2c76b867672f6be668ce1534749e954514f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Nov 15 07:07:26 2016 +0100

    Patches refreshed/removed.

diff --git a/debian/patches/0002-fix_multiarch_dir.patch b/debian/patches/0002-fix_multiarch_dir.patch
index 955d4e7..125fd4d 100644
--- a/debian/patches/0002-fix_multiarch_dir.patch
+++ b/debian/patches/0002-fix_multiarch_dir.patch
@@ -7,15 +7,15 @@ Index: qxgedit/skulpture/skulpture.pro
 ===================================================================
 --- qxgedit.orig/skulpture/skulpture.pro
 +++ qxgedit/skulpture/skulpture.pro
-@@ -35,9 +35,9 @@ unix {
- 
- 	TARGET_ARCH = $$system(uname -m)
- 	contains(TARGET_ARCH, x86_64) {
--		TARGET_PREFIX = $${PREFIX}/lib64
-+		TARGET_PREFIX = $${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
- 	} else {
--		TARGET_PREFIX = $${PREFIX}/lib
-+		TARGET_PREFIX = $${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
+@@ -36,9 +36,9 @@ unix {
+ 	isEmpty(LIBDIR) {
+ 		TARGET_ARCH = $$system(uname -m)
+ 		contains(TARGET_ARCH, x86_64) {
+-			LIBDIR = $${PREFIX}/lib64
++			LIBDIR = $${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
+ 		} else {
+-			LIBDIR = $${PREFIX}/lib
++			LIBDIR = $${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
+ 		}
  	}
  
- 	lessThan(QT_MAJOR_VERSION, 5) {
diff --git a/debian/patches/0003-fix-desktop-file.patch b/debian/patches/0003-fix-desktop-file.patch
deleted file mode 100644
index 890bf38..0000000
--- a/debian/patches/0003-fix-desktop-file.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description:  Remove extra "Keywords" entry
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Rui Nuno Capela <rncbc at rncbc.org>
-
-Index: qxgedit/src/qxgedit.desktop.in
-===================================================================
---- qxgedit.orig/src/qxgedit.desktop.in
-+++ qxgedit/src/qxgedit.desktop.in
-@@ -5,7 +5,6 @@ GenericName=XG Editor
- GenericName[fr]=Éditeur XG
- Comment=QXGEdit is a Qt GUI XG editor application
- Comment[fr]=Interface graphique d'édition XG
--Keywords=midi;sysex;editor;
- Exec=@ac_prefix@/bin/qxgedit
- Icon=qxgedit
- Categories=Audio;AudioVideo;Midi;X-Alsa;Qt;
diff --git a/debian/patches/0004-spelling.patch b/debian/patches/0004-spelling.patch
deleted file mode 100644
index 14007d2..0000000
--- a/debian/patches/0004-spelling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix spelling
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Rui Nuno Capela <rncbc at rncbc.org>
-
-Index: qxgedit/src/XGParam.cpp
-===================================================================
---- qxgedit.orig/src/XGParam.cpp
-+++ qxgedit/src/XGParam.cpp
-@@ -2014,7 +2014,7 @@ XGEffectParamItem WHITEROOMParamTab[] =
- 	{  3, "HPF[ Cutoff Thru]",  0,  52, getvtab3, getutab3, NULL,     unit_Hz  },
- 	{  4, "LPF[ Cutoff]",      34,  60, getvtab3, getutab3, NULL,     unit_Hz  },
- 	{  5, "Width",              0,  37, getvtab8 ,getutab8, NULL,     unit_m   },
--	{  6, "Heigt",              0,  73, getvtab8 ,getutab8, NULL,     unit_m   },
-+	{  6, "Height",             0,  73, getvtab8 ,getutab8, NULL,     unit_m   },
- 	{  7, "Depth",              0, 104, getvtab8 ,getutab8, NULL,     unit_m   },
- 	{  8, "Wall Vary",          0,  30, NULL,     NULL,     NULL,     NULL     },
- 	{  9, "Dry/Wet",            1, 127, getv0x40, getu0x40, NULL,     NULL     },
diff --git a/debian/patches/series b/debian/patches/series
index a9e6934..fe90ca5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0002-fix_multiarch_dir.patch
-0003-fix-desktop-file.patch
-0004-spelling.patch

-- 
qxgedit packaging