[SCM] muse/master: Drop 0003-ftbfs_gcc47.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Jul 18 14:04:05 UTC 2012


The following commit has been merged in the master branch:
commit e6ffd9d40316fd8b8540c0e8d7446411daad969e
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jul 18 16:02:56 2012 +0200

    Drop 0003-ftbfs_gcc47.patch, applied upstream.

diff --git a/debian/patches/0003-ftbfs_gcc47.patch b/debian/patches/0003-ftbfs_gcc47.patch
deleted file mode 100644
index 1b8aba6..0000000
--- a/debian/patches/0003-ftbfs_gcc47.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko at debian.org>
-Description: Fix build failure with GCC 4.6
-Bug-Debian: http://bugs.debian.org/667290
-Forwarded:
- https://sf.net/tracker/?func=detail&aid=3518839&group_id=93414&atid=604222
----
- muse/liste/editevent.cpp |    2 ++
- 1 file changed, 2 insertions(+)
-
---- muse.orig/muse/liste/editevent.cpp
-+++ muse/muse/liste/editevent.cpp
-@@ -642,6 +642,7 @@ EditCtrlDialog::EditCtrlDialog(int tick,
-                         continue;
-                   }
-             MusECore::MidiController* c = port->midiController(num);
-+	    {
-             isList i = sList.begin();
-             for (; i != sList.end(); ++i) {
-                   if (*i == c->name())
-@@ -649,6 +650,7 @@ EditCtrlDialog::EditCtrlDialog(int tick,
-                   }
-             if (i == sList.end())
-                   sList.push_back(c->name());
-+	    }
-             }
-       MusECore::MidiController* mc = port->midiController(num);
-       int idx = 0;
diff --git a/debian/patches/series b/debian/patches/series
index b4bc706..8c5c69f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0003-ftbfs_gcc47.patch
 1001-buildsystem.patch

-- 
muse packaging



More information about the pkg-multimedia-commits mailing list