[SCM] musescore/master: Update watch file and get-orig-source rules

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6a73b9e6c565adcd276bcfef8561d3018fb49188
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Wed Jun 17 12:38:06 2015 -0400

    Update watch file and get-orig-source rules

diff --git a/debian/changelog b/debian/changelog
index 60c0d27..2cfe967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-musescore (2.0.1-1) unstable; urgency=low
+musescore (2.0.1+dfsg-1) unstable; urgency=low
 
   [ Toby Smithe ]
   * New upstream release (2.0.1)
@@ -10,11 +10,11 @@ musescore (2.0.1-1) unstable; urgency=low
   * Update debian/copyright, rewrite as machine-readable.
 
   [ Tiago Bortoletto Vaz ]
-  * Removing +dfsg1 from version
   * new Standards-Version
   * fix upstream name/contact in copyright file
   * Hardened build (https://wiki.debian.org/Hardening)
   * Add new MuseScore icon and menu entry
+  * Update watch file and get-orig-source rules
 
  -- Toby Smithe <tsmithe at ubuntu.com>  Mon, 23 Mar 2015 14:29:21 +0100
 
diff --git a/debian/rules b/debian/rules
index 599b28e..9cc0f4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,15 @@ override_dh_install:
 get-orig-source: version = $(shell uscan --force-download --dehs --destdir . | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 get-orig-source:
 	-mkdir tmp-musescore-$(version)
-	tar -C tmp-musescore-$(version) -xjf mscore-$(version).tar.bz2
-	cd tmp-musescore-$(version)/mscore* && \
+	unzip MuseScore-$(version).zip -d tmp-musescore-$(version)
+	cd tmp-musescore-$(version)/MuseScore-$(version) && \
 	find -name *pdf -exec rm {} + && \
 	rm thirdparty/rtf2html/rtf2html
-	mv tmp-musescore-$(version)/mscore* \
+	mv tmp-musescore-$(version)/MuseScore-$(version) \
 	    tmp-musescore-$(version)/musescore-$(version)\+dfsg
 	tar -C tmp-musescore-$(version) -czf musescore_$(version)\+dfsg.orig.tar.gz \
 	    musescore-$(version)\+dfsg/
-	#mv musescore_$(version)\+dfsg.orig.tar.gz ../
+	mv musescore_$(version)\+dfsg.orig.tar.gz ../
 	rm -r tmp-musescore-$(version)
-	-rm mscore*bz2 musescore*bz2
+	-rm MuseScore-$(version).zip musescore_$(version).orig.tar.gz
 
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..770085d
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/mscore.png
diff --git a/debian/watch b/debian/watch
index 24cadd4..04d77ea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,2 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
-  http://sf.net/mscore/mscore-([\d.]*)\.tar\.bz2
-
-
+http://ftp.osuosl.org/pub/musescore/releases/MuseScore-(\d[\d.]*)/MuseScore-(\d[\d.]*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
musescore packaging