summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog54
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules7
3 files changed, 47 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index d982788..e473f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,50 @@
-dgit (0.13~experimental2) experimental; urgency=low
+dgit (0.16~experimental1) experimental; urgency=low
- * Upload to experimental to test dgit push.
+ * WIP remote functionality. Untested, do not use.
- -- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 28 Aug 2013 23:33:01 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Tue, 24 Sep 2013 23:08:27 +0100
-dgit (0.13~experimental1) experimental; urgency=low
+dgit (0.15) unstable; urgency=low
+
+ * Better handling of packages pushed using dgit and stuck in NEW.
+ (And, use of `--new' is not needed with fetch.) Closes: #722199.
+ * More comprehensive warnings in many cases of archive skew.
+ * Implement `dgit help' as well as `--help'. Closes: #721661.
+ * Provide `dgit version' and `--version'. Closes: #721654.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 12 Sep 2013 00:14:05 +0100
+
+dgit (0.14) unstable; urgency=low
+
+ * Include package name in tag message.
+ * Create directory .git/dgit when needed during build. Closes: #721428.
+ * Add Vcs-Git and Vcs-Browser [Richard Hartmann]. Closes: #721404.
+ These fields refer to the development branch, "master", on alioth,
+ not to the dgit suite refs (which are not accessible to git clone).
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 01 Sep 2013 18:30:44 +0100
+
+dgit (0.13) unstable; urgency=low
- * Upload to experimental to test dgit push.
* Reuse already-downloaded .orig files after checking their hashes.
- Closes: #720526. (This introduces a dependency on the Digest::SHA.)
+ Closes: #720526. (This introduces a dependency on Digest::SHA.)
* Do not always pointlessly fetch the .dsc twice. (That code was
erroneously duplicated during editing, apparently.)
* Remove DGET_UNPACK from the environment in case the user has set it.
* Remove scary warning from Description.
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 28 Aug 2013 23:19:09 +0100
+ * When uploading to Debian, tell dput to upload to "ftp-master". This
+ avoids problems with derivatives whose dput has a different default.
+ Closes: #720958.
+ * Fix some bugs in dgit fetch --dry-run which made dgit push
+ --dry-run often not work at all.
+ * Update the local tracking branch for the dgit remote, when pushing.
+ Closes: #720956.
+ * Fix references in manpage to old Vcs-Dgit-Master field name.
+ * Reorganise manpage sections to be in a more conventional order.
+ * New manpage section on FILES IN THE SOURCE PACKAGE BUT NOT IN GIT.
+ Closes: #721186.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 29 Aug 2013 00:27:23 +0100
dgit (0.12) unstable; urgency=low
@@ -72,14 +102,6 @@ dgit (0.9) unstable; urgency=low
-- Ian Jackson <ijackson@chiark.greenend.org.uk> Sat, 24 Aug 2013 18:49:02 +0100
-dgit (0.8+nmu1) experimental; urgency=low
-
- * Non-maintainer upload.
- (This is a test NMU with no changes, to verify #720522 has been fixed
- and NMUing in general works.)
-
- -- Joey Hess <joeyh@debian.org> Fri, 23 Aug 2013 11:55:35 -0400
-
dgit (0.8) unstable; urgency=low
* Fix comparison of archive's .dsc's hash and git branch head
diff --git a/debian/control b/debian/control
index 8f15413..a90b6ff 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,8 @@ Priority: optional
Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
Standards-Version: 3.9.4.0
Build-Depends: debhelper (>= 9)
+Vcs-Git: git://anonscm.debian.org/dgit-repos/repos/dgit.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=dgit-repos/repos/dgit.git
Package: dgit
Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
diff --git a/debian/rules b/debian/rules
index e4a2460..fece672 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,10 @@ export prefix=/usr
%:
dh $@
+
+override_dh_gencontrol:
+ dh_gencontrol
+ set -e; \
+ cd debian/dgit; \
+ v=$$(perl -ne 'print if s/^version:\s+//i' DEBIAN/control); \
+ perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit