=== modified file 'debian/changelog'
--- debian/changelog	2011-08-17 00:58:19 +0000
+++ debian/changelog	2011-08-19 15:29:27 +0000
@@ -1,12 +1,17 @@
-glance (2011.3~d4~20110812.981-0ubuntu1) oneiric; urgency=low
+glance (2011.3~d4~20110812.981-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Monty Taylor ]
   * New upstream release.
   * Added python-kombu as Depends and Build-depends.
 
   [ Scott Moser ]
   * glance.postinst: use a trailing slash when using chown on directories
+  
+  [ Ben Howard ]
+  * Install /etc/glance-scrubber.conf by default (LP: #816972)
+  * Converted dh to use "--with python2".
 
- -- Monty Taylor <mordred@inaugust.com>  Fri, 12 Aug 2011 12:53:06 -0400
+ -- Ben Howard <ben.howard@canonical.com>  Fri, 19 Aug 2011 15:06:07 +0000
 
 glance (2011.3~d4~20110811.980-0ubuntu1) oneiric; urgency=low
 

=== modified file 'debian/glance.install'
--- debian/glance.install	2011-08-01 19:24:43 +0000
+++ debian/glance.install	2011-08-19 15:29:27 +0000
@@ -1,4 +1,5 @@
 usr/bin/*
+etc/glance-scrubber.conf etc/glance
 etc/glance-api.conf etc/glance
 etc/glance-registry.conf etc/glance
 etc/glance-prefetcher.conf etc/glance

=== modified file 'debian/patches/sql_conn.patch'
--- debian/patches/sql_conn.patch	2011-05-14 18:21:45 +0000
+++ debian/patches/sql_conn.patch	2011-08-19 15:29:27 +0000
@@ -11,3 +11,17 @@
  
  # Period in seconds after which SQLAlchemy should reestablish its connection
  # to the database.
+
+=== modified file 'etc/glance-scrubber.conf'
+--- org/etc/glance-scrubber.conf	2011-07-29 09:43:22 +0000
++++ new/etc/glance-scrubber.conf	2011-08-11 14:47:55 +0000
+@@ -21,7 +21,7 @@
+ # SQLAlchemy connection string for the reference implementation
+ # registry server. Any valid SQLAlchemy connection string is fine.
+ # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+-sql_connection = sqlite:///glance.sqlite
++sql_connection = sqlite:////var/lib/glance/glance.sqlite
+ 
+ # Period in seconds after which SQLAlchemy should reestablish its connection
+ # to the database.
+

=== modified file 'debian/rules'
--- debian/rules	2011-05-19 10:52:39 +0000
+++ debian/rules	2011-08-19 15:29:27 +0000
@@ -9,7 +9,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --with python2
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area