Release 16.6.1

add patch version number option to release script
remove configure script from main dir as it breaks debian packaging
2018-08-05 21:27:23 +00:00 · 2018-08-05 21:27:15 +00:00 · 2018-08-05 21:12:17 +00:00 · 2018-08-05 09:35:28 +00:00
8 changed files with 22 additions and 24 deletions
--- a/3
+++ b/3
@@ -1,3 +1,6 @@
+2018-08-05 16.6.1
+- Fix packaging regression for debian (issue #715)
+
 2018-08-04 16.6
 - Fix regression in task icon brightness (issue #714)

--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 16.6
-Changes: https://gitlab.com/o9000/tint2/blob/16.6/ChangeLog
+# Latest stable release: 16.6.1
+Changes: https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog

 Documentation: [doc/tint2.md](doc/tint2.md)

@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 16.6
+git checkout 16.6.1
 mkdir build
 cd build
 cmake ..
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -199,9 +199,9 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-16-6"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">16.6</span><a name="latest-stable-release-16-6" href="#latest-stable-release-16-6" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/16.6/ChangeLog">https://gitlab.com/o9000/tint2/blob/16.6/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+<h1 id="latest-stable-release-16-6-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">16.6.1</span><a name="latest-stable-release-16-6-1" href="#latest-stable-release-16-6-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 16.6
+git checkout 16.6.1
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2018\-08\-04" 16.6
+.TH TINT2 1 "2018\-08\-05" 16.6.1
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2018-08-04" 16.6
+# TINT2 1 "2018-08-05" 16.6.1

 ## NAME
 tint2 - lightweight panel/taskbar
--- a/new-release.py
+++ b/new-release.py
@@ -76,19 +76,23 @@ def get_last_version():
  return tags[-1]


-def inc_version(v, feature=False):
+def inc_version(v, feature=False, tiny=False):
  if v.startswith("v0."):
    assert v == "v0.14.6"
    return "v15.0"
-  # v4.11 -> v4.12 or v5.0
+  # v4.11 -> v4.12 or v5.0 or v4.11.1
  parts = v.split(".")
-  while len(parts) < 2:
+  while len(parts) < 3:
    parts.append("0")
-  assert len(parts) == 2
+  assert len(parts) == 3
  if feature:
+    del parts[-1]
    parts[-2] = "v" + str(int(parts[-2].replace("v", "")) + 1)
    parts[-1] = "0"
+  elif tiny:
+    parts[-1] = str(int(parts[-1]) + 1)
  else:
+    del parts[-1]
    parts[-1] = str(int(parts[-1]) + 1)
  return ".".join([s for s in parts if s])

@@ -153,23 +157,14 @@ def update_log(path, version, date):
 if __name__ == '__main__':
  parser = argparse.ArgumentParser()
  parser.add_argument("--feature", action="store_true")
-  parser.add_argument("--undo", action="store_true")
+  parser.add_argument("--tiny", action="store_true")
  args = parser.parse_args()
  logging.basicConfig(format=ansi_lblue + "%(asctime)s %(pathname)s %(levelname)s" + ansi_reset + " %(message)s", level=logging.DEBUG)
  test_inc_version()
  # Read version from last tag and increment
  old_version = get_last_version()
-  if args.undo:
-    info("Revering last commit...")
-    run("git tag -d %s" % old_version)
-    run("git tag -d %s" % old_version.replace("v", ""))
-    run("git reset --soft HEAD~")
-    run("git reset")
-    run("git stash")
-    os.system("git log -1")
-    sys.exit(0)
  info("Old version:", old_version)
-  version = inc_version(old_version, args.feature)
+  version = inc_version(old_version, args.feature, args.tiny)
  readable_version = version.replace("v", "")
  date = datetime.datetime.now().strftime("%Y-%m-%d")
  info("New version:", readable_version, version, date)
--- a/packaging/configure
+++ b/packaging/configure
@@ -240,7 +240,7 @@ LFLAGS = shlex.split(os.environ.get('LDFLAGS', ''))
 LIBS = []

 # Get paths
-source_dir = os.path.dirname(os.path.realpath(__file__))
+source_dir = os.path.realpath(os.path.dirname(os.path.realpath(__file__)) + '/..')
 build_dir = os.path.join(os.getcwd(), 'build')
 if not args.home:
    prefix = args.prefix or '/usr/local'
--- a/packaging/version_status.py
+++ b/packaging/version_status.py
@@ -289,7 +289,7 @@ def get_gentoo_versions():

 def get_void_versions():
  print >> sys.stderr, "Void ..."
-  template = http_download_txt("https://raw.githubusercontent.com/voidlinux/void-packages/master/srcpkgs/tint2/template")
+  template = http_download_txt("https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/tint2/template")
  versions = []
  version = None
  maintainer = None
Author	SHA1	Message	Date
Chris Lee	a82b9a1d7f	Release 16.6.1	2018-08-05 21:27:23 +00:00
Chris Lee	89a6cadfcd	add patch version number option to release script	2018-08-05 21:27:15 +00:00
Chris Lee	fb9da655df	remove configure script from main dir as it breaks debian packaging	2018-08-05 21:12:17 +00:00
Chris Lee	cb137674e4	fix ci script	2018-08-05 09:35:28 +00:00