Changes between Version 115 and Version 116 of DebianUbuntuPackaging

Timestamp:

May 1, 2016, 12:26:57 PM (8 years ago)

Author:

martinl

Comment:

--

DebianUbuntuPackaging

@@ -123 +123 @@
 }}}
 
-Merge changes related to given tag:
+Update tarball (just once):
 
 {{{
@@ -129 +129 @@
 git pull
 git checkout ubuntugis/$DIST
+}}}
+
+Merge changes related to given tag:
+
+{{{
 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
+# solve changelog conflict issues
+git checkout ORIG_HEAD --  debian/control debian/control.in debian/gbp.conf 
 }}}