Your message dated Sat, 16 Jul 2016 22:09:57 +0000
with message-id <e1boxmx-0002wh...@franck.debian.org>
and subject line Bug#818795: fixed in musescore 2.0.3+dfsg1-1
has caused the Debian Bug report #818795,
regarding musescore: upstream revision is incorrect
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
818795: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818795
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: musescore
Version: 2.0.2+dfsg-2
Severity: normal

Dear maintainer,

MuseScore's Help -> About dialog displays a revision number which the
upstream developers use for tracking bug reports at
https://musescore.org/en/project/issues. The revision number should be set
to the first 7 digits of the git commit SHA corresponding to the upstream
release, however, this is not being done in the Debian packages (the
default value of "3543170" is being used each time instead). I have
attached code files which will set the revision number to the correct value
automatically.

The revision number is an upstream concept, so it should be performed
before the creation of orig.tar.gz. The upstream Makefile provides the
target "make revision" to set the revision number, but this target only
works inside a Git repository. It could be performed by the
"get-orig-source" function inside debian/rules, which would do a Git clone
of the upstream tag, run "make revision", and then tidy up and pack
everything into orig.tar.gz. However, if a future maintainer were to
perform a upstream update via debian/watch (i.e. `uscan`) instead of
`debian/rules get-orig-source` then the revision number would not be set.

The solution chosen here is not to clone the Git repo, but instead to use
`uscan` to download the upstream tarball and set the revision number by
grepping it from the tag page on GitHub. The "get-orig-source" target in
debian/rules simply calls `uscan`, so the revision number will be set
whichever method the maintainer uses.

Please find solution code in the attached files. The solution makes use of
the "action" field in debian/watch to launch the new script debian/repack,
which sets the revision number in the upstream tarball and makes changes
necessary for DFSG compliance.

musescore-debian-watch.txt - rename this debian/watch and replace existing
file.
musescore-debian-repack.txt - rename this debian/repack and give execute
permission.
musescore-debian-rules-getorigsource.txt - replace the existing
"get-orig-source" target in debian/rules with the contents of this file.

You might also want to add an explanation to debian/README.Debian. Maybe
something like:

> MuseScore's Help -> About dialog shows a revision number which is simply
the
> first 7 digits of the git commit SHA corresponding to the tagged upstream
> release. This number must be set in the upstream tarball after it has been
> downloaded (this is done automatically if the tarball is fetched using
`uscan`
> or the get-orig-source target in debian/rules). The revision number is
used by
> upstream for tracking bugs, so it shouldn't be changed on a Debian
revision.

I, the author and copyright holder for the attached files
"musescore-debian-watch.txt", "musescore-debian-repack.txt" and
"musescore-debian-rules-getorigsource.txt" give permission for their
contents to be modified and/or redistributed under the terms of the GNU
General Public License, version 2.

Thanks,
Peter Jonas
(a.k.a. "shoogle" on GitHub and MuseScore.org)
# debian/watch - check for a new upstream release and fetch it. See USCAN(1).
# The script 'debian/repack' is called to perform changes for DFSG compliance.
version=3
opts=\
dversionmangle=s/\+dfsg\d*$//,\
filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/MuseScore-$1\.tar\.gz/ \
  https://github.com/musescore/MuseScore/tags .*/v?(\d\S*)\.tar\.gz \
debian debian/repack
.PHONY: get-orig-source
## Usage: debian/rules get-orig-source
## Based on: http://wiki.debian.org/onlyjob/get-orig-source
get-orig-source: PKG_DIR:=$(abspath $(dir $(MAKEFILE_LIST)))
get-orig-source:
        # Simply call uscan (changes for DFSG done in debian/watch and 
debian/repack)
        uscan --noconf --verbose --destdir=$(CURDIR) \
          --check-dirname-level=0 --force-download $(PKG_DIR)
