Bump libiphb version to 1.2.1

sailfishos · Sep 23, 2014 · f649748 · f649748
1 parent 0b34973
commit f649748
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 # Package name and version
-AC_INIT(libiphb, 1.2.0)
+AC_INIT(libiphb, 1.2.1)
 
 AM_INIT_AUTOMAKE
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+libiphb (1.2.1) unstable; urgency=low
+
+  * [libiphb] Allow canceling of iphb wakeups by iphb_wait() with zero
+    wakeup range. Fixes JB#20629
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 23 Sep 2014 08:30:29 +0300
+
 libiphb (1.2.0) unstable; urgency=low
 
   * [libiphb] Support 32bit iphb wakeup ranges. Contributes to JB#16116

diff --git a/rpm/libiphb.spec b/rpm/libiphb.spec
@@ -9,7 +9,7 @@ Name:       libiphb
 # << macros
 
 Summary:    API for IP Heartbeat service
-Version:    1.2.0
+Version:    1.2.1
 Release:    0
 Group:      System/System Control
 License:    LGPLv2+

diff --git a/rpm/libiphb.yaml b/rpm/libiphb.yaml
@@ -1,6 +1,6 @@
 Name: libiphb
 Summary: API for IP Heartbeat service
-Version: 1.2.0
+Version: 1.2.1
 Release: 0
 Group: System/System Control
 License: LGPLv2+

diff --git a/verify_version.sh b/verify_version.sh
@@ -37,6 +37,13 @@ if [ -f $YAML_PATH ]; then
   fi
 fi
 
+# Having debian/changelog out of sync is not a show stopper
+DEB_PATH=debian/changelog
+DEB_VERS=$(head -1 $DEB_PATH | sed -e 's/^.*(//' -e 's/).*$//')
+if [ "$DEB_VERS" != "$AC_VERS" ]; then
+  echo >&2 "$AC_PATH=$AC_VERS vs $DEB_PATH=$DEB_VERS (ignoring)"
+fi
+
 if [ $RES != 0 ]; then
   echo >&2 "Conflicting package versions"
 fi