Merge lp:~pabelanger/glance/dbconfig-common into lp:~ubuntu-server-dev/glance/essex

[Paul Belanger]

[Adam Gandelman (gandelman-a)]

Paul-

Same as nova, I'd like to wait on merging this stuff until Chuck is back from vacation next week. There has been a pending merge proposal for the debian changes that includes dbcommon-config stuff at:

https://code.launchpad.net/~openstack-ubuntu-testing/glance/debian-merge/+merge/96172

Note, The permission fix has already been merged into the main Ubuntu packaging at lp:ubuntu/precise/nova.

[Martin Pitt (pitti)]

This was "wontfix"ed by the server team two years ago, so I suppose this can be closed now?

Unmerged revisions

123. By Paul Belanger on 2012-03-14

* debian/control, debian/glance-registry-common,
  debian/glance-registry-mysql, debian/glance-registry-sqlite3,
  debian/glance-registry-pgsql:
  - Add dbconfig-common support to glance (LP: #953093)
* debian/rules get-orig-source:
  - Download tarballs to '../tarballs'
  - Check if '../tarballs' exists, if not create it
  - Download current version not latest.
* debian/glance-common.postinst:
  - Fix permissions issues for /etc/glance and /var/log/glance (LP: #950935)

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-09 16:33:15 +0000
+++ debian/changelog	2012-03-14 17:23:18 +0000
@@ -1,3 +1,18 @@
+glance (2012.1~rc1~20120309.1315-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control, debian/glance-registry-common,
+    debian/glance-registry-mysql, debian/glance-registry-sqlite3,
+    debian/glance-registry-pgsql:
+    - Add dbconfig-common support to glance (LP: #953093)
+  * debian/rules get-orig-source:
+    - Download tarballs to '../tarballs'
+    - Check if '../tarballs' exists, if not create it
+    - Download current version not latest.
+  * debian/glance-common.postinst:
+    - Fix permissions issues for /etc/glance and /var/log/glance (LP: #950935)
+
+ -- Paul Belanger <[e-mail]>  Mon, 12 Mar 2012 12:35:36 -0400
+
 glance (2012.1~rc1~20120309.1315-0ubuntu1) precise; urgency=low
 
   * New upstream version.

=== modified file 'debian/control'
--- debian/control	2012-03-09 16:33:15 +0000
+++ debian/control	2012-03-14 17:23:18 +0000
@@ -67,7 +67,7 @@
  python-crypto,
  python-xattr,
  glance-api (= ${source:Version}), 
- glance-registry (= ${source:Version}),
+ glance-registry-sqlite3 (= ${source:Version}) | glance-registry,
  ca-certificates,
  adduser
 Description: OpenStack Image Registry and Delivery Service - Daemons
@@ -123,11 +123,11 @@
  .
  This package contains the glance api server.
 
-Package: glance-registry
+Package: glance-registry-common
 Architecture: all
 Section: python
 Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
-Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
+Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${binary:Version})
 Recommends: glance-client
 Description: OpenStack Image Registry and Delivery Service - Registry
  The Glance project provides an image registration, discovery and 
@@ -137,6 +137,53 @@
  .
  This package contains the glance registry server.
 
+Package: glance-registry-mysql
+Architecture: all
+Section: python
+Depends: ${python:Depends}, ${misc:Depends}, glance-registry-common (= ${binary:Version}), dbconfig-common, mysql-client, python-mysqldb
+Provides: glance-registry
+Conflicts: glance-registry
+Suggests: mysql-server
+Description: OpenStack Image Registry and Delivery Service - Registry (MySQL)
+ The Glance project provides an image registration, discovery and 
+ delivery service. These services may be used as stand-along services, and
+ they may also be used by Nova to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This version stores Glance's registry in a MySQL database, and thus is suited
+ for large installations.
+
+Package: glance-registry-pgsql
+Architecture: all
+Section: python
+Depends: ${python:Depends}, ${misc:Depends}, glance-registry-common (= ${binary:Version}), dbconfig-common, postgresql-client, python-psycopg2
+Provides: glance-registry
+Conflicts: glance-registry
+Suggests: postgresql
+Description: OpenStack Image Registry and Delivery Service - Registry (PostgreSQL)
+ The Glance project provides an image registration, discovery and 
+ delivery service. These services may be used as stand-along services, and
+ they may also be used by Nova to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This version stores Glance's registry in a PostgreSQL database, and thus is suited
+ for large installations.
+
+Package: glance-registry-sqlite3
+Architecture: all
+Section: python
+Depends: ${python:Depends}, ${misc:Depends}, glance-registry-common (= ${binary:Version}), dbconfig-common, sqlite3
+Provides: glance-registry
+Conflicts: glance-registry
+Description: OpenStack Image Registry and Delivery Service - Registry (SQLite3)
+ The Glance project provides an image registration, discovery and 
+ delivery service. These services may be used as stand-along services, and
+ they may also be used by Nova to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This version stores Glance's registry in an SQLite 3 database, and thus is suited
+ for smaller installations.
+
 Package: glance-client
 Architecture: all
 Section: python

=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2012-03-14 17:23:18 +0000
@@ -0,0 +1,9 @@
+[DEFAULT]
+cleaner = /bin/true
+
+[git-buildpackage]
+export-dir = ../build-area/
+tarball-dir = ../tarballs/
+overlay = True
+pristine-tar = False
+compression = gzip

=== modified file 'debian/glance-common.postinst'
--- debian/glance-common.postinst	2011-12-16 19:26:31 +0000
+++ debian/glance-common.postinst	2012-03-14 17:23:18 +0000
@@ -12,8 +12,11 @@
 	then
         adduser --system --home /var/lib/glance --ingroup glance --no-create-home --shell /bin/false glance
 	fi
-	chown glance:glance -R /var/lib/glance/ /var/log/glance/ /etc/glance/
-	chmod 0700 /etc/glance/ /var/log/glance/
+
+	chown glance:glance -R /var/lib/glance/ /etc/glance/
+	chmod 0755 /var/lib/glance /etc/glance
+	chown glance:adm -R /var/log/glance
+	chmod 0750 /var/log/glance
 fi
 
 

=== added file 'debian/glance-registry-common.glance-registry.upstart'
--- debian/glance-registry-common.glance-registry.upstart	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-common.glance-registry.upstart	2012-03-14 17:23:18 +0000
@@ -0,0 +1,9 @@
+description "Glance registry server"
+author "Soren Hansen <[e-mail]>"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+respawn
+
+exec su -s /bin/sh -c "exec glance-registry" glance

=== added file 'debian/glance-registry-common.install'
--- debian/glance-registry-common.install	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-common.install	2012-03-14 17:23:18 +0000
@@ -0,0 +1,3 @@
+usr/bin/glance-registry
+etc/glance-registry.conf etc/glance
+etc/glance-registry-paste.ini etc/glance

=== added file 'debian/glance-registry-common.logrotate'
--- debian/glance-registry-common.logrotate	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-common.logrotate	2012-03-14 17:23:18 +0000
@@ -0,0 +1,7 @@
+/var/log/glance/glance-api.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== added file 'debian/glance-registry-mysql.config'
--- debian/glance-registry-mysql.config	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-mysql.config	2012-03-14 17:23:18 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+# postinst script for glance-registry-mysql
+#
+# see: dh_installdeb(1)
+
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
+set -e
+
+if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
+	dbc_dbname=glance
+	dbc_dbuser=glance
+	dbc_first_version=2012.1~rc1~20120309.1315-0ubuntu2
+
+	. /usr/share/dbconfig-common/dpkg/config.mysql 
+	dbc_go glance-registry-mysql $@
+fi
+
+case "$1" in
+	configure)
+	;;
+
+	reconfigure)
+	;;
+
+	*)
+		echo "config called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-mysql.postinst'
--- debian/glance-registry-mysql.postinst	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-mysql.postinst	2012-03-14 17:23:18 +0000
@@ -0,0 +1,70 @@
+#!/bin/sh
+# postinst script for glance-registry-mysql
+#
+# see: dh_installdeb(1)
+
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.mysql ]; then
+        dbc_first_version=2012.1~rc1~20120309.1315-0ubuntu2
+
+        . /usr/share/dbconfig-common/dpkg/postinst.mysql
+        dbc_go glance-registry-mysql $@
+fi
+
+CFGFILE="/etc/glance/glance-registry.conf"
+
+case "$1" in
+	configure)
+		echo -n "Processing configuration..."
+		. /etc/dbconfig-common/glance-registry-mysql.conf
+
+		if [ "$dbc_install" = "true" ]; then
+			TARGET=$CFGFILE.dpkg-tmp
+			if [ "$dbc_dbserver" = "" ]; then
+				dbc_dbserver=localhost
+			fi
+			SQLCONN="$dbc_dbtype://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname"
+			sed -e "s|^sql_connection =.*|sql_connection = $SQLCONN|" \
+				$CFGFILE > $TARGET
+			mv $TARGET $CFGFILE
+
+			su -s /bin/sh -c 'glance-manage db_sync' glance
+		fi
+
+		echo "Ok."
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+# Do start daemon
+invoke-rc.d --quiet glance-registry start
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-mysql.prerm'
--- debian/glance-registry-mysql.prerm	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-mysql.prerm	2012-03-14 17:23:18 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+# prerm script for glance-registry-mysql
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	remove|deconfigure)
+		/usr/sbin/invoke-rc.d glance-registry stop
+	;;
+
+	upgrade)
+	;;
+
+	failed-upgrade)
+	;;
+
+	*)
+		echo "prerm called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-pgsql.config'
--- debian/glance-registry-pgsql.config	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-pgsql.config	2012-03-14 17:23:18 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+# postinst script for glance-registry-pgsql
+#
+# see: dh_installdeb(1)
+
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
+set -e
+
+if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+	dbc_dbname=glance
+	dbc_dbuser=glance
+	dbc_first_version=2012.1~rc1~20120309.1315-0ubuntu2
+
+	. /usr/share/dbconfig-common/dpkg/config.pgsql
+	dbc_go glance-registry-pgsql $@
+fi
+
+case "$1" in
+	configure)
+	;;
+
+	reconfigure)
+	;;
+
+	*)
+		echo "config called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-pgsql.postinst'
--- debian/glance-registry-pgsql.postinst	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-pgsql.postinst	2012-03-14 17:23:18 +0000
@@ -0,0 +1,70 @@
+#!/bin/sh
+# postinst script for glance-registry-pgsql
+#
+# see: dh_installdeb(1)
+
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
+        dbc_first_version=2012.1~rc1~20120309.1315-0ubuntu2
+
+        . /usr/share/dbconfig-common/dpkg/postinst.pgsql
+        dbc_go glance-registry-pgsql $@
+fi
+
+CFGFILE="/etc/glance/glance-registry.conf"
+
+case "$1" in
+	configure)
+		echo -n "Processing configuration..."
+		. /etc/dbconfig-common/glance-registry-pgsql.conf
+
+		if [ "$dbc_install" = "true" ]; then
+			TARGET=$CFGFILE.dpkg-tmp
+			if [ "$dbc_dbserver" = "" ]; then
+				dbc_dbserver=localhost
+			fi
+			SQLCONN="postgresql://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname"
+			sed -e "s|^sql_connection =.*|sql_connection = $SQLCONN|" \
+				$CFGFILE > $TARGET
+			mv $TARGET $CFGFILE
+
+			su -s /bin/sh -c 'glance-manage db_sync' glance
+		fi
+
+		echo "Ok."
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+# Do start daemon
+invoke-rc.d --quiet glance-registry start
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-pgsql.prerm'
--- debian/glance-registry-pgsql.prerm	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-pgsql.prerm	2012-03-14 17:23:18 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+# prerm script for glance-registry-pgsql
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	remove|deconfigure)
+		/usr/sbin/invoke-rc.d glance-registry stop
+	;;
+
+	upgrade)
+	;;
+
+	failed-upgrade)
+	;;
+
+	*)
+		echo "prerm called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-sqlite3.config'
--- debian/glance-registry-sqlite3.config	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-sqlite3.config	2012-03-14 17:23:18 +0000
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for glance-registry-sqlite3
+#
+# see: dh_installdeb(1)
+
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
+set -e
+
+if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
+	dbc_basepath=/var/lib/glance
+	dbc_dbname=glance.sqlite
+	dbc_dbuser=glance
+	dbc_first_version=2012.1~rc1~20120309.1315-0ubuntu2
+
+	. /usr/share/dbconfig-common/dpkg/config.sqlite3
+	dbc_go glance-registry-sqlite3 $@
+fi
+
+case "$1" in
+	configure)
+	;;
+
+	reconfigure)
+	;;
+
+	*)
+		echo "config called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-sqlite3.postinst'
--- debian/glance-registry-sqlite3.postinst	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-sqlite3.postinst	2012-03-14 17:23:18 +0000
@@ -0,0 +1,69 @@
+#!/bin/sh
+# postinst script for glance-registry-sqlite3
+#
+# see: dh_installdeb(1)
+
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.sqlite3 ]; then
+        dbc_first_version=2012.1~rc1~20120309.1315-0ubuntu2
+
+        . /usr/share/dbconfig-common/dpkg/postinst.sqlite3
+        dbc_go glance-registry-sqlite3 $@
+fi
+
+CFGFILE="/etc/glance/glance-registry.conf"
+
+case "$1" in
+	configure)
+		echo -n "Processing configuration..."
+		. /etc/dbconfig-common/glance-registry-sqlite3.conf
+
+		if [ "$dbc_install" = "true" ]; then
+			TARGET=$CFGFILE.dpkg-tmp
+			DB="$dbc_basepath/$dbc_dbname"
+			SQLCONN="sqlite:///$DB"
+			sed -e "s|^sql_connection =.*|sql_connection = $SQLCONN|" \
+				$CFGFILE > $TARGET
+			mv $TARGET $CFGFILE
+
+			chown glance: $dbc_basepath $DB
+			su -s /bin/sh -c 'glance-manage db_sync' glance
+		fi
+
+		echo "Ok."
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+# Do start daemon
+invoke-rc.d --quiet glance-registry start
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/glance-registry-sqlite3.prerm'
--- debian/glance-registry-sqlite3.prerm	1970-01-01 00:00:00 +0000
+++ debian/glance-registry-sqlite3.prerm	2012-03-14 17:23:18 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+# prerm script for glance-registry-sqlite3
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	remove|deconfigure)
+		/usr/sbin/invoke-rc.d glance-registry stop
+	;;
+
+	upgrade)
+	;;
+
+	failed-upgrade)
+	;;
+
+	*)
+		echo "prerm called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== removed file 'debian/glance-registry.glance-registry.upstart'
--- debian/glance-registry.glance-registry.upstart	2011-12-15 15:21:06 +0000
+++ debian/glance-registry.glance-registry.upstart	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-description "Glance registry server"
-author "Soren Hansen <[e-mail]>"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [016]
-
-respawn
-
-exec su -s /bin/sh -c "exec glance-registry" glance

