Hi Toby,

as the release of jessie is getting closer, I've just uploaded an NMU of
musescore to Debian. It fixes an RC bug about a non-free license.
I've attached the patch for the NMU to this e-mail, you might want to
incorporate it into the next packaging.

Regards,
Tobias
diff --git a/debian/changelog b/debian/changelog
index a50d2db..02420a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+musescore (1.3+dfsg1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove file mscore/demos/prelude.mscx from upstream tarball.
+    The file has the license CC-BY-NC-SA 2.0, which is nonfree.
+    Thanks to mejiko <kame55-itasenpara...@y2.dion.ne.jp> (Closes: #749696)
+  * Increment dfsg suffix by one for new upstream tarball and use
+    xz compression
+  * Imported Upstream version 1.3+dfsg1
+  * Add new patch to remove nonfree file from installation
+
+ -- Tobias Quathamer <to...@debian.org>  Thu, 23 Oct 2014 13:05:04 +0200
+
 musescore (1.3+dfsg-2) unstable; urgency=medium
 
   * Remove obsolete mscore.sh script
diff --git a/debian/patches/26-remove-nonfree-prelude.mscx-from-installation.patch b/debian/patches/26-remove-nonfree-prelude.mscx-from-installation.patch
new file mode 100644
index 0000000..b3ecbbd
--- /dev/null
+++ b/debian/patches/26-remove-nonfree-prelude.mscx-from-installation.patch
@@ -0,0 +1,21 @@
+From: Tobias Quathamer <to...@debian.org>
+Date: Thu, 23 Oct 2014 12:58:00 +0200
+Subject: Remove nonfree prelude.mscx from installation
+
+---
+ mscore/demos/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mscore/demos/CMakeLists.txt b/mscore/demos/CMakeLists.txt
+index 24ee71e..64f6762 100644
+--- a/mscore/demos/CMakeLists.txt
++++ b/mscore/demos/CMakeLists.txt
+@@ -28,7 +28,7 @@ install(FILES
+       inv10.mscx
+       inv13.mscx
+       praeludium1.mscx
+-      prelude.mscx
++      prelude-sr.mscx
+       promenade.mscx
+       scales.mscx
+       sonata16.mscx
diff --git a/debian/patches/series b/debian/patches/series
index 34887ce..ae499c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,4 +19,5 @@
 23-fix-bindings.patch
 25-desktop-file-genericnames.patch
 25-build-hurd.patch
+26-remove-nonfree-prelude.mscx-from-installation.patch
 adjust-newer-freetype-header-location.patch
diff --git a/debian/rules b/debian/rules
index 7348bf9..ab48a4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,11 +71,12 @@ get-orig-source:
 	tar -C tmp-musescore-$(version) -xjf mscore-$(version).tar.bz2
 	cd tmp-musescore-$(version)/mscore* && \
 	find -name *pdf -exec rm {} + && \
-	rm mscore/rtf2html/rtf2html
+	rm mscore/rtf2html/rtf2html && \
+	rm mscore/demos/prelude.mscx
 	mv tmp-musescore-$(version)/mscore* \
-	    tmp-musescore-$(version)/musescore-$(version)\+dfsg
-	tar -C tmp-musescore-$(version) -czf musescore_$(version)\+dfsg.orig.tar.gz \
-	    musescore-$(version)\+dfsg/
+	    tmp-musescore-$(version)/musescore-$(version)\+dfsg1
+	tar -C tmp-musescore-$(version) -caf musescore_$(version)\+dfsg1.orig.tar.xz \
+	    musescore-$(version)\+dfsg1/
 	#mv musescore_$(version)\+dfsg.orig.tar.gz ../
 	rm -r tmp-musescore-$(version)
 	-rm mscore*bz2 musescore*bz2

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to