summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog30
-rw-r--r--debian/copyright1
-rw-r--r--debian/tests/control12
3 files changed, 40 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e152346..b88d284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+dgit (9.7) unstable; urgency=medium
+
+ dgit general bugfixes:
+ * Correctly test for presence of git repo on dgit git server.
+ Fixes behaviour following mixed dgit/non-dgit uploads. Closes:#934126.
+ (Was badly broken by http fetching rework in dgit 9.6.)
+ * Fix use on NFS, by closing a file which is going to be deleted.
+ [Report and fix from St├ęphane Glondu] Closes:#933827.
+
+ dgit vcs-git bugfixes:
+ * Strip [<path>] (used eg by Debian Haskell Team). Closes:#932699.
+ * update-vcs-git: Cope if url is unchanged.
+ * update-vcs-git: Strip -b (as it always should have done).
+
+ Test suite:
+ * New facilities for http testing, including mock webservers.
+ * New test cases for http, and for bugs fixed in this version.
+ * Switch to using http git check in three existing tests.
+ * Improve debian/tests/control generator.
+ * Limited refactoring to support other changes.
+
+ Other minor changes:
+ * dgit: Slightly more debugging for check_for_git with http[s]
+ * changelog: Fix a typo in the entry for 9.6.
+ * i18n (messages) updated, following message changes.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 11 Aug 2019 01:11:01 +0100
+
dgit (9.6~bpo10+1) buster-backports; urgency=medium
* Rebuild for buster-backports.
@@ -13,7 +41,7 @@ dgit (9.6) unstable; urgency=medium
* Drop support for configuring old, not currently enabled, methods
of TLS key/cert pinning. We are going to revisit this soon.
* Provide a --for-push option (useful in for certain special users).
- * Reduce variety in HTTP clients we use. Specificalloy, use WWW::Curl
+ * Reduce variety in HTTP clients we use. Specifically, use WWW::Curl
for accessing (i) the ftpmaster API, (ii) the http dgit git server
mirror (iii) downloading the .dsc.
diff --git a/debian/copyright b/debian/copyright
index 22c9713..cb35198 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ Copyright (C)2019 Matthew Vernon / Genome Research Limited
Copyright (C)2019 Paul Hardy
Copyright (C)1999-2010 Joey Hess
Copyright (C)2004-2010 Colin Watson
+Copyright (C)2004-2015 Best Practical Solutions, LLC
This program is free software: you can redistribute it and/or modify
diff --git a/debian/tests/control b/debian/tests/control
index 63e9369..731600b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,11 +20,19 @@ Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
Restrictions: x-dgit-intree-only x-dgit-git-only
+Tests: alternating-dgit clone-gitnosuite clone-nogit drs-clone-nogit dsd-clone-nogit ftpmasterapi-http
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libhttp-server-simple-static-perl
+
+Tests: gdr-import-dgit
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage, libhttp-server-simple-static-perl
+
Tests: gdr-merge-conflicts
Tests-Directory: tests/tests
Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage, quilt
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage
@@ -88,7 +96,7 @@ Tests: trustingpolicy-replay
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-push-masterupdate drs-push-rejects dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime