[SCM] qutecsound/master: refresh patches, new changelog

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7f66dd5c95573f3cfe4273c1c30cf8a227204a08
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jan 31 10:29:42 2014 -0300

    refresh patches, new changelog

diff --git a/debian/changelog b/debian/changelog
index 0480899..b21d383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+csoundqt (0.8.2~dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Repackage tarball to exclude non-free icon (Closes: #735499)
+
+ -- Felipe Sateler <fsateler at debian.org>  Wed, 22 Jan 2014 00:39:56 -0300
+
 csoundqt (0.8.0-3) unstable; urgency=low
 
   * Link with csnd6 instead of csnd, upstream renamed the library.
diff --git a/debian/patches/csnd6.patch b/debian/patches/csnd6.patch
deleted file mode 100644
index 1127f74..0000000
--- a/debian/patches/csnd6.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/qcs-unix.pro
-+++ b/qcs-unix.pro
-@@ -56,6 +56,6 @@ RESOURCES += "src/quteapp_d.qrc"
- build32:LCSOUND = -lcsound
- build64:LCSOUND = -lcsound64
- 
--LCSND = -lcsnd
-+LCSND = -lcsnd6
- LSNDFILE = -lsndfile
- 
diff --git a/debian/patches/no-hardcoding.patch b/debian/patches/no-hardcoding.patch
deleted file mode 100644
index 5216307..0000000
--- a/debian/patches/no-hardcoding.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit d284c58480932f097512d80c26db6a039dedc7e2
-Author: Andres Cabrera <andres at lenovo-W530>
-Date:   Sat Aug 10 16:29:37 2013 -0700
-
-    Removed hardcoding Csound6 paths.
-
-diff --git a/qcs.pro b/qcs.pro
-index 2bdaf26..6d04770 100644
---- a/qcs.pro
-+++ b/qcs.pro
-@@ -24,19 +24,16 @@
- # CONFIG+=universal   To build i386/ppc version. Default is platform default
- # ##############################################################################
- 
--csound6: { # Csound6 requires some internal changes
--# Temporary testing paths
-+csound6: {
-     DEFINES += CSOUND6
-     unix {
-         macx {
--#            CSOUND_API_INCLUDE_DIR = /Users/cristina/Library/Frameworks/CsoundLib64.framework/Headers
--#            CSOUND_LIBRARY_DIR = /Users/cristina/Library/Frameworks/CsoundLib64.framework
--#            LIBS += -F/Users/cristina/Library/Frameworks
--#            LIBS += -framework CsoundLib64
-         } else {
--            CSOUND_INCLUDE_DIR = /home/andres/Documents/src/csound-csound6-git/include
--            INCLUDEPATH += /home/andres/Documents/src/csound-csound6-git/interfaces
--            CSOUND_LIBRARY_DIR = /home/andres/Documents/src/csound-csound6-git-build/
-+            isEmpty(CSOUND_INCLUDE_DIR) { # Use my paths by default
-+                CSOUND_INCLUDE_DIR = /home/andres/Documents/src/csound-csound6-git/include
-+                INCLUDEPATH += /home/andres/Documents/src/csound-csound6-git/interfaces
-+                CSOUND_LIBRARY_DIR = /home/andres/Documents/src/csound-csound6-git-build/
-+            }
-         }
-     }
-     message("Building for Csound 6")
diff --git a/debian/patches/no-sf-graphic.patch b/debian/patches/no-sf-graphic.patch
new file mode 100644
index 0000000..29ee2b0
--- /dev/null
+++ b/debian/patches/no-sf-graphic.patch
@@ -0,0 +1,27 @@
+commit c983b208c6276958a6aee26a3a4daef708f8488f
+Author: Andres Cabrera <andres at lenovo-W530>
+Date:   Thu Jan 16 11:55:07 2014 -0800
+
+    Removed sourceforge graphic due to unclear licensing
+
+--- a/src/application.qrc
++++ b/src/application.qrc
+@@ -4,7 +4,6 @@
+         <file>../images/modIcon.png</file>
+         <file>../images/modIcon2.png</file>
+         <file>../images/qtcs.png</file>
+-        <file>../images/project-support.jpg</file>
+         <file>../images/br_next.png</file>
+         <file>../images/br_prev.png</file>
+         <file>../images/gtk-search.png</file>
+--- a/src/qutecsound.cpp
++++ b/src/qutecsound.cpp
+@@ -1979,7 +1979,7 @@ void CsoundQt::about()
+ 	text += QString("<center><a href=\"http://qutecsound.sourceforge.net\">qutecsound.sourceforge.net</a></center>");
+ 	text += QString("<center><a href=\"mailto:mantaraya36 at gmail.com\">mantaraya36 at gmail.com</a></center><br />");
+ 	text += tr("If you find CsoundQt useful, please consider donating to the project:");
+-	text += "<br /><center><a href=\"http://sourceforge.net/donate/index.php?group_id=227265\"><img src=\":/images/project-support.jpg\" width=\"88\" height=\"32\" border=\"0\" alt=\"Support This Project\" /></a></center>";
++	text += "<br /><center><a href=\"http://sourceforge.net/donate/index.php?group_id=227265\">Support this project!</a></center>";
+ 
+ 	text += tr("Please file bug reports and feature suggestions in the ");
+ 	text += "<a href=\"http://sourceforge.net/tracker/?group_id=227265\">";
diff --git a/debian/patches/series b/debian/patches/series
index 1849fde..74321b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-no-hardcoding.patch
-csnd6.patch
+no-sf-graphic.patch

-- 
qutecsound packaging