Merge lp:~openstack-ubuntu-testing/glance/debian-merge into lp:~openstack-ubuntu-testing/glance/precise-essex-proposed

[Chuck Short]

Debian merges+debconf fixes.

[Adam Gandelman (gandelman-a)]

Chuck-

debian/patches/default_conf.patch: Seems to be a typo in the paste deploy flavor of registry.conf.

Unmerged revisions

126. By Chuck Short on 2012-03-06

* debian/glance-common.config: Don't ask debconf questions.
  by default.
* debian/glance-registry.conf: Don't ask debconf questions
  by default.

125. By Chuck Short on 2012-03-06

Add missing patch

124. By Chuck Short on 2012-03-06

Re-add upstart jobs

123. By Chuck Short on 2012-03-06

debian/rules: Handle init scripts properly due to the debian/ubuntu
merge.

122. By Chuck Short on 2012-03-06

Add missing files

121. By Chuck Short on 2012-03-06

* Merge Ubuntu/Debian changes:
  - debian/control: Update build depends.
  - debian/mans/*: Add man pages.
  - debian/{glance-api,glance-registry}.init: Update
    init scripts.
  - debian/pycompat: Dropped
  - debian/rules: Update clean rules
  - debian/copyright: Update copyright file.
  - Make /var/log/glance and /etc/glance 0750 instead of 0700.
  - Add dbconfig-support

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-02 14:27:38 +0000
+++ debian/changelog	2012-03-06 16:34:38 +0000
@@ -1,3 +1,24 @@
+glance (2012.1~e4-0ubuntu2) UNRELEASED; urgency=low
+
+  * Merge Ubuntu/Debian changes:
+    - debian/control: Update build depends.
+    - debian/mans/*: Add man pages.
+    - debian/{glance-api,glance-registry}.init: Update 
+      init scripts.
+    - debian/pycompat: Dropped 
+    - debian/rules: Update clean rules
+    - debian/copyright: Update copyright file.
+    - Make /var/log/glance and /etc/glance 0750 instead of 0700.
+    - Add dbconfig-support
+  * debian/rules: Handle init scripts properly due to the debian/ubuntu
+    merge.
+  * debian/glance-common.config: Don't ask debconf questions.
+    by default.
+  * debian/glance-registry.conf: Don't ask debconf questions 
+    by default.
+
+ -- Chuck Short <[e-mail]>  Tue, 06 Mar 2012 10:01:37 -0500
+
 glance (2012.1~e4-0ubuntu1) precise; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2012-03-02 14:27:38 +0000
+++ debian/control	2012-03-06 16:34:38 +0000
@@ -3,11 +3,12 @@
 Priority: extra
 Maintainer: Ubuntu OpenStack <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50),
- python-all (>= 2.6),
- python-all-dev (>= 2.6.6-3~)
+ python-all (>= 2.6.6-3~),
+ po-debconf
 Build-Depends-Indep:
  python-setuptools,
  python-sphinx,
+ python-distutils-extra,
  python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
  python-nose,
  python-mox,
@@ -99,7 +100,10 @@
  python-migrate, 
  python-routes,
  python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
- python-xattr, 
+ python-xattr,
+ adduser,
+ debconf,
+ dbconfig-common, 
  adduser
 Description: OpenStack Image Registry and Delivery Service - Common
  The Glance project provides an image registration, discovery and 

=== modified file 'debian/copyright'
--- debian/copyright	2011-01-17 10:54:50 +0000
+++ debian/copyright	2012-03-06 16:34:38 +0000
@@ -1,5 +1,5 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: glance
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: glance
 Source: https://code.launchpad.net/glance
 
 Files: *

=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2012-03-06 16:34:38 +0000
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch = master
+debian-branch = debian/unstable
+
+[git-buildpackage]
+export-dir = ../build-area/

=== removed file 'debian/glance-api.glance-api.upstart'
--- debian/glance-api.glance-api.upstart	2011-12-15 15:21:06 +0000
+++ debian/glance-api.glance-api.upstart	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-description "Glance API 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-api" glance

=== added file 'debian/glance-api.init'
--- debian/glance-api.init	1970-01-01 00:00:00 +0000
+++ debian/glance-api.init	2012-03-06 16:34:38 +0000
@@ -0,0 +1,90 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          glance-api
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Glance API server
+# Description:       Frontend Glance API server
+### END INIT INFO
+
+# Author: Julien Danjou <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Image Service API"
+NAME=glance-api
+DAEMON=/usr/bin/glance-api
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+. /lib/lsb/init-functions
+
+do_start()
+{
+	start-stop-daemon --start --background --quiet --chuid glance:glance --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --background --quiet --chuid glance:glance --make-pidfile --pidfile $PIDFILE --startas $DAEMON \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+	RETVAL="$?"
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC" "$NAME"
+    do_start
+    case "$?" in
+		0|1) log_end_msg 0 ;;
+		2) log_end_msg 1 ;;
+	esac
+  ;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) log_end_msg 0 ;;
+		2) log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

=== modified file 'debian/glance-api.logrotate'
--- debian/glance-api.logrotate	2012-01-04 19:09:42 +0000
+++ debian/glance-api.logrotate	2012-03-06 16:34:38 +0000
@@ -2,6 +2,8 @@
     daily
     missingok
     compress
-    delaycompress
-    notifempty
+    missingok
+    postrotate
+        invoke-rc.d glance-api restart
+    endscript
 }

=== added file 'debian/glance-api.manpages'
--- debian/glance-api.manpages	1970-01-01 00:00:00 +0000
+++ debian/glance-api.manpages	2012-03-06 16:34:38 +0000
@@ -0,0 +1,1 @@
+debian/mans/glance-api.8

=== added file 'debian/glance-api.upstart.in'
--- debian/glance-api.upstart.in	1970-01-01 00:00:00 +0000
+++ debian/glance-api.upstart.in	2012-03-06 16:34:38 +0000
@@ -0,0 +1,9 @@
+description "Glance API 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-api" glance

=== added file 'debian/glance-common.config'
--- debian/glance-common.config	1970-01-01 00:00:00 +0000
+++ debian/glance-common.config	2012-03-06 16:34:38 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input low glance/configure_glance || true
+db_go
+db_get glance/configure_glance
+if [ "$RET" = "true" ]; then
+	db_input high glance/config
+	db_input high glance/paste-flavor || true
+	db_go || true
+	db_get glance/paste-flavor
+
+	case "$RET" in
+		keystone*)
+			db_input high glance/auth-url || true
+			db_input high glance/auth-token || true
+			db_go || true
+			;;
+	esac
+fi

=== modified file 'debian/glance-common.postinst'
--- debian/glance-common.postinst	2011-12-16 19:26:31 +0000
+++ debian/glance-common.postinst	2012-03-06 16:34:38 +0000
@@ -2,6 +2,8 @@
 
 set -e
 
+. /usr/share/debconf/confmodule
+
 if [ "$1" = "configure" ]
 then
 	if ! getent group glance > /dev/null 2>&1

=== added file 'debian/glance-common.templates'
--- debian/glance-common.templates	1970-01-01 00:00:00 +0000
+++ debian/glance-common.templates	2012-03-06 16:34:38 +0000
@@ -0,0 +1,29 @@
+Template: glance/configure_glance
+Type: boolean
+Default: false
+Description: Do you want to configure glance?
+ Glance remains unconfigured for interacting with keystone, you might want to
+ configure glance. If you don't you can safely continue on.
+ .
+ Glance configuration can be reconfigured later by running
+ 'dpkg-reconfigure -plow glance-common'
+
+Template: glance/paste-flavor
+Type: select
+Choices: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
+Default: caching
+_Description: Pipeline flavor:
+ If you use the OpenStack Identity Service (Keystone), you might want to
+ select keystone. If you don't use this service, you can safely choose
+ caching only.
+
+Template: glance/auth-url
+Type: string
+Default: http://localhost:5000
+_Description: Auth server URL:
+ Type the URL of your auth server. This is typically the URL of your
+ OpenStack Identity Service (Keystone).
+
+Template: glance/auth-token
+Type: string
+_Description: Auth server admin token:

=== added file 'debian/glance-registry.config'
--- debian/glance-registry.config	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.config	2012-03-06 16:34:38 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input low glance/configure_db || true
+db_go
+db_get glance/configure_db
+if [ "$RET" = "true" ]; then
+	if [ -f /usr/share/dbconfig-common/dpkg/config ];
+	then
+		dbc_dbtypes="sqlite3, mysql, pgsql"
+		dbc_authmethod_user="password"
+		dbc_basepath="/var/lib/glance"
+		dbc_dbname="glance"
+		dbc_dbfile_owner="glance:glance"
+		. /usr/share/dbconfig-common/dpkg/config
+		dbc_go glance-registry $@
+	fi
+fi

=== 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

=== added file 'debian/glance-registry.init'
--- debian/glance-registry.init	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.init	2012-03-06 16:34:38 +0000
@@ -0,0 +1,90 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          glance-registry
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Glance registry server
+# Description:       Frontend Glance registry server
+### END INIT INFO
+
+# Author: Julien Danjou <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Image Service Registry"
+NAME=glance-registry
+DAEMON=/usr/bin/glance-registry
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+. /lib/lsb/init-functions
+
+do_start()
+{
+	start-stop-daemon --start --background --quiet --chuid glance:glance --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --background --quiet --chuid glance:glance --make-pidfile --pidfile $PIDFILE --startas $DAEMON \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+	RETVAL="$?"
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC" "$NAME"
+    do_start
+    case "$?" in
+		0|1) log_end_msg 0 ;;
+		2) log_end_msg 1 ;;
+	esac
+  ;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) log_end_msg 0 ;;
+		2) log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

=== modified file 'debian/glance-registry.logrotate'
--- debian/glance-registry.logrotate	2012-01-04 19:09:42 +0000
+++ debian/glance-registry.logrotate	2012-03-06 16:34:38 +0000
@@ -2,6 +2,8 @@
     daily
     missingok
     compress
-    delaycompress
-    notifempty
+    missingok
+    postrotate
+        invoke-rc.d glance-registry restart
+    endscript
 }

=== modified file 'debian/glance-registry.postinst'
--- debian/glance-registry.postinst	2012-01-04 19:37:37 +0000
+++ debian/glance-registry.postinst	2012-03-06 16:34:38 +0000
@@ -4,11 +4,70 @@
 
 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
+    . /usr/share/debconf/confmodule
+    . /usr/share/dbconfig-common/dpkg/postinst
+
+	
+	db_get glance/configure_glance
+	if [ "$RET" = "true" ]; then
+		db_get glance/paste-flavor || true
+		FLAVOR="$RET"
+
+		sed -i "s,^flavor\s*=.*$,flavor = $FLAVOR," /etc/glance/glance-registry.conf
+
+		case $FLAVOR in
+			keystone*)
+				FLAVOR=keystone
+				db_get glance/auth-url
+				sed -i "s,^auth_uri\s*=\s*.\+$,auth_uri = $RET," /etc/glance/glance-registry-paste.ini
+				db_get glance/auth-token
+				sed -i "s/^admin_token\s*=\s*.\+$/admin_token = $RET/" /etc/glance/glance-registry-paste.ini
+				;;
+			*)
+				FLAVOR=
+				;;
+		esac
 	fi
+
+	db_get glance/configure_db
+	if [ "$RET" = "true" ]; then
+		dbc_dbfile_owner="glance:glance"
+		dbc_go glance-registry $@
+
+		if [ "$dbc_install" = "true" ]
+		then
+			case "$dbc_dbtype" in
+				mysql)
+					[ -n "$dbc_dbport" ] && dbport=:$dbc_dbport
+					SQL_CONNECTION="mysql://$dbc_dbuser:$dbc_dbpass@${dbc_dbserver:-localhost}$dbport/$dbc_dbname"
+					;;
+				pgsql)
+					[ -n "$dbc_dbport" ] && dbport=:$dbc_dbport
+					SQL_CONNECTION="pgsql://$dbc_dbuser:$dbc_dbpass@${dbc_dbserver:-localhost}$dbport/$dbc_dbname"
+					;;
+				*)
+					SQL_CONNECTION="sqlite:////$dbc_basepath/$dbc_dbname.db"
+					;;
+			esac
+
+			sed -e "s,^sql_connection\s*=\s*.\+$,sql_connection = $SQL_CONNECTION," -i /etc/glance/glance-registry.conf
+
+			if [ "$dbc_upgrade" = "true" ]
+			then
+				glance-manage db_sync || true
+			fi
+		fi
+	else
+		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
 fi
 
+chown glance:glance -R /var/lib/glance/ /var/log/glance/ /etc/glance/
+chmod 0750 /etc/glance/
+chmod 0750 /var/log/glance/
+
+
 #DEBHELPER#
-

=== modified file 'debian/glance-registry.prerm'
--- debian/glance-registry.prerm	2011-12-16 18:47:42 +0000
+++ debian/glance-registry.prerm	2012-03-06 16:34:38 +0000
@@ -2,12 +2,8 @@
 
 set -e
 
-case $1 in
-	remove|purge)
-		if [ -x /etc/init.d/glance-registry ]; then
-			invoke-rc.d glance-registry stop || true
-		fi
-	;;
-esac
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm
+dbc_go glance-registry $@
 
 #DEBHELPER#

=== added file 'debian/glance-registry.templates'
--- debian/glance-registry.templates	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.templates	2012-03-06 16:34:38 +0000
@@ -0,0 +1,14 @@
+Template: glance/configure_db
+Type: boolean
+Default: false
+Description: Se up a database for glance?
+ By default glance uses sqlite3 as a database backend. If you
+ want to choose a different default you should have:
+ .
+  - the server hostname (that server must allow TCP connections
+    from this machine);
+  - a username and password to access the database.
+  - a database type that you want to use.
+ .
+ Database configure can be configured later by running
+ 'dpkg-reconfigure -plow glance-registry'.

=== added file 'debian/glance-registry.upstart.in'
--- debian/glance-registry.upstart.in	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.upstart.in	2012-03-06 16:34:38 +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 directory 'debian/mans'
=== added file 'debian/mans/glance-api.8'
--- debian/mans/glance-api.8	1970-01-01 00:00:00 +0000
+++ debian/mans/glance-api.8	2012-03-06 16:34:38 +0000
@@ -0,0 +1,19 @@
+.TH glance-api 8
+.SH NAME
+glance\-api \- A multinode storage system
+
+.SH SYNOPSIS
+.B galnce\-api
+
+.SH DESCRIPTION
+.B glance\-api
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B params
+.IP
+
+Please contribute

=== added file 'debian/mans/glance-control.8'
--- debian/mans/glance-control.8	1970-01-01 00:00:00 +0000
+++ debian/mans/glance-control.8	2012-03-06 16:34:38 +0000
@@ -0,0 +1,19 @@
+.TH glance-control 8
+.SH NAME
+glance\-control \- A multinode storage system
+
+.SH SYNOPSIS
+.B galnce\-control
+
+.SH DESCRIPTION
+.B glance\-control
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B params
+.IP
+
+Please contribute

=== added file 'debian/mans/glance-manage.8'
--- debian/mans/glance-manage.8	1970-01-01 00:00:00 +0000
+++ debian/mans/glance-manage.8	2012-03-06 16:34:38 +0000
@@ -0,0 +1,19 @@
+.TH glance-manage 8
+.SH NAME
+glance\-manage \- A multinode storage system
+
+.SH SYNOPSIS
+.B galnce\-manage
+
+.SH DESCRIPTION
+.B glance\-manage
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B params
+.IP
+
+Please contribute

=== added file 'debian/mans/glance-registry.8'
--- debian/mans/glance-registry.8	1970-01-01 00:00:00 +0000
+++ debian/mans/glance-registry.8	2012-03-06 16:34:38 +0000
@@ -0,0 +1,19 @@
+.TH glance-registry 8
+.SH NAME
+glance\-registry \- A multinode storage system
+
+.SH SYNOPSIS
+.B galnce\-registry
+
+.SH DESCRIPTION
+.B glance\-registry
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B params
+.IP
+
+Please contribute

=== added file 'debian/mans/glance-upload.8'
--- debian/mans/glance-upload.8	1970-01-01 00:00:00 +0000
+++ debian/mans/glance-upload.8	2012-03-06 16:34:38 +0000
@@ -0,0 +1,19 @@
+.TH glance-upload 8
+.SH NAME
+glance\-upload \- A multinode storage system
+
+.SH SYNOPSIS
+.B galnce\-upload
+
+.SH DESCRIPTION
+.B glance\-upload
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B params
+.IP
+
+Please contribute

=== added file 'debian/mans/glance.1'
--- debian/mans/glance.1	1970-01-01 00:00:00 +0000
+++ debian/mans/glance.1	2012-03-06 16:34:38 +0000
@@ -0,0 +1,19 @@
+.TH glance 1
+.SH NAME
+glance \- A multinode storage system
+
+.SH SYNOPSIS
+.B galnce
+
+.SH DESCRIPTION
+.B glance
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B params
+.IP
+
+Please contribute

=== added file 'debian/patches/default_conf.patch'
--- debian/patches/default_conf.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/default_conf.patch	2012-03-06 16:34:38 +0000
@@ -0,0 +1,20 @@
+--- a/etc/glance-api.conf
++++ b/etc/glance-api.conf
+@@ -232,3 +232,6 @@
+ 
+ # Base directory that the Image Cache uses
+ image_cache_dir = /var/lib/glance/image-cache/
++
++[paste_deploy]
++flavor = caching
+\ No newline at end of file
+--- a/etc/glance-registry.conf
++++ b/etc/glance-registry.conf
+@@ -56,3 +56,6 @@
+ 
+ # Private key file to use when starting registry server securely
+ # key_file = /path/to/keyfile
++
++[paste_deploy]
++flavor = cachinge
+\ No newline at end of file

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-11 02:31:21 +0000
+++ debian/patches/series	2012-03-06 16:34:38 +0000
@@ -1,1 +1,2 @@
+default_conf.patch
 sql_conn.patch

=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2012-03-06 16:34:38 +0000
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] glance-common.templates

=== removed file 'debian/pycompat'
--- debian/pycompat	2011-01-17 10:54:50 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/python-glance-doc.links'
--- debian/python-glance-doc.links	2011-01-17 11:35:10 +0000
+++ debian/python-glance-doc.links	2012-03-06 16:34:38 +0000
@@ -1,3 +1,7 @@
 # Overwrite jquery.js  from upstream tarball with a  link to jquery.js
 # provided by jQuery Debian package
 /usr/share/javascript/jquery/jquery.js usr/share/doc/python-glance-doc/html/_static/jquery.js
+
+# Overwrite underscore.js  from upstream tarball with a link to underscore.min.js
+# provided by underscore Debian package
+/usr/share/javascript/underscore/underscore.min.js usr/share/doc/python-glance-doc/html/_static/underscore.js

=== modified file 'debian/rules'
--- debian/rules	2011-09-19 17:04:18 +0000
+++ debian/rules	2012-03-06 16:34:38 +0000
@@ -30,9 +30,15 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf doc/build
+	debconf-updatepo
+	rm -rf build doc/build glance.egg-info po/glance.pot glance/vcsversion.py
 	rm -rf glance.sqlite
 
 override_dh_installinit:
-	dh_installinit --name glance-api
-	dh_installinit --name glance-registry
+	if dpkg-vendor --derives-from ubuntu ; then \
+		for i in debian/*.upstart.in ; do \
+			MYPKG=`echo $$i | cut -d. -f1` ; \
+			cp $$MYPKG.upstart.in $$MYPKG.upstart ; \
+		done; \
+	fi
+	dh_installinit --error-handler=true

=== modified file 'debian/watch'
--- debian/watch	2012-03-02 14:27:38 +0000
+++ debian/watch	2012-03-06 16:34:38 +0000
@@ -1,2 +1,4 @@
 version=3
-https://launchpad.net/glance/+download http://launchpad.net/glance/.*/glance-(.*)\.tar\.gz
+http://launchpad.net/glance/+download http://launchpad.net/glance/.*/glance-(.*)\.tar\.gz
+http://glance.openstack.org/tarballs/ glance-(.*).tar.gz
+