[SCM] zynaddsubfx/master: Patches refreshed/removed.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Mon Nov 21 06:27:05 UTC 2016


The following commit has been merged in the master branch:
commit 557a15c0857af19efdfcd10471fbead79c38160f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Nov 21 07:26:46 2016 +0100

    Patches refreshed/removed.

diff --git a/debian/patches/0002-bigendian-fix.patch b/debian/patches/0002-bigendian-fix.patch
deleted file mode 100644
index ac212ef..0000000
--- a/debian/patches/0002-bigendian-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix Test Failure On Big-Endian Systems.
-Cherrypicked from upstream.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: zynaddsubfx/rtosc/test/fat-message.c
-===================================================================
---- zynaddsubfx.orig/rtosc/test/fat-message.c
-+++ zynaddsubfx/rtosc/test/fat-message.c
-@@ -46,14 +46,15 @@ int main()
-     assert_str_eq(s, rtosc_argument(buffer, 2).s,
-             "Checking 's' Argument", __LINE__);
-     CHECK(b.len,b.len,3);
--    assert_hex_eq((char*)b.data, (char*)arg.b.data, 3, b.len, 
-+    assert_hex_eq((char*)b.data, (char*)arg.b.data, 3, b.len,
-             "Checking 'b.data' Argument", __LINE__);
-     CHECK(h,h,4);
-     CHECK(t,t,5);
-     CHECK(d,d,6);
-     assert_str_eq(S,rtosc_argument(buffer, 7).s,
-             "Checking 'S' Argument", __LINE__);
--    CHECK(c,i,8);
-+    assert_char_eq(c,rtosc_argument(buffer, 8).i,
-+            "Checking 'c' Argument", __LINE__);
-     CHECK(r,i,9);
-     CHECK(m,m,10);
-     assert_char_eq('T', rtosc_type(buffer,11),
diff --git a/debian/patches/0003-dont_duplicate_changelog_files.patch b/debian/patches/0003-dont_duplicate_changelog_files.patch
index 485b9de..d7f0a04 100644
--- a/debian/patches/0003-dont_duplicate_changelog_files.patch
+++ b/debian/patches/0003-dont_duplicate_changelog_files.patch
@@ -6,7 +6,7 @@ Index: zynaddsubfx/CMakeLists.txt
 ===================================================================
 --- zynaddsubfx.orig/CMakeLists.txt
 +++ zynaddsubfx/CMakeLists.txt
-@@ -28,7 +28,7 @@ include(CTestConfig.cmake)
+@@ -30,7 +30,7 @@ include(CTestConfig.cmake)
  #Currently the only directory that uses cmake
  add_subdirectory(src)
  
diff --git a/debian/patches/0004-spelling.patch b/debian/patches/0004-spelling.patch
deleted file mode 100644
index 788cde9..0000000
--- a/debian/patches/0004-spelling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix small misspellings.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: mark.d.mccurry at gmail.com
-
-Index: zynaddsubfx/src/UI/MasterUI.fl
-===================================================================
---- zynaddsubfx.orig/src/UI/MasterUI.fl
-+++ zynaddsubfx/src/UI/MasterUI.fl
-@@ -1485,7 +1485,7 @@ selectuiwindow->hide();}
-         xywh {10 165 100 35} color 229 labelfont 1 labelsize 16
-       }
-       Fl_Box {} {
--        label {.. if you have used ZynAddSubFX before, or you like to have full controll to all parameters.}
-+        label {.. if you have used ZynAddSubFX before, or you like to have full control to all parameters.}
-         xywh {110 165 310 35} labelfont 1 labelsize 11 align 144
-       }
-       Fl_Button {} {
diff --git a/debian/patches/series b/debian/patches/series
index 4ef9322..3061f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0002-bigendian-fix.patch
 0003-dont_duplicate_changelog_files.patch
-0004-spelling.patch

-- 
zynaddsubfx packaging



More information about the pkg-multimedia-commits mailing list