Changes between Version 192 and Version 193 of DebianUbuntuPackaging


Ignore:
Timestamp:
05/22/18 00:00:06 (7 years ago)
Author:
martinl
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • DebianUbuntuPackaging

    v192 v193  
    136136git merge debian/`echo $VERSION | sed 's/~/_/g'`-${PATCH}`echo $EXP | sed 's/~/_/g'`
    137137# solve changelog conflict issues
    138 git checkout ORIG_HEAD --  debian/control.in debian/gbp.conf
     138git checkout ORIG_HEAD -- debian/gbp.conf
    139139}}}
    140140