#!/bin/bash
# debian/repack - Produce DFSG compliant orig.tar.gz from upstream tarball.
#  1) Unpack upstream tarball.
#  2) Set revision number in mscore/revision.h to match Git commit number.
#  3) Ensure DSFG compliance (removes precompiled binaries and PDFs).
#  4) Pack into orig.tar.gz

set -e # exit on error

function usage() {
cat <<EOF
debian/repack - Produce DFSG compliant orig.tar.gz from upstream tarball.

Usage:    debian/repack  --upstream-version  VERSION  UPSTREAM-TARBALL
Example:  debian/repack  --upstream-version  "2.0.1"  "../v2.0.1.tar.gz"
EOF
}

[[ "$1" == "--usage" || "$1" == "--help" || "$1" == -[h?] ]] && usage && exit

if [ "$1" != "--upstream-version" ] || [ ! "$2" ]; then
  printf "$0: Error! Upstream version was not specified.\n\n$(usage)\n" >&2
  exit 1
fi

if [ ! -f "$3" ]; then
  printf "$0: Error! Upstream tarball was not specified.\n\n$(usage)\n" >&2
  exit 1
fi

version="$2"
tarball="$(basename "$3")"
outdir="$(dirname "$3")" # output files to same dir as input files were located

cd "$outdir"

symlink=""
if [ -L "$tarball" ]; then
  # If $tarball was actually a symlink then resolve it
  symlink="$tarball"
  tarball="$(readlink "$symlink")"
fi

tempdir="tmp-musescore-$version"

# 1) Unpack upstream tarball
echo "Unpacking upstream tarball into '$tempdir'." >&2
mkdir "$tempdir"
tar -zxf "$tarball" -C "$tempdir"
cd "$tempdir/MuseScore-$version"

# 2) Set revision number in mscore/revision.h to match upstream Git commit
# Note: upstream has a Makefile target "make revision" to set the revision, but
# it only works inside a Git repo so we have to get the revision another way.
echo "Determining upstream revision (first 7 characters of Git commit SHA)." >&2
commit="$(wget -qO - "https://github.com/musescore/MuseScore/tree/v$version"; \
 | grep "commit-tease-sha" \
 | sed -r 's|.*MuseScore/commit/([[:alnum:]]{7}).*|\1|')"
if [ ! "$commit" ]; then
 echo "$0: Error! Couldn't get upstream commit." >&2
 exit 1
fi
echo "Upstream revision is '$commit'." >&2

echo "Setting revision number in 'mscore/revision.h' to '$commit'." >&2
echo "$commit" > "mscore/revision.h"

# 3) Ensure DSFG compliance (remove precompiled binaries and PDFs, etc).
echo "Making changes to ensure DFSG compliance." >&2

echo "Removing PDF files." >&2
echo "Files-Excluded:"
find . -iname "*.pdf" -exec rm "{}" \; -exec echo "                {}" \;
echo  "Comment: PDFs removed for DFSG compliance (not a transparent format)."

echo "Removing precompiled binaries." >&2
echo "Files-Excluded:"
find -type f -executable \
  -exec sh -c "file -i '{}' | grep -q 'x-executable; charset=binary'" \; \
  -exec rm "{}" \; -exec echo "                {}" \;
echo "Comment: Binaries removed for DFSG compliance (not a transparent format)."

# 4) Pack into orig.tar.gz
cd .. # now inside $tempdir
mv "MuseScore-$version" "musescore-$version+dfsg"
tar -cf "../musescore_$version+dfsg.orig.tar" "musescore-$version+dfsg"
cd .. # now back to output directory (outside $tempdir)
gzip -9 "musescore_$version+dfsg.orig.tar"

# Tidy up
echo "Removing temporary files." >&2
rm -rf "$tempdir" "$tarball" "$symlink"

cat >&2 <<EOF
Finished!
The upstream code is in "$outdir/musescore_$version+dfsg.orig.tar.gz".
Use 'uupdate' to upgrade the source package based on the upstream release:
  uupdate  --upstream-version  $version  
$outdir/musescore_$version+dfsg.orig.tar.gz
EOF

