[SCM] muse/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Dec 3 16:12:04 UTC 2011


The following commit has been merged in the master branch:
commit a668bf7c1ccfb85768232daab03b26f272460e2d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 3 17:12:02 2011 +0100

    Refresh patches.

diff --git a/debian/patches/0002-gcc_hardening.patch b/debian/patches/0002-gcc_hardening.patch
index ac22c09..a4d5b99 100644
--- a/debian/patches/0002-gcc_hardening.patch
+++ b/debian/patches/0002-gcc_hardening.patch
@@ -7,7 +7,7 @@ Forwarded: no
 
 --- muse.orig/synti/deicsonze/deicsonze.cpp
 +++ muse/synti/deicsonze/deicsonze.cpp
-@@ -1301,7 +1301,7 @@ void DeicsOnze::loadSutulaPresets()
+@@ -1318,7 +1318,7 @@ void DeicsOnze::loadSutulaPresets()
      file = fopen (presetPath.toLatin1().constData(), "rt");
      if (file == NULL) {
  	printf("can't open ");
diff --git a/debian/patches/1001-buildsystem.patch b/debian/patches/1001-buildsystem.patch
index 0d0f01c..d1e5b76 100644
--- a/debian/patches/1001-buildsystem.patch
+++ b/debian/patches/1001-buildsystem.patch
@@ -7,16 +7,16 @@ Forwarded: not-needed
 
 --- muse.orig/CMakeLists.txt
 +++ muse/CMakeLists.txt
-@@ -63,10 +63,10 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+@@ -66,10 +66,10 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
  SET(MusE_VERSION_MAJOR 2)
  SET(MusE_VERSION_MINOR 0)
  SET(MusE_VERSION_PATCH 0)
--SET(MusE_VERSION       "2.0beta2")
--SET(MusE_VERSION_FULL  "2.0beta2")
--SET(MusE_INSTALL_NAME  "muse-2.0beta")
+-SET(MusE_VERSION       "2.0rc1")
+-SET(MusE_VERSION_FULL  "2.0rc1")
+-SET(MusE_INSTALL_NAME  "muse-2.0rc1")
 -SET(MusE_EXEC_NAME     "muse2")
-+SET(MusE_VERSION       "2.0~beta2")
-+SET(MusE_VERSION_FULL  "2.0~beta2")
++SET(MusE_VERSION       "2.0~rc1")
++SET(MusE_VERSION_FULL  "2.0~rc1")
 +SET(MusE_INSTALL_NAME  "muse")
 +SET(MusE_EXEC_NAME     "muse")
  
diff --git a/debian/patches/series b/debian/patches/series
index 9666589..2ba8d8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-es_locale_fix.patch
 0002-gcc_hardening.patch
 1001-buildsystem.patch

-- 
muse packaging



More information about the pkg-multimedia-commits mailing list