[SCM] synthv1/master: Two patches removed - applied upstream.

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

The following commit has been merged in the master branch:
commit 098e05b8da2c83a5aeaccbdbec2f2d4cf1bcc63a
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Mar 11 15:09:40 2014 +0100

    Two patches removed - applied upstream.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
deleted file mode 100644
index 4da49a7..0000000
--- a/debian/patches/0001-buildsystem.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Don't evaluate /usr/lib64 as valid library path.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: yes
----
- configure.ac    |    6 +-----
- src/src_lv2.pro |    7 +------
- 2 files changed, 2 insertions(+), 11 deletions(-)
-
-Index: synthv1/configure.ac
-===================================================================
---- synthv1.orig/configure.ac	2014-01-23 01:21:05.403082611 +0100
-+++ synthv1/configure.ac	2014-01-23 01:21:55.421611094 +0100
-@@ -107,7 +107,7 @@
- fi
- 
- # Some a-la-debian alternatives...
--for X in /usr/lib /usr/lib64 /usr/share; do
-+for X in /usr/lib /usr/share; do
-   for Y in $ac_qtdirs; do
-     if test -d $X/$Y/bin; then
-       ac_with_paths="$ac_with_paths $X/$Y"
-@@ -179,10 +179,6 @@
-     CPPFLAGS="-I$X/include $CPPFLAGS"
-     ac_incpath="$X/include $ac_incpath"
-   fi
--  if test -d $X/lib64; then
--    LIBS="-L$X/lib64 $LIBS"
--    ac_libs="-L$X/lib64 $ac_libs"
--  fi
-   if test -d $X/lib; then
-     LIBS="-L$X/lib $LIBS"
-     ac_libs="-L$X/lib $ac_libs"
-Index: synthv1/src/src_lv2.pro
-===================================================================
---- synthv1.orig/src/src_lv2.pro	2014-01-23 01:21:05.403082611 +0100
-+++ synthv1/src/src_lv2.pro	2014-01-23 01:21:05.399082729 +0100
-@@ -38,12 +38,7 @@
- 	contains(PREFIX, $$system(echo $HOME)) {
- 		LV2DIR = $${PREFIX}/.lv2
- 	} else {
--		ARCH = $$system(uname -m)
--		contains(ARCH, x86_64) {
--			LV2DIR = $${PREFIX}/lib64/lv2
--		} else {
--			LV2DIR = $${PREFIX}/lib/lv2
--		}
-+		LV2DIR = $${PREFIX}/lib/lv2
- 	}
- 
- 	TARGET_LV2 = $${NAME}.lv2/$${TARGET}.so
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
deleted file mode 100644
index f166e52..0000000
--- a/debian/patches/0004-fix_install_path.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description:  Fixed installing path. (From upstream)
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: synthv1/configure.ac
-===================================================================
---- synthv1.orig/configure.ac	2014-01-25 12:13:05.979584408 +0100
-+++ synthv1/configure.ac	2014-01-25 12:13:05.971584400 +0100
-@@ -13,6 +13,13 @@
- fi
- AC_SUBST(ac_prefix)
- 
-+# Set default library/plugin prefix.
-+if test "x$exec_prefix" = "xNONE"; then
-+    exec_prefix=$ac_prefix
-+fi
-+eval ac_libdir=$libdir
-+AC_SUBST(ac_libdir)
-+
- # Enable debugging argument option.
- AC_ARG_ENABLE(debug,
-   AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
-Index: synthv1/src/src_lv2.pri.in
-===================================================================
---- synthv1.orig/src/src_lv2.pri.in	2014-01-25 12:13:05.979584408 +0100
-+++ synthv1/src/src_lv2.pri.in	2014-01-25 12:13:05.971584400 +0100
-@@ -2,6 +2,7 @@
- #
- 
- PREFIX  = @ac_prefix@
-+LIBDIR  = @ac_libdir@
- CONFIG += @ac_debug@
- 
- INCLUDEPATH = @ac_lv2_incpath@
-Index: synthv1/src/src_lv2.pro
-===================================================================
---- synthv1.orig/src/src_lv2.pro	2014-01-25 12:13:05.979584408 +0100
-+++ synthv1/src/src_lv2.pro	2014-01-25 12:13:05.971584400 +0100
-@@ -38,7 +38,11 @@
- 	contains(PREFIX, $$system(echo $HOME)) {
- 		LV2DIR = $${PREFIX}/.lv2
- 	} else {
--		LV2DIR = $${PREFIX}/lib/lv2
-+		isEmpty(LIBDIR) {
-+			LV2DIR = $${PREFIX}/lib/lv2
-+ 		} else {
-+			LV2DIR = $${LIBDIR}/lv2
-+		}
- 	}
- 
- 	TARGET_LV2 = $${NAME}.lv2/$${TARGET}.so
-Index: synthv1/src/src_lv2ui.pro
-===================================================================
---- synthv1.orig/src/src_lv2ui.pro	2014-01-25 12:13:05.979584408 +0100
-+++ synthv1/src/src_lv2ui.pro	2014-01-25 12:13:05.971584400 +0100
-@@ -53,11 +53,10 @@
- 	contains(PREFIX, $$system(echo $HOME)) {
- 		LV2DIR = $${PREFIX}/.lv2
- 	} else {
--		ARCH = $$system(uname -m)
--		contains(ARCH, x86_64) {
--			LV2DIR = $${PREFIX}/lib64/lv2
--		} else {
-+		isEmpty(LIBDIR) {
- 			LV2DIR = $${PREFIX}/lib/lv2
-+		} else {
-+			LV2DIR = $${LIBDIR}/lv2
- 		}
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 96bf5d0..dad2385 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-buildsystem.patch
 0002-fix_hardening.patch
 0003-desktop_keywords.patch
-0004-fix_install_path.patch

-- 
synthv1 packaging