[SCM] qsampler/master: Removed patches - they don't apply anymore.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Fri Mar 27 14:02:30 UTC 2015


The following commit has been merged in the master branch:
commit 914b613d4cac59547bb62f861024bc2c643fc7ac
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Mar 27 14:58:25 2015 +0100

    Removed patches - they don't apply anymore.

diff --git a/debian/patches/01-fix_desktop.patch b/debian/patches/01-fix_desktop.patch
deleted file mode 100644
index 73b1db2..0000000
--- a/debian/patches/01-fix_desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Fix desktop file according to Freedesktop's spec.
----
- qsampler.desktop.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- qsampler-0.2.2.orig/qsampler.desktop.in
-+++ qsampler-0.2.2/qsampler.desktop.in
-@@ -3,8 +3,8 @@ Name=Qsampler
- GenericName=LinuxSampler GUI
- Comment=Qsampler is a LinuxSampler Qt GUI Interface
- Exec=@ac_prefix@/bin/qsampler
--Icon=@ac_prefix@/share/pixmaps/qsampler.png
--Categories=Audio;AudioVideo;JACK;ALSA;Qt;
-+Icon=qsampler
-+Categories=Audio;AudioVideo;Qt;
- Terminal=false
- Type=Application
- X-SuSE-translate=true
diff --git a/debian/patches/02-pass_flags_to_make.patch b/debian/patches/02-pass_flags_to_make.patch
deleted file mode 100644
index 1d6aae7..0000000
--- a/debian/patches/02-pass_flags_to_make.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Pass C{,XX}FLAGS to the compiler.
----
- qsampler.pro.in |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- qsampler-0.2.2.orig/qsampler.pro.in
-+++ qsampler-0.2.2/qsampler.pro.in
-@@ -64,6 +64,10 @@ OBJECTS_DIR = .obj
- MOC_DIR     = .moc
- UI_DIR      = .ui
- 
-+QMAKE_CFLAGS_RELEASE += $(QT_CFLAGS)
-+QMAKE_CFLAGS_DEBUG += $(QT_CFLAGS)
-+QMAKE_CXXFLAGS += $(QT_CXXFLAGS)
-+
- macx {
-         QMAKE_MAC_SDK = $$(SDKROOT)
-         CONFIG += $$(QMAKE_ARCHS)
diff --git a/debian/patches/03-binutils_gold.patch b/debian/patches/03-binutils_gold.patch
deleted file mode 100644
index 63a78db..0000000
--- a/debian/patches/03-binutils_gold.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Alessio Treglia <alessio at debian.org>
-Description: Append -lX11 to $LIBS to fix FTBFS with binutils-gold.
-Forwarded: no
----
- qsampler.pro.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- qsampler.orig/qsampler.pro.in
-+++ qsampler/qsampler.pro.in
-@@ -57,7 +57,7 @@ LANGUAGE  = C++
- 
- TRANSLATIONS += translations/qsampler_ru.ts
- 
--LIBS     += @ac_libs@
-+LIBS     += @ac_libs@ -lX11
- INCPATH  += @ac_incpath@
- 
- OBJECTS_DIR = .obj
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5e92604..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-fix_desktop.patch
-02-pass_flags_to_make.patch
-03-binutils_gold.patch

-- 
qsampler packaging



More information about the pkg-multimedia-commits mailing list