From 6785077dc10fc5a5f49f099c8e196d1c21de0814 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Thu, 26 May 2016 02:48:13 +0300 Subject: [PATCH] Fix version passed to dpkg-maintscript-helper script. Rewritten-From: 90a10628f92176ecd51a79faa094fd57b66cba5a --- trusty/debian/changelog | 8 +++++++- trusty/debian/openstack-dashboard-apache.postinst | 2 +- trusty/debian/openstack-dashboard-apache.postrm | 2 +- trusty/debian/openstack-dashboard-apache.preinst | 4 ++-- trusty/debian/openstack-dashboard.postinst | 2 +- trusty/debian/openstack-dashboard.postrm | 2 +- trusty/debian/openstack-dashboard.preinst | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 5f044ab..b95abb8 100644 --- 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ý 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 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 e78f074..a34dbca 100644 --- 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 aeec9fa..f53a6ee 100644 --- 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 9224298..c3585c8 100644 --- 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 3c4b05e..e6b4b82 100644 --- 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 eb96754..f80555c 100644 --- 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 3916bba..c1bd0e1 100644 --- 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# -- 2.45.2