Merge branch 'experimental' into 'master'
authormirabilos <tg@debian.org>
Tue, 9 Jul 2019 21:41:23 +0000 (23:41 +0200)
committermirabilos <mirabilos@evolvis.org>
Tue, 9 Jul 2019 21:41:23 +0000 (23:41 +0200)
1  2 
debian/control
debian/patches/series
debian/repack
debian/watch

diff --cc debian/control
@@@ -37,20 -37,18 +37,18 @@@ Build-Depends: cmake
                 qttools5-dev,
                 qttools5-dev-tools,
                 zlib1g-dev
- Standards-Version: 4.3.0
+ Standards-Version: 4.4.0
  Rules-Requires-Root: no
 -VCS-git: https://evolvis.org/anonscm/git/alioth/musescore.git -b experimental
 -VCS-Browser: https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=alioth/musescore.git;a=shortlog;h=refs/heads/experimental
 +VCS-git: https://evolvis.org/anonscm/git/alioth/musescore.git -b master
 +VCS-Browser: https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=alioth/musescore.git;a=shortlog;h=refs/heads/master
  
- Package: musescore-common
+ Package: musescore3-common
  Architecture: all
  Multi-Arch: foreign
- Depends: musescore-general-soundfont | musescore-compatible-soundfont,
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends: musescore-general-soundfont-small | musescore-compatible-soundfont,
   ${misc:Depends}
- Provides: mscore-common
- Replaces: mscore-common (<< 0.9.6+dfsg-1)
- Breaks: mscore-common (<< 0.9.6+dfsg-1)
- Description: MuseScore (music composition and notation) shared files
+ Description: MuseScore 3 (music composition and notation) shared files
   Demonstration scores and templates, styles, localisations, some
   plugins for MuseScore, the Open Source (GNU GPL) cross-platform
   multi-lingual music notation software.
@@@ -1,13 -1,12 +1,12 @@@
  debian-specific/dfsg-exclusions.diff
- debian-specific/dfsg-exclusions-diffpatchmatch.diff
  debian-specific/debundle-openssl.diff
  debian-specific/kfreebsd-oss-salsa.diff
- upstream/lyrics-hyphen-syllable-closer.diff
- upstream/mscx-reproducible-save-chordlist.diff
- upstream/save-locale-dependent-preferences.diff
- upstream/testsuite.diff
- upstream/better-batch-convert.diff
- experiments/lyrics-hyphen-max-8sp.diff
- experiments/mtest-fix-freetype-includes.diff
- experiments/new-manpage.diff
+ debian-specific/version-dialogue.diff
+ debian-specific/local-docs.diff
+ debian-specific/fixup-AppData.diff
+ upstream/fix-cli-audio.diff
+ experiments/statusline-concert-transposing-pitch.diff
+ experiments/element-barbeat.diff
 -experiments/revert-restriking-patch.diff
 -experiments/log-collisions.diff
 +#experiments/revert-restriking-patch.diff
++#experiments/log-collisions.diff
+ #debian-specific/qt-5.7.diff
diff --cc debian/repack
@@@ -172,7 -172,7 +172,7 @@@ xz -7e "musescore_$debversion.orig.tar
  cat >&2 <<EOF
  Finished!
  The upstream code is in "$outdir/musescore_$debversion.orig.tar.xz".
- Check this in with pristine-tar after committing it to the upstream branch:
-  \$ pristine-tar commit '$outdir/musescore_$debversion.orig.tar.xz' upstream
- Then tag the upstream branch and merge it into master.
 -Check this in with pristine-tar after committing it to the upstream-experimental branch:
 - \$ pristine-tar commit '$outdir/musescore_$debversion.orig.tar.xz' upstream-experimental
 -Then tag the upstream-experimental branch and merge it into experimental.
++Check this in with pristine-tar after committing it to the upstream-stable branch:
++ \$ pristine-tar commit '$outdir/musescore_$debversion.orig.tar.xz' upstream-stable
++Then tag the upstream-stable branch and merge it into master.
  EOF
diff --cc debian/watch
@@@ -4,8 -4,8 +4,8 @@@ version=
  opts=\
  uversionmangle=s/%25/~/,\
  dversionmangle=s/\+dfsg\d*$//,\
- repacksuffix=+dfsg2,\
+ repacksuffix=+dfsg1,\
  compression=gz,\
  filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/MuseScore-$1\.tar\.gz/ \
-   https://github.com/musescore/MuseScore/tags .*/v?(2.[0-9](?:[0-9.]*(?:%25pre)?[0-9]+)?)\.tar\.gz \
 -  https://github.com/musescore/MuseScore/tags .*/v?([0-9](?:[0-9.]*(?:%25pre)?[0-9]+)?)\.tar\.gz \
++  https://github.com/musescore/MuseScore/tags .*/v?([0-9](?:[0-9.]*[0-9])?)\.tar\.gz \
  debian debian/repack