diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/Bump-version-numbers-to-2.patch | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | do-a-release.sh | 15 | ||||
| -rwxr-xr-x | mkosi | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
6 files changed, 24 insertions, 38 deletions
diff --git a/debian/changelog b/debian/changelog index 826f1cc..8737e67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mkosi (3-1) unstable; urgency=medium + + * New usptream release + - Drop version-bumping patch, upstream fixed the versioning + + -- Felipe Sateler <fsateler@debian.org> Mon, 03 Jul 2017 11:37:59 -0400 + mkosi (2-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/Bump-version-numbers-to-2.patch b/debian/patches/Bump-version-numbers-to-2.patch deleted file mode 100644 index 24acb1e..0000000 --- a/debian/patches/Bump-version-numbers-to-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Felipe Sateler <fsateler@debian.org> -Date: Thu, 22 Jun 2017 13:30:02 -0400 -Subject: Bump version numbers to 2 - ---- - mkosi | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkosi b/mkosi -index 3529b53..88309e5 100755 ---- a/mkosi -+++ b/mkosi -@@ -20,7 +20,7 @@ import uuid - - from enum import Enum - --__version__ = '1' -+__version__ = '2' - - if sys.version_info < (3, 5): - sys.exit("Sorry, we need at least Python 3.5.") -diff --git a/setup.py b/setup.py -index 2830a0c..bf34371 100755 ---- a/setup.py -+++ b/setup.py -@@ -9,7 +9,7 @@ from setuptools import setup - - setup( - name="mkosi", -- version="1", -+ version="2", - description="Create legacy-free OS images", - url="https://github.com/systemd/mkosi", - maintainer="mkosi contributors", diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 68c997c..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -Bump-version-numbers-to-2.patch diff --git a/do-a-release.sh b/do-a-release.sh new file mode 100755 index 0000000..7817b4b --- /dev/null +++ b/do-a-release.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ x"$1" == x ] ; then + echo "Version number not specified." + exit 1 +fi + +sed -ie 's/version=".*",/version="'"$1"'",/' setup.py +sed -ie "s/__version__ = '.*'/__version__ = '$1'/" mkosi + +git add -p setup.py mkosi + +git commit -m "bump version numbers for v$1" + +git tag -s "v$1" -m "mkosi $1" @@ -20,7 +20,7 @@ import uuid from enum import Enum -__version__ = '2' +__version__ = '3' if sys.version_info < (3, 5): sys.exit("Sorry, we need at least Python 3.5.") @@ -9,7 +9,7 @@ from setuptools import setup setup( name="mkosi", - version="2", + version="3", description="Create legacy-free OS images", url="https://github.com/systemd/mkosi", maintainer="mkosi contributors", |