Changes between Version 154 and Version 155 of DebianUbuntuPackaging

Timestamp:

Aug 15, 2017, 12:25:44 PM (7 years ago)

Author:

martinl

Comment:

--

DebianUbuntuPackaging

@@ -132 +132 @@
 
 {{{
-git merge debian/`echo $VERSION | sed 's/~/./g'`-${PATCH}`echo $EXP | sed 's/~/./g'`
+git merge debian/`echo $VERSION | sed 's/~/_/g'`-${PATCH}`echo $EXP | sed 's/~/_/g'`
 # solve changelog conflict issues
-git checkout ORIG_HEAD --  debian/control debian/control.in debian/gbp.conf 
-}}}
+git checkout ORIG_HEAD --  debian/control.in debian/gbp.conf 
+}}}
+
+Solve conflict in `debian/control` file.
 
 Update changelog:
@@ -142 +144 @@
 # dch -v ${VERSION}-${PATCH}~exp1~${DIST}${NUM}
 dch -b -v $(dpkg-parsechangelog | grep Version: | awk -F': ' '{print $2}')~${DIST}${NUM} -D ${DIST} -m "Rebuild for ${DIST}."
-}}}
-
-Check `debian/control`:
-
-{{{
-Provides: grass703-2
 }}}