Fix version passed to dpkg-maintscript-helper script.

Rewritten-From: 90a10628f92176ecd51a79faa094fd57b66cba5a

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 5f044ab435008fa5046579b57cf7a88296a10354..b95abb81fb8da55eb9d574843a14d98ee91631de 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,8 +1,14 @@
 horizon (2:9.0.0-3) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * d/copyright: Changed source URL to https protocol
 
- -- Ondřej Nový <novy@ondrej.org>  Thu, 19 May 2016 20:56:23 +0200
+  [ Ivan Udovichenko ]
+  * d/openstack-dashboard.{preinst,postinst,postrm},
+      openstack-dashboard-apache.{preinst,postinst,postrm}:
+      - Pass the correct version to dpkg-maintscript-helper script.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Thu, 26 May 2016 02:36:51 +0300
 
 horizon (2:9.0.0-2) unstable; urgency=medium
 

diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index e78f07428719e058f3515524ebe4af2cccf4c225..a34dbca0178b838ad84ab7be0ce04e3d44eacf89 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/debian/openstack-dashboard-apache.postinst
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
 
 if [ "$1" = "configure" ] ; then
        . /usr/share/debconf/confmodule

diff --git a/trusty/debian/openstack-dashboard-apache.postrm b/trusty/debian/openstack-dashboard-apache.postrm
index aeec9fa9c7df9530c05c79185e43ff358877fd01..f53a6ee1dd800412506610ac27f62ec95fcb538e 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postrm
+++ b/trusty/debian/openstack-dashboard-apache.postrm
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
 
 
 if [ "${1}" = "purge" ] ; then

diff --git a/trusty/debian/openstack-dashboard-apache.preinst b/trusty/debian/openstack-dashboard-apache.preinst
index 9224298fe9a4c9b940b1158738c6398a263d5ae4..c3585c86979ac427272a536f56686aa102164fe3 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.preinst
+++ b/trusty/debian/openstack-dashboard-apache.preinst
@@ -29,9 +29,9 @@ dir_to_symlink_preinst() {
 
 if [ "$1" = "install" -o "$1" = "upgrade" ] ; then
        if [ -e /usr/share/openstack-dashboard/static ] ; then
-               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
        fi
-       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
 fi
 
 #DEBHELPER#

diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst
index 3c4b05ea67d8fc93d106e9118f90c34f580a81e2..e6b4b82a7eec12961fd444d5caa7d7b5eae1c78a 100644 (file)
--- a/trusty/debian/openstack-dashboard.postinst
+++ b/trusty/debian/openstack-dashboard.postinst
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
 
 if [ "$1" = "configure" ] ; then
        adduser --system \

diff --git a/trusty/debian/openstack-dashboard.postrm b/trusty/debian/openstack-dashboard.postrm
index eb967542a0b2289432c7266d01efd3bd601205d5..f80555c38c3ebcc4129bb10f719a346733d7fd10 100644 (file)
--- a/trusty/debian/openstack-dashboard.postrm
+++ b/trusty/debian/openstack-dashboard.postrm
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
 
 if [ "${1}" = "purge" ] ; then
        rm -f /etc/openstack-dashboard/local_settings.py

diff --git a/trusty/debian/openstack-dashboard.preinst b/trusty/debian/openstack-dashboard.preinst
index 3916bba8adaa9cf63416869992f8dcf90bfe4748..c1bd0e116dbe37fe07c333b09a99d4dff6f9cd48 100644 (file)
--- a/trusty/debian/openstack-dashboard.preinst
+++ b/trusty/debian/openstack-dashboard.preinst
@@ -29,9 +29,9 @@ dir_to_symlink_preinst() {
 
 if [ "$1" = "install" -o "$1" = "upgrade" ] ; then
        if [ -e /usr/share/openstack-dashboard/static ] ; then
-               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
        fi
-       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
 fi
 
 #DEBHELPER#