summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog77
-rw-r--r--debian/control2
-rw-r--r--debian/tests/control12
3 files changed, 89 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 4209e71..9fd6edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+dgit (4.2~) experimental; urgency=medium
+
+ Documentation improvements:
+ * dgit(1): Add a bit more rationale (polemic, even). Closes:#874221.
+ * Recommend mk-build-deps rather than apt-get build-dep.
+ Suggestion from Nikolaus Rath. Closes:#863361.
+ * dgit-maint-merge(7): many updates. [Sean Whitton]
+ Closes:#864873,#878433.
+ * dgit-*(7): Mention first upload trick. [Andrew Shadura,
+ Sean Whitton] Closes:#856402.
+
+ Minor fixes:
+ * When source discrepancy involves file mode changes, report them
+ specially. Closes:#886442.
+ * In split brain mode, with unexpected diffs, print dgit view
+ commitid in suggested diff rune. (HEAD is wrong.) Closes:#886443.
+ * Fix message about missing quilt cache entry to refer to
+ HEAD rather than tree, since dgit needs a commit. Closes:#884646.
+ * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
+ * Remove some whitespace "errors". [Sean Whitton]
+
+ Packaging:
+ * Remove dependency alternative on realpath (package last existed in
+ Debian wheezy). Closes:#877552.
+
+ Test suite:
+ * dpkgsourceignores-docs: Correct restriction (so autopkgtest
+ won't try to run it).
+
+ --
+
dgit (3.13) unstable; urgency=high
Important bugfixes to dgit:
@@ -9,6 +40,52 @@ dgit (3.13) unstable; urgency=high
-- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 22 Oct 2017 17:51:12 +0100
+dgit (4.1) experimental; urgency=medium
+
+ Important improvements to dgit:
+ * Support for `git worktree' worktrees. There may still be
+ bugs; the tests for this are not very comprehensive. And
+ worktrees on different filesystems may not work; that's a
+ matter for the future. Closes:#868515.
+ * Change the dpkg-source -i argument to exclude exactly the right
+ set of things. (Sadly this is not a simple rune.)
+
+ Other improvements to dgit:
+ * New print-dpkg-source-ignores option to print the big rune
+ you need to pass to dpkg-source to make it work exactly right.
+ * Properly shell-quote the --git-builder argument to gbp.
+
+ Documentation:
+ * dgit-user(7): Provide information about how to use sbuild.
+ Quite ugly due to #868527. Closes:#868526.
+ * dgit-user(7): Fixed example rune to use curl (which prints
+ to stdout, as the rune expects). [reported by Simon Tatham]
+
+ Minor improvements:
+ * Do not leave many clog-* files in .git/dgit.
+
+ Internal changes:
+ * using-these: New script to help with ad-hoc-testing.
+ * Refactoring in preparation for push-source [Sean Whitton].
+
+ Test suite:
+ * sbuild-gitish: New test case to check running sbuild from git
+ * Work around gnupg agent connection races by having our stunt
+ gpg wrapper simply try running gpg again, once, if it exits 2.
+ This does not fully suppress the bug but it does significantly reduce
+ the probability.
+ * Other tests for new features.
+ * Various refactoring.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 14 Aug 2017 09:31:03 +0100
+
+dgit (4.0) experimental; urgency=low
+
+ * dgit: --deliberately-not-fast-forward works properly in
+ split view quilt modes (suppressing the pseudomerge).
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 12 Feb 2017 22:22:31 +0000
+
dgit (3.12) unstable; urgency=high
Important bugfixes to dgit:
diff --git a/debian/control b/debian/control
index 4d4c304..4405e14 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/dgit.git/
Package: dgit
Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
${misc:Depends}, git-buildpackage, liblist-moreutils-perl,
- coreutils (>= 8.23-1~) | realpath,
+ coreutils (>= 8.23-1~),
libdigest-sha-perl, dput, curl, apt,
libjson-perl, ca-certificates,
libtext-iconv-perl, libtext-glob-perl
diff --git a/debian/tests/control b/debian/tests/control
index 76fe9bd..7d2a486 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,6 +6,11 @@ Tests: clone-reprepro downstream-gitless
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, reprepro
+Tests: dpkgsourceignores-docs
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin
+Restrictions: x-dgit-intree-only
+
Tests: defdistro-dsd-clone-drs dsd-clone-drs
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin
@@ -24,12 +29,17 @@ Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, sbuild
Restrictions: x-dgit-schroot-build
+Tests: sbuild-gitish
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, sbuild, man-db
+Restrictions: x-dgit-schroot-build
+
Tests: spelling
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin
Restrictions: x-dgit-git-only
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp 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 gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin