Changes between Version 113 and Version 114 of DebianUbuntuPackaging

Timestamp:

May 1, 2016, 12:05:18 PM (8 years ago)

Author:

martinl

Comment:

--

DebianUbuntuPackaging

@@ -123 +123 @@
 }}}
 
-Update changelog by
-
-{{{
-dch -v ${VERSION}-${PATCH}~exp1~${DIST}1
-}}}
-
-and put lines (example for GRASS GIS 7.0.3RC1):
-
-{{{
-grass (7.0.3~rc1-1~exp1~wily1) wily; urgency=medium
-
-  * New upstream release candidate.
-
- -- [commiters_name] <[commiters_email]>  Tue, 12 Jan 2016 20:57:45 +0100
+Merge changes related to given tag:
+
+{{{
+git checkout pristine-tar
+git pull
+git checkout ubuntugis/$DIST
+git merge debian/`echo $VERSION | sed 's/~/./g'`-${PATCH}`echo $EXP | sed 's/~/./g'`
+cp debian/changelog /tmp
+git checkout ORIG_HEAD --  debian/control debian/control.in debian/gbp.conf debian/changelog
+}}}
+
+Update changelog:
+
+{{{
+# dch -v ${VERSION}-${PATCH}~exp1~${DIST}1
+dch -b -v $(dpkg-parsechangelog | grep Version: | awk -F': ' '{print $2}')~${DIST} -D ${DIST} -m "Rebuild for ${DIST}."
 }}}