From c298cd4aaf60de3183d040b2544b4644767b6639 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Fri, 4 Jul 2014 12:37:37 +0200 Subject: [PATCH] fixing bug when installing (bad upgrade check) --- debian/changelog | 6 ++++++ install/mysql.sql | 3 ++- install/upgrades/3.1.0~c.sh | 4 ++-- wheezy/changelog.diff | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6b5a2dd..0f34da76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alternc (3.1.2) oldstable; urgency=low + + * fix a bug when installing (doing patches from 3.1~rc) + + -- Benjamin Sonntag Fri, 4 Jul 2014 12:44:12 +0100 + alternc (3.1.1) oldstable; urgency=low * many bugfixed from 3.1 / 3.2 : diff --git a/install/mysql.sql b/install/mysql.sql index 867f117a..251475fc 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -747,4 +747,5 @@ CREATE TABLE IF NOT EXISTS `alternc_status` ( KEY `name` (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -INSERT INTO alternc_status SET name='alternc_version',value='3.1.0~b.php'; +INSERT INTO alternc_status SET name='alternc_version',value='3.1.0~c.sh'; + diff --git a/install/upgrades/3.1.0~c.sh b/install/upgrades/3.1.0~c.sh index ab5332f7..fc9cb5ba 100644 --- a/install/upgrades/3.1.0~c.sh +++ b/install/upgrades/3.1.0~c.sh @@ -12,7 +12,7 @@ if [ ! -r "$CONFIG_FILE" ]; then fi if [ `id -u` -ne 0 ]; then - echo "3.0.3~b.sh must be launched as root" + echo "$0 must be launched as root" exit 1 fi @@ -28,5 +28,5 @@ test -d /var/alternc/bind/zones/ || exit 0 cp --no-clobber /var/alternc/bind/zones/* /var/lib/alternc/bind/zones/ # No need to regenerate zone, we are launched by upgrade_check, -# launched by alternc.install, and alternc.install regenerate everything +# launched by alternc.install, and alternc.install regenerate everything # when it end diff --git a/wheezy/changelog.diff b/wheezy/changelog.diff index 14a64f68..d7f5ba6c 100644 --- a/wheezy/changelog.diff +++ b/wheezy/changelog.diff @@ -1,13 +1,13 @@ --- changelog 2014-06-24 13:42:50.234304438 +0200 +++ changelog.wheezy 2014-06-24 13:43:51.978313552 +0200 @@ -1,3 +1,10 @@ -+alternc (3.2.1) stable; urgency=low ++alternc (3.2.2) stable; urgency=low + + * Version identical to 3.1 for Squeeze + * Includes a small dovecot patch / dependency for dovecot 2.0 for Wheezy + + -- Benjamin Sonntag Thu, 28 Mar 2014 18:19:00 +0200 + - alternc (3.1.1) oldstable; urgency=low + alternc (3.1.2) oldstable; urgency=low - * many bugfixed from 3.1 / 3.2 : + * fix a bug when installing (doing patches from 3.1~rc)