[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.42-3-g34b7f3b

[Holger Levsen]

The following commit has been merged in the piatti branch:
commit 34b7f3b885105988afff6dc7003f879e92fb0c27
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jan 1 14:18:42 2012 +0100

    increase version number so new builds have 0.43~something. I wonder if this is really needed when using git-dch properly...

diff --git a/debian/changelog b/debian/changelog
index 6e300cd..095e3f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+piuparts (0.43) UNRELEASED; urgency=low
+
+  * how to maintain this with git-dch? IMO now it's the time to stop
+    maintaining debian/changelog manually but rather generate it from git
+    commit logs directly.
+  * So this is a bogus conflict entry which will need to manually removed
+    later.
+
+ -- Holger Levsen <holger at debian.org>  Sun, 01 Jan 2012 14:14:35 +0100
+
 piuparts (0.42) unstable; urgency=low
 
   [ Holger Levsen ]

-- 
piuparts git repository