--- End Message ---
--- Begin Message ---
Source: musescore
Source-Version: 2.0.3+dfsg1-1

We believe that the bug you reported is fixed in the latest version of
musescore, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 818...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Fabian Greffrath <fab...@debian.org> (supplier of updated musescore package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sat, 16 Jul 2016 19:14:43 +0200
Source: musescore
Binary: musescore musescore-common musescore-soundfont-gm
Architecture: source all amd64
Version: 2.0.3+dfsg1-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers 
<pkg-multimedia-maintainers@lists.alioth.debian.org>
Changed-By: Fabian Greffrath <fab...@debian.org>
Description:
 musescore  - Free music composition and notation software
 musescore-common - Free music composition and notation software (common files)
 musescore-soundfont-gm - Old MuseScore soundfont (dummy package)
Closes: 797259 808781 815688 818619 818795 821325 824956
Changes:
 musescore (2.0.3+dfsg1-1) unstable; urgency=medium
 .
   * Team upload.
 .
   [ Peter Jonas ]
   * New upstream version 2.0.3. (Closes: #821325)
   * Remove obsolete manual patch - upstream has removed the manual from the
     source and it's now available online. (Closes: #815688; LP: #1492629)
   * Remove other obsolete patches.
   * Update debian/copyright. (Closes: #818619)
   * Set revision on upstream import via uscan. (Closes: #818795; LP: #1492623)
   * Update syntax for debian/gbp.conf and debian/watch.
   * Add Files-Excluded field to debian/copyright and adjusted debian/repack.
   * Don't build-depend on qtquick1-5-dev. (Closes: #808781, #824956)
   * Add documentation for handling new upstream releases to README.source.
 .
   [ James Cowgill ]
   * Modernize debian/rules and use cmake directly.
     - The buggy CPU detection code is no longer used. (Closes: #797259)
 .
   * debian/control:
     - Neaten up using wrap-and-sort.
     - Use secure Vcs URLs.
     - Bump standards to 3.9.8 (no changes).
     - Depend on exact version of musescore-common.
   * debian/copyright:
     - Add copyright for thirdparty/freetype.
     - Remove unused LGPL-2.1 paragraph.
     - Fix Files regex for thirdparty/intervaltree.
   * debian/patches:
    - 01 Use the system copy of FreeType.
    - 02 Put common flags into CMAKE_CXX_FLAGS and disable PCH.
    - 03 Remove OpenSSL references from kQOAuth.
    - 04 Fix manpage errors.
   * debian/*.postinst, debian/*.postrm, debian/*.prerm:
    - Drop all maintainer scripts, everything is handled by triggers now.
   * debian/rules:
    - Enable all hardening flags.
    - Use -Wl,--as-needed to avoid extra library dependencies.
Checksums-Sha1:
 22593fb6a7407686d553f020233d24f8e5dac7a1 2457 musescore_2.0.3+dfsg1-1.dsc
 719be129715c94efbd0cf7a8ed65dd7c41d55522 45024902 
musescore_2.0.3+dfsg1.orig.tar.gz
 0646ce91a0b1637505ae34d7e93117421cb56d99 26152 
musescore_2.0.3+dfsg1-1.debian.tar.xz
 654a9aaf398789c595fcf7d30beb2d3ddc6207cc 13053684 
musescore-common_2.0.3+dfsg1-1_all.deb
 ae89dd1d52eb48c4c80699da31bedc0b803a1580 98281506 
musescore-dbgsym_2.0.3+dfsg1-1_amd64.deb
 24435098e47f5cb691436b99fc2ee5f775c0f097 21454 
musescore-soundfont-gm_2.0.3+dfsg1-1_all.deb
 45bd652ff9564c8f2d4849b39010419ea1cdde01 7941656 
musescore_2.0.3+dfsg1-1_amd64.deb
Checksums-Sha256:
 4fad85b5a5a01886daf8c1e55d030914f3a1f49fab9e619b3c92562b328f5f19 2457 
musescore_2.0.3+dfsg1-1.dsc
 407061d88aac73d18a654c81f8f9896527b1040c1ec118c1b205186fa45370b8 45024902 
musescore_2.0.3+dfsg1.orig.tar.gz
 2c70ba7ded36449b12fd269ae0cbc96807677b884f4fee43580f86647526bef5 26152 
musescore_2.0.3+dfsg1-1.debian.tar.xz
 62ba0a3fd9ba3c630671548fa641e740264881f3ed4c55ce55817bae85251f8f 13053684 
musescore-common_2.0.3+dfsg1-1_all.deb
 ef75083a37acdab38ac8610e603a6184192410e38703062a3fbeb6d7353ee7a2 98281506 
musescore-dbgsym_2.0.3+dfsg1-1_amd64.deb
 ca019f9632b1a00feebd75b9ee59ee4bb4be953f7a313c6e52f4c3f1a1798230 21454 
musescore-soundfont-gm_2.0.3+dfsg1-1_all.deb
 c9e804291be2e10e6ecd8572ffa11f4d39c0ff7ebba3785d5559d393c13f2b8d 7941656 
musescore_2.0.3+dfsg1-1_amd64.deb
Files:
 abdbeb48e66b9f02b2e9121e4f76e8f6 2457 sound optional 
musescore_2.0.3+dfsg1-1.dsc
 d1078f484254cb31e9e9b3132f17898b 45024902 sound optional 
musescore_2.0.3+dfsg1.orig.tar.gz
 cd336877979f0cf4afa3f6d94904e69e 26152 sound optional 
musescore_2.0.3+dfsg1-1.debian.tar.xz
 e614f5c3d190e0eabba368e20fd8a376 13053684 sound optional 
musescore-common_2.0.3+dfsg1-1_all.deb
 e760f6d5758c3744422559709b5660b5 98281506 debug extra 
musescore-dbgsym_2.0.3+dfsg1-1_amd64.deb
 026fd0a0e8ae31c1424f8a4027a57981 21454 sound optional 
musescore-soundfont-gm_2.0.3+dfsg1-1_all.deb
 441d3343cc3410e799daa36d02461c4d 7941656 sound optional 
musescore_2.0.3+dfsg1-1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJXiofuAAoJEMvqjpcMzVnfZhAQAIPEGLvtECKjYNCCnj4L7Pk6
qdiibFFqfnQzswa1EHH2G9ZyJUyIzE5c3tJCU3GV7b1eAixcvQ8lGBHtZo5TiVSC
HRpf7/tbDWN6pxBaQzj2/p1HHagPOrkJDckx4hUxR3mB0FWZIX5k+X7jf1Bjs34F
/Neg2PySc3WeK2aWx4umDz+lRgIuBDwlliZT8CqmTU8A9ErVIqVnBLJm6Af/5Xcw
hNHgRnwnerYXIGJbErm5J9tR0AxGhxCnf4ZERzRUliz4Av6ZgigDSjDGcGwdWcmI
YHcH9sXS7Bo5c327aFfWbqW/3mDa9lidP0k2yhvVrJOsJGTzZ4F7B5EQ0kCmwxri
7sWRpI/dMQEMzneuL3ufeR+qNlDl7PGth99e2eURgb86zemwPcpz78ucl5E2MWl3
pVRRavJ/jXqN+KO/U2J/wjqSkBsezDaHq5s/WKGUT1+w0XfTImooT1xhw/DoxDI4
2mIF/Zvg+q223hfzmam00MIUjQ8pOAbvXCZQd8Bd73iIzke6Xu713ELa61Dv/4sM
aQHSu2R3rT7Og4ykKPaH/R3WA4cnDKTQKFRF66Q9YPMhIIVK8ThcYxD6IiEK6Pbk
C0UtmjUlkWhQ6c9giOEJfOH1lCuYVomm+7JYXRp6TyIrdaLyXvT0pLDK2Y1/vOfX
YKXVIdt/BaMI2CjOyzpD
=M/RR
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to