diff -Nru gitinspector-0.4.4+dfsg/debian/changelog gitinspector-0.4.4+dfsg/debian/changelog --- gitinspector-0.4.4+dfsg/debian/changelog 2016-07-25 20:08:32.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/changelog 2019-02-10 20:21:35.000000000 +0000 @@ -1,3 +1,37 @@ +gitinspector (0.4.4+dfsg-5) unstable; urgency=medium + + [ Ondřej Nový ] + * d/copyright: + - Use https protocol in Format field + * d/changelog: + - Remove trailing whitespaces + * d/control: + - Remove ancient X-Python-Version field + + [ Stefano Rivera ] + * Remove debian dir from .gitignore + * DEP-14 branch scheme + * Migrate to Git on Salsa + + [ Christian Kastner ] + * d/control: + - Bump Standards-Version to 4.3.0 (no changes needed) + - Switch Build-Depends from debhelper to debhelper-compat + - Bump Build-Depends for debhelper-compat to 12 + * d/compat: + - Drop, as made obsolete by debhelper-compat + * d/copyright: + - Bump copyrights + - Add Files-Excluded field to exclude minimized jQuery + * d/watch: + - Convert to format version 4 + * d/rules: + - Drop get-orig-source target + uscan will pick up Files-Excluded from d/copyright + * Add more options to gbp.conf + + -- Christian Kastner Sun, 10 Feb 2019 21:21:35 +0100 + gitinspector (0.4.4+dfsg-4) unstable; urgency=medium * d/control: @@ -22,7 +56,7 @@ gitinspector (0.4.4+dfsg-1) unstable; urgency=medium - * New upstream release. + * New upstream release. * d/control: - Bump Standards-Version to 3.9.7 (no changes needed) - Switch Vcs-Browser from insecure URI to secure one @@ -50,7 +84,7 @@ gitinspector (0.4.1+dfsg-1) unstable; urgency=medium - * New upstream release. + * New upstream release. * d/control: - Add to Build-Depends: + asciidoc diff -Nru gitinspector-0.4.4+dfsg/debian/compat gitinspector-0.4.4+dfsg/debian/compat --- gitinspector-0.4.4+dfsg/debian/compat 2016-07-19 18:51:13.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru gitinspector-0.4.4+dfsg/debian/control gitinspector-0.4.4+dfsg/debian/control --- gitinspector-0.4.4+dfsg/debian/control 2016-07-25 20:08:32.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/control 2019-02-10 20:21:35.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Python Applications Team Uploaders: Christian Kastner Build-Depends: - debhelper (>= 9), + debhelper-compat (= 12), python-all, dh-python, python-setuptools, @@ -14,11 +14,10 @@ xsltproc, docbook-xml, docbook-xsl, -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 Homepage: https://github.com/ejwa/gitinspector/ -Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/gitinspector/trunk/ -Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/gitinspector/trunk/ -X-Python-Version: >= 2.6 +Vcs-Git: https://salsa.debian.org/python-team/applications/gitinspector.git +Vcs-Browser: https://salsa.debian.org/python-team/applications/gitinspector Package: gitinspector Architecture: all diff -Nru gitinspector-0.4.4+dfsg/debian/copyright gitinspector-0.4.4+dfsg/debian/copyright --- gitinspector-0.4.4+dfsg/debian/copyright 2016-07-19 18:51:13.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/copyright 2019-02-10 20:21:35.000000000 +0000 @@ -1,7 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gitinspector Upstream-Contact: Ejwa Software Source: https://github.com/ejwa/gitinspector +Files-Excluded: + gitinspector/html/jquery.tablesorter.min.js.zip + gitinspector/html/flot.zip Disclaimer: For DFSG purposes, upstream's included versions of miminized jQuery libraries were removed. The source has been patched to instead make use of these @@ -29,7 +32,7 @@ License: GPL-3+ Files: debian/* -Copyright: 2014-2014, Christian Kastner +Copyright: 2014-2019, Christian Kastner License: GPL-3+ License: GPL-3+ diff -Nru gitinspector-0.4.4+dfsg/debian/gbp.conf gitinspector-0.4.4+dfsg/debian/gbp.conf --- gitinspector-0.4.4+dfsg/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/gbp.conf 2019-02-10 20:21:35.000000000 +0000 @@ -0,0 +1,13 @@ +[DEFAULT] +pristine-tar = True +debian-branch = debian/master +upstream-branch = upstream/latest + +[buildpackage] +sign-tags = True + +[import-orig] +upstream-vcs-tag = v%(version)s + +[pq] +patch-numbers = False diff -Nru gitinspector-0.4.4+dfsg/debian/rules gitinspector-0.4.4+dfsg/debian/rules --- gitinspector-0.4.4+dfsg/debian/rules 2016-07-19 18:51:13.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/rules 2019-02-10 20:21:35.000000000 +0000 @@ -26,22 +26,6 @@ rm -f $(CURDIR)/debian/gitinspector/usr/share/doc/gitinspector/LICENSE.txt -# Remove upstream's convenience copies of minified jQuery libraries, we don't -# need them as they are all available in the Archive -get-orig-source: - uscan \ - --noconf \ - --force-download \ - --download-current-version \ - --check-dirname-level=0 \ - --destdir=$(CURDIR) \ - --repack \ - --copyright-file=$(PKGDIR)/debian/files-excluded \ - --compression=xz \ - $(PKGDIR) - rm -f gitinspector-*.tar.gz - - override_dh_auto_clean: dh_auto_clean diff -Nru gitinspector-0.4.4+dfsg/debian/watch gitinspector-0.4.4+dfsg/debian/watch --- gitinspector-0.4.4+dfsg/debian/watch 2016-07-19 18:51:13.000000000 +0000 +++ gitinspector-0.4.4+dfsg/debian/watch 2019-02-10 20:21:35.000000000 +0000 @@ -1,4 +1,4 @@ -version=3 +version=4 opts=\ filenamemangle=s/.+\/v(\d\S*)\.tar\.gz/gitinspector-$1\.tar\.gz/,\