[SCM] qsampler/master: Patch applied upstream.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Mon Sep 19 14:29:19 UTC 2016


The following commit has been merged in the master branch:
commit 491f8a7587db5c754cb4186e5e2fff681823cce0
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Sep 19 16:00:51 2016 +0200

    Patch applied upstream.

diff --git a/debian/patches/0002-configure-gcc6.patch b/debian/patches/0002-configure-gcc6.patch
deleted file mode 100644
index b8c9465..0000000
--- a/debian/patches/0002-configure-gcc6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix build with gcc6
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: qsampler/configure.ac
-===================================================================
---- qsampler.orig/configure.ac
-+++ qsampler/configure.ac
-@@ -62,11 +62,7 @@ AC_ARG_ENABLE(stacktrace,
- 
- 
- # Standard installation base dirs.
--if test "$cross_compiling" = yes; then
--  ac_with_paths=""
--else
--  ac_with_paths="/usr /usr/local"
--fi
-+ac_with_paths=""
- 
- # Set for alternate Qt4/5 installation dir.
- AC_ARG_WITH(qt4,
diff --git a/debian/patches/series b/debian/patches/series
index 1875e4c..56aa973 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-hardening.patch
-0002-configure-gcc6.patch

-- 
qsampler packaging



More information about the pkg-multimedia-commits mailing list