=== removed file 'debian/glance-registry.install'
--- debian/glance-registry.install	2012-01-20 18:44:25 +0000
+++ debian/glance-registry.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/bin/glance-registry
-etc/glance-registry.conf etc/glance
-etc/glance-registry-paste.ini etc/glance

=== removed file 'debian/glance-registry.logrotate'
--- debian/glance-registry.logrotate	2012-01-04 19:09:42 +0000
+++ debian/glance-registry.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/glance/glance-api.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}

=== removed file 'debian/glance-registry.postinst'
--- debian/glance-registry.postinst	2012-01-04 19:37:37 +0000
+++ debian/glance-registry.postinst	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]
-then
-	if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
-	then
-		su -s /bin/sh -c 'glance-manage db_sync' glance
-	fi
-fi
-
-#DEBHELPER#
-

=== removed file 'debian/glance-registry.prerm'
--- debian/glance-registry.prerm	2011-12-16 18:47:42 +0000
+++ debian/glance-registry.prerm	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case $1 in
-	remove|purge)
-		if [ -x /etc/init.d/glance-registry ]; then
-			invoke-rc.d glance-registry stop || true
-		fi
-	;;
-esac
-
-#DEBHELPER#

=== modified file 'debian/rules'
--- debian/rules	2011-09-19 17:04:18 +0000
+++ debian/rules	2012-03-14 17:23:18 +0000
@@ -8,9 +8,6 @@
 %:
 	dh $@ ${WITH_PYTHON2}
 
-get-orig-source:
-	uscan --verbose --force-download --rename --destdir=../build-area
-
 override_dh_install:
 	dh_install
 
@@ -35,4 +32,8 @@
 
 override_dh_installinit:
 	dh_installinit --name glance-api
-	dh_installinit --name glance-registry
+	dh_installinit --name glance-registry --no-start
+
+get-orig-source:
+	@@[ -d ../tarballs/. ] || mkdir -p ../tarballs
+	uscan --verbose --force-download --download-current-version --destdir=../tarballs