[SCM] samplv1/master: Two patches removed - applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Mar 11 13:17:34 UTC 2014
The following commit has been merged in the master branch:
commit e34b8e89e78fa3db619b7879c1755dfb3bdcb391
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Mar 11 14:17:22 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 a0af609..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: samplv1/configure.ac
-===================================================================
---- samplv1.orig/configure.ac 2014-01-23 02:03:44.295686149 +0100
-+++ samplv1/configure.ac 2014-01-23 02:04:14.222803482 +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"
-@@ -184,10 +184,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: samplv1/src/src_lv2.pro
-===================================================================
---- samplv1.orig/src/src_lv2.pro 2014-01-23 02:03:44.295686149 +0100
-+++ samplv1/src/src_lv2.pro 2014-01-23 02:03:44.291686267 +0100
-@@ -39,12 +39,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/0002-fix_hardening.patch b/debian/patches/0002-fix_hardening.patch
index 778c69f..63b6cf0 100644
--- a/debian/patches/0002-fix_hardening.patch
+++ b/debian/patches/0002-fix_hardening.patch
@@ -4,8 +4,8 @@ Forwarded: yes
Index: samplv1/src/src_jack.pri.in
===================================================================
---- samplv1.orig/src/src_jack.pri.in 2013-09-10 16:51:13.437676585 +0200
-+++ samplv1/src/src_jack.pri.in 2013-09-10 17:21:37.857630499 +0200
+--- samplv1.orig/src/src_jack.pri.in 2014-03-11 14:06:57.621539710 +0100
++++ samplv1/src/src_jack.pri.in 2014-03-11 14:06:57.617539698 +0100
@@ -7,5 +7,7 @@
INCLUDEPATH = @ac_jack_incpath@
LIBS += @ac_jack_libs@
@@ -17,9 +17,9 @@ Index: samplv1/src/src_jack.pri.in
Index: samplv1/src/src_lv2.pri.in
===================================================================
---- samplv1.orig/src/src_lv2.pri.in 2013-09-10 16:51:13.437676585 +0200
-+++ samplv1/src/src_lv2.pri.in 2013-09-10 17:21:50.505630179 +0200
-@@ -7,5 +7,7 @@
+--- samplv1.orig/src/src_lv2.pri.in 2014-03-11 14:06:57.621539710 +0100
++++ samplv1/src/src_lv2.pri.in 2014-03-11 14:06:57.617539698 +0100
+@@ -8,5 +8,7 @@
INCLUDEPATH = @ac_lv2_incpath@
LIBS += @ac_lv2_libs@
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
deleted file mode 100644
index 5d77b1d..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: samplv1/configure.ac
-===================================================================
---- samplv1.orig/configure.ac 2014-01-25 11:48:49.534167836 +0100
-+++ samplv1/configure.ac 2014-01-25 11:48:49.530167817 +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: samplv1/src/src_lv2.pri.in
-===================================================================
---- samplv1.orig/src/src_lv2.pri.in 2014-01-25 11:48:49.534167836 +0100
-+++ samplv1/src/src_lv2.pri.in 2014-01-25 11:48:49.530167817 +0100
-@@ -2,6 +2,7 @@
- #
-
- PREFIX = @ac_prefix@
-+LIBDIR = @ac_libdir@
- CONFIG += @ac_debug@
-
- INCLUDEPATH = @ac_lv2_incpath@
-Index: samplv1/src/src_lv2.pro
-===================================================================
---- samplv1.orig/src/src_lv2.pro 2014-01-25 11:48:49.534167836 +0100
-+++ samplv1/src/src_lv2.pro 2014-01-25 11:48:49.530167817 +0100
-@@ -39,7 +39,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: samplv1/src/src_lv2ui.pro
-===================================================================
---- samplv1.orig/src/src_lv2ui.pro 2014-01-25 11:48:49.534167836 +0100
-+++ samplv1/src/src_lv2ui.pro 2014-01-25 11:48:49.530167817 +0100
-@@ -55,11 +55,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
--
samplv1 packaging
More information about the pkg-multimedia-commits
mailing list