summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-10-10 17:25:47 -0400
committerJoey Hess <joey@kitenet.net>2014-10-10 17:25:47 -0400
commita04e33da665d5eae296988390939688ed48b2f07 (patch)
tree89854d9cf49506e2094df1b96ea55ca5176c1e8e
parent4d0acf739e336a6b0993665facf6308e851cea44 (diff)
fix up from git am of patch that was for some reason not based on current release
-rw-r--r--debian/changelog17
1 files changed, 8 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index f15f511..34116fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,5 @@
-debhelper (9.20141003) unstable; urgency=medium
-
- * dh_clean: Skip over .git, .svn, .bzr, .hg, and CVS directories
- and avoid cleaning their contents. Closes: #760033
+debhelper (9.20141010) UNRELEASED; urgency=medium
- -- Joey Hess <joeyh@debian.org> Fri, 03 Oct 2014 15:16:00 -0400
-
-debhelper (9.20140817+nmu1) UNRELEASED; urgency=medium
-
- * Non-maintainer upload.
* Depend on libdpkg-perl (>= 1.17.14) for build profiles support. Note to
backporters: If you remove that dependency, debhelper will throw an error
when a binary package stanza in debian/control has the Build-Profiles
@@ -18,6 +10,13 @@ debhelper (9.20140817+nmu1) UNRELEASED; urgency=medium
-- Johannes Schauer <j.schauer@email.de> Thu, 09 Oct 2014 23:27:40 +0200
+debhelper (9.20141003) unstable; urgency=medium
+
+ * dh_clean: Skip over .git, .svn, .bzr, .hg, and CVS directories
+ and avoid cleaning their contents. Closes: #760033
+
+ -- Joey Hess <joeyh@debian.org> Fri, 03 Oct 2014 15:16:00 -0400
+
debhelper (9.20140817) unstable; urgency=medium
* Added Portuguese translation of the man pages, by Américo Monteiro.