This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website.
commit ba0ca493e046c8a21c81b9b56e1ef9037315af6a Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue May 6 12:54:39 2014 +0200 Expand 'Upgrading to a new upstream release' section. --- policy.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/policy.xml b/policy.xml index 7aac2e7..fa544f6 100644 --- a/policy.xml +++ b/policy.xml @@ -979,6 +979,52 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder </para> </warning> <para> + First download the upstream tarball with <command>uscan</command>: +<programlisting> +<command>uscan</command> <option>--verbose</option> <option>--download</option> +</programlisting> + </para> + <para> + Then import the downloaded tarball with + <command>git-import-orig</command>: +<programlisting> +<command>git-import-orig</command> <option>--pristine-tar</option> <option><replaceable>../<package>_<version>.orig.tar.gz</replaceable></option> +</programlisting> + </para> + <para> + And create a new + <link linkend="debian-changelog"><filename>debian/changelog</filename></link> + entry for the new upstream release: +<programlisting> +<command>dch</command> <option>-v</option> <replaceable><version></replaceable>-1 <literal>"New upstream release."</literal> +</programlisting> + </para> + <para> + If <link linkend="patches">patches</link> are included in the source package it's likely they have + been applied upstream and can be remove, or need to be refreshed. + </para> + <para> + Step through the list of patches and update them for the new + upstream release. +<programlisting> +<command>quilt push</command> && <command>quilt refresh</command> +</programlisting> + </para> + <para> + Check all patches that fail to apply and remove the ones applied + upstream, <command>git rm</command> the patch file and remove its + entry in <filename>debian/patches/series</filename>. + </para> + <para> + Patches that were only partially applied usually need to + forcefully applied and refreshed. +<programlisting> +<command>quilt push</command> <option>-f</option> && <command>quilt refresh</command> +</programlisting> + Review the <filename>*.rej</filename> files to make sure the patch + was properly refreshed. + </para> + <para> ... </para> </sect4> @@ -1653,13 +1699,13 @@ Homepage: <replaceable>http://www.example.com/</replaceable> <ulink url="http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-VCS-fields">§ 5.6.26</ulink> for details: <programlisting> -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/<package>.git -Vcs-Git: git://anonscm.debian.org/pkg-grass/<package>.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/<replaceable><package></replaceable>.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/<replaceable><package></replaceable>.git </programlisting> or <programlisting> -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-grass/packages/<package>/trunk/ -Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-grass/packages/<replaceable><package></replaceable>/trunk/ +Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<replaceable><package></replaceable>/trunk/ </programlisting> </para> </formalpara> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel