[SCM] musescore/master: set revision automatically when importing new upstream versions via uscan

[Sebastian Ramacher]

On 2016-05-24 12:49:23, shoogle-guest at users.alioth.debian.org wrote:
> The following commit has been merged in the master branch:
> commit 3a8691d8ea8f00066e8a63a691fa66f5c102dbfa
> Author: Peter Jonas <pjonas56 at gmail.com>
> Date:   Mon May 23 17:24:21 2016 +0100
> 
>     set revision automatically when importing new upstream versions via uscan
>     
>     Closes: #818795
> 
> diff --git a/debian/README.Debian b/debian/README.Debian
> index b0f4a92..e3053e0 100644
> --- a/debian/README.Debian
> +++ b/debian/README.Debian
> @@ -1,9 +1,31 @@
>  musescore for Debian
>  ********************
>  
> -  usr/share/mscore is versioned (ie usr/share/mscore-0.7), as upstream 
> -  said he wants to make it possible for other users, not necessarily 
> -  ours, to install more than one version concurrently for testing. Some 
> +  usr/share/mscore is versioned (ie usr/share/mscore-0.7), as upstream
> +  said he wants to make it possible for other users, not necessarily
> +  ours, to install more than one version concurrently for testing. Some
>    files there are version specific, so he versions /usr/share/mscore.
>  
>   -- Toby Smithe <tsmithe at ubuntu.com>
> +
> +  IMPORTING NEW UPSTREAM RELEASES:
> +  Upstream tracks bugs against the Git short commit number (first 7 digits of
> +  upstream commit SHA). This is the "revision" displayed in MuseScore's Help ->
> +  About dialog. This number is stored in the file mscore/revision.h and must be
> +  set *after* importing a new upstream version. This is done automatically if
> +  the new version is imported via `uscan` or `debian/rules get-orig-source`. The
> +  recommended method for importing a new upstream release is as follows:
> +
> +    uscan --verbose
> +    gbp import-orig --merge-mode=replace ../musescore_$(VER)+dfsg.orig.tar.gz
> +
> +    * uscan fetches the upstream tarball, unpacks it, makes changes necessary
> +      for DFSG compliance, and repacks into a dfsg tarball (see debian/repack).
> +    * gbp (git-buildpackage) unpacks the dfsg tarball and commits the changes.
> +      gbp version 0.7.2 or later required. (Note: gbp import-orig --uscan wont
> +      work because it uses the upstream tarball instead of the dfsg tarball.)

This info is better suited for debian/README.source.

> +    * If you don't have gbp just run uscan, then delete everything in the repo
> +      (except the "debian" and ".git" directories) and then unpack the dfsg
> +      tarball into the repo. Update patches and changelog. Commit the changes.

No, packages under team maintenance require gbp.
-- 
Sebastian Ramacher
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20160524/27a06b1a/attachment.sig>