Merge lp:~zulcss/heat/ubuntu-refresh into lp:~openstack-ubuntu-testing/heat/havana

[Chuck Short]

Unmerged revisions

24. By Chuck Short on 2013-06-10

Fix manpages one more time

23. By Chuck Short on 2013-06-10

debian/*.manpages: Install the correct manpages

22. By Chuck Short on 2013-06-10

debian/*.manpages: Install the right manpages.

21. By Chuck Short on 2013-06-10

debian/*.install: Install the configration files into the right places.

20. By Chuck Short on 2013-06-10

debian/heat-common.install: Add missing files.

19. By Chuck Short on 2013-06-10

debian/removes-lxml-version-limitation-from-pip-requires.patch: Dropped no
longer needed.

18. By Chuck Short on 2013-06-10

debian/heat-common.postinst: Add common configration stuff.

17. By Chuck Short on 2013-06-10

heat-engine}.postinst.in: Dropped not used in Ubuntu.
* debian/{heat-api-cfn, heat-api-cloudwatch, heat-api,

16. By Chuck Short on 2013-06-10

  - Dropped openstack-pkg configuration.
  - Run testr init and testr run by hand.

15. By Chuck Short on 2013-06-10

* debian/rules:
  - Dropped sed of configuration files.
* debian/watch: Update to point to launchpad source
* debian/pydist-overrides: Override python-argparse
* debian/patches/fix-ubuntu-configuration.patch: Update configruation files
  to use kombu rpc backend.
* debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped
  no longer needed.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-07 15:04:17 +0000
+++ debian/changelog	2013-06-10 18:48:25 +0000
@@ -1,7 +1,52 @@
-heat (2013.1-4ubuntu1) UNRELEASED; urgency=low
+heat (2013.2.a50.g9f40fa3-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Yolanda Robla ]
   * debian/tests: added autopkg tests
 
+  [ Chuck Short ]
+  * New upstream release.
+  * Update maintainer.
+  * debian/control: 
+    - Dropped python-argparse from build-deps.
+    - Dropped pep8 from build-deps
+    - Dropped python-nose and python-nosexcover from build-deps.
+    - Dropped python-pycryptopp from build-deps.
+    - Added python-d2to1 and python-pbr to build-depends.
+    - Added python-six to build-depends.
+    - Added python-testtools and testrepository to build-depends.
+    - Bump standards-version to 3.9.4
+    - Dropped openstack-pkg-tools
+    - Dropped dbconfig-common from heat-common.
+  * debian/rules:
+    - Dropped sed of configuration files.
+    - Dropped openstack-pkg configuration.
+    - Run testr init and testr run by hand.
+  * debian/{heat-api-cfn, heat-api-cloudwatch, heat-api-tempates,
+    heat-enginge}.templates: Dropped not used in Ubuntu.
+  * debian/{heat-api-cfn, heat-api-cloudwatch, heat-api-tempates,
+    heat-enginge}.config.in: Dropped not used in Ubuntu.
+  * debian/{heat-api-cfn, heat-api-cloudwatch, heat-api,
+    heat-engine}.postinst.in: Dropped not used in Ubuntu.
+  * debian/{heat-api-cfn, heat-api-cloudwatch, heat-api, 
+    heat-engine}.init: Dropped replaced with..
+  * debian/{heat-api-cfn, heat-api-cloudwatch, heat-api, 
+    heat-engine}.upstart: Create upstart jobs.
+  * debian/heat-common.dirs: Add directories that we need
+    to be created.
+  * debian/gpb.conf: Dropped no longer needed.
+  * debian/watch: Update to point to launchpad source
+  * debian/pydist-overrides: Override python-argparse
+  * debian/patches/fix-ubuntu-configuration.patch: Update configruation files
+    to use kombu rpc backend.
+  * debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped
+    no longer needed.
+  * debian/removes-lxml-version-limitation-from-pip-requires.patch: Dropped no
+    longer needed.
+  * debian/heat-common.postinst: Add common configration stuff.
+  * debian/heat-common.install: Add missing files.
+  * debian/*.install: Install the configration files into the right places.
+  * debian/*.manpages: Install the correct manpages
+
  -- Yolanda Robla <[e-mail]>  Fri, 07 Jun 2013 17:02:11 +0200
 
 heat (2013.1-4) unstable; urgency=low
 
=== modified file 'debian/control'
--- debian/control	2013-06-07 15:04:17 +0000
+++ debian/control	2013-06-10 18:48:25 +0000
@@ -1,7 +1,8 @@
 Source: heat
 Section: web
 Priority: optional
-Maintainer: PKG OpenStack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: PKG OpenStack <[e-mail]>
 Uploaders: Loic Dachary (OuoU) <[e-mail]>,
            Julien Danjou <[e-mail]>,
            Thomas Goirand <[e-mail]>,
@@ -9,15 +10,14 @@
            Mehdi Abaakouk <[e-mail]>
 Build-Depends: debhelper (>= 9),
  po-debconf,
- python-all (>= 2.6.6-3~),
- openstack-pkg-tools (>= 4)
-Build-Depends-Indep: pep8 (>= 1.3.3),
- python-argparse,
+ python-all (>= 2.6.6-3~)
+Build-Depends-Indep: 
  python-babel,
  python-boto,
  python-cinderclient,
  python-coverage,
  python-crypto,
+ python-d2to1,
  python-eventlet (>= 0.9.16),
  python-extras,
  python-glanceclient,
@@ -30,25 +30,26 @@
  python-memcache,
  python-migrate,
  python-mox,
- python-nose,
- python-nosexcover,
  python-novaclient,
  python-oslo.config,
  python-paste,
  python-pastedeploy,
  python-paramiko,
- python-pycryptopp,
+ python-pbr,
  python-qpid,
  python-quantumclient,
  python-routes,
  python-sendfile,
  python-setuptools,
+ python-six,
  python-sphinx,
  python-sqlalchemy (>= 0.7.8),
+ python-testtools,
  python-swiftclient,
  python-webob,
- python-yaml
-Standards-Version: 3.9.3
+ python-yaml,
+ testrepository
+Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary
 Vcs-Git: git://anonscm.debian.org/openstack/heat.git
 Homepage: http://wiki.openstack.org/Heat
@@ -59,7 +60,6 @@
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${python:Depends}, ${misc:Depends},
- python-argparse,
  python-boto,
  python-cinderclient,
  python-crypto,
@@ -99,7 +99,7 @@
 Package: heat-common
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: dbconfig-common, ${python:Depends}, ${misc:Depends}, python-heat (=${binary:Version}),
+Depends: ${python:Depends}, ${misc:Depends}, python-heat (=${binary:Version}),
  adduser
 Description: OpenStack orchestration service - common files
  Heat is a service to orchestrate multiple composite cloud applications using
 
=== removed file 'debian/gbp.conf'
--- debian/gbp.conf	2013-05-29 17:36:41 +0000
+++ debian/gbp.conf	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[DEFAULT]
-upstream-branch = master
-debian-branch = debian/unstable
-upstream-tag = %(version)s
-compression = xz
-
-[git-buildpackage]
-export-dir = ../build-area/
-#cleaner = true
 
=== removed file 'debian/heat-api-cfn.config.in'
--- debian/heat-api-cfn.config.in	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.config.in	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-API_CONF=/etc/heat/heat-api-cfn.conf
-APIPASTE_CONF=/etc/heat/heat-api-cfn-paste.ini
-
-#PKGOS-INCLUDE#
-
-pkgos_var_user_group heat
-pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat
-
-exit 0
 
=== removed file 'debian/heat-api-cfn.init'
--- debian/heat-api-cfn.init	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.init	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          heat-api-cfn
-# 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: Heat CFN API
-# Description:       Heat CFN API server
-### END INIT INFO
-
-# Author: Thomas Goirand <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-NAME=heat-api-cfn
-DAEMON=/usr/bin/heat-api-cfn
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
-	mkdir -p /var/log/heat
-	chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --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/heat-api-cfn.install'
--- debian/heat-api-cfn.install	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.install	2013-06-10 18:48:25 +0000
@@ -1,3 +1,2 @@
-etc/heat/heat-api-cfn.conf
-etc/heat/heat-api-cfn-paste.ini	/usr/share/heat-api-cfn
+etc/heat/heat-api-cfn.conf etc/heat
 usr/bin/heat-api-cfn
 
=== added file 'debian/heat-api-cfn.manpages'
--- debian/heat-api-cfn.manpages	1970-01-01 00:00:00 +0000
+++ debian/heat-api-cfn.manpages	2013-06-10 18:48:25 +0000
@@ -0,0 +1,1 @@
+build/sphinx/man/heat-api-cfn.1
 
=== removed file 'debian/heat-api-cfn.manpages'
--- debian/heat-api-cfn.manpages	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-doc/build/man/heat-api-cfn.1
 
=== removed file 'debian/heat-api-cfn.postinst.in'
--- debian/heat-api-cfn.postinst.in	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.postinst.in	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ETC=/etc/heat
-
-#PKGOS-INCLUDE#
-
-if [ "$1" = "configure" ] ; then
-	. /usr/share/debconf/confmodule
-	pkgos_var_user_group heat
-	pkgos_write_new_conf heat heat-api-cfn-paste.ini
-	pkgos_write_admin_creds /etc/heat/heat-api-cfn-paste.ini filter:authtoken heat
-	chown -R heat:adm /var/log/heat
-	chmod 0750 /var/log/heat
-fi
-
-#DEBHELPER#
-
-exit 0
 
=== removed file 'debian/heat-api-cfn.templates'
--- debian/heat-api-cfn.templates	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.templates	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Template: heat/auth-host
-Type: string
-Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically this is also
- the URL of your OpenStack Identity Service (Keystone).
-
-Template: heat/admin-tenant-name
-Type: string
-Default: admin
-_Description: Auth server tenant name:
-
-Template: heat/admin-user
-Type: string
-Default: admin
-_Description: Auth server username:
-
-Template: heat/admin-password
-Type: password
-_Description: Auth server password:
 
=== added file 'debian/heat-api-cfn.upstart'
--- debian/heat-api-cfn.upstart	1970-01-01 00:00:00 +0000
+++ debian/heat-api-cfn.upstart	2013-06-10 18:48:25 +0000
@@ -0,0 +1,11 @@
+description "Heat API CFN server'
+author "Chuck Short <[e-mail]>"
+
+start on runevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+exec start-stop-daemon --start --chuid heat \
+	--chdir /var/lib/heat --name heat \
+	--exec /usr/bin/heat-api-cfn
 
=== removed file 'debian/heat-api-cloudwatch.config.in'
--- debian/heat-api-cloudwatch.config.in	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.config.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-APIPASTE_CONF=/etc/heat/heat-api-cloudwatch-paste.ini
-
-#PKGOS-INCLUDE#
-
-pkgos_var_user_group heat
-pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat
-
-exit 0
 
=== removed file 'debian/heat-api-cloudwatch.init'
--- debian/heat-api-cloudwatch.init	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.init	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          heat-api-cloudwatch
-# 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: Heat cloudwatch API
-# Description:       Heat cloudwatch API server
-### END INIT INFO
-
-# Author: Thomas Goirand <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-NAME=heat-api-cloudwatch
-DAEMON=/usr/bin/heat-api-cloudwatch
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
-	mkdir -p /var/log/heat
-	chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --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/heat-api-cloudwatch.install'
--- debian/heat-api-cloudwatch.install	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.install	2013-06-10 18:48:25 +0000
@@ -1,3 +1,2 @@
-etc/heat/heat-api-cloudwatch.conf
-etc/heat/heat-api-cloudwatch-paste.ini	/usr/share/heat-api-cloudwatch
+etc/heat/heat-api-cloudwatch.conf etc/heat
 /usr/bin/heat-api-cloudwatch
 
=== added file 'debian/heat-api-cloudwatch.manpages'
--- debian/heat-api-cloudwatch.manpages	1970-01-01 00:00:00 +0000
+++ debian/heat-api-cloudwatch.manpages	2013-06-10 18:48:25 +0000
@@ -0,0 +1,1 @@
+build/sphinx/man/heat-api-cloudwatch.1
 
=== removed file 'debian/heat-api-cloudwatch.manpages'
--- debian/heat-api-cloudwatch.manpages	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-doc/build/man/heat-api-cloudwatch.1
 
=== removed file 'debian/heat-api-cloudwatch.postinst.in'
--- debian/heat-api-cloudwatch.postinst.in	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.postinst.in	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ETC=/etc/heat
-
-#PKGOS-INCLUDE#
-
-if [ "$1" = "configure" ] ; then
-	. /usr/share/debconf/confmodule
-	pkgos_var_user_group heat
-	pkgos_write_new_conf heat heat-api-cloudwatch-paste.ini
-	pkgos_write_admin_creds /etc/heat/heat-api-cloudwatch-paste.ini filter:authtoken heat
-	chown -R heat:adm /var/log/heat
-	chmod 0750 /var/log/heat
-fi
-
-#DEBHELPER#
-
-exit 0
 
=== removed file 'debian/heat-api-cloudwatch.templates'
--- debian/heat-api-cloudwatch.templates	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.templates	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Template: heat/auth-host
-Type: string
-Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically
- this is also the URL of your OpenStack Identity Service (Keystone).
-
-Template: heat/admin-tenant-name
-Type: string
-Default: admin
-_Description: Auth server tenant name:
-
-Template: heat/admin-user
-Type: string
-Default: admin
-_Description: Auth server username:
-
-Template: heat/admin-password
-Type: password
-_Description: Auth server password:
 
=== added file 'debian/heat-api-cloudwatch.upstart'
--- debian/heat-api-cloudwatch.upstart	1970-01-01 00:00:00 +0000
+++ debian/heat-api-cloudwatch.upstart	2013-06-10 18:48:25 +0000
@@ -0,0 +1,11 @@
+description "Heat API cloudwatch server'
+author "Chuck Short <[e-mail]>"
+
+start on runevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+exec start-stop-daemon --start --chuid heat \
+	--chdir /var/lib/heat --name heat \
+	--exec /usr/bin/heat-api-cloudwatch
 
=== removed file 'debian/heat-api.config.in'
--- debian/heat-api.config.in	2013-05-29 17:36:41 +0000
+++ debian/heat-api.config.in	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-API_CONF=/etc/heat/heat-api.conf
-APIPASTE_CONF=/etc/heat/heat-api-paste.ini
-
-#PKGOS-INCLUDE#
-
-pkgos_var_user_group heat
-pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat
-pkgos_register_endpoint_config heat
-
-exit 0
 
=== removed file 'debian/heat-api.init'
--- debian/heat-api.init	2013-05-29 17:36:41 +0000
+++ debian/heat-api.init	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          heat-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: Heat API
-# Description:       Heat API server
-### END INIT INFO
-
-# Author: Thomas Goirand <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-NAME=heat-api
-DAEMON=/usr/bin/heat-api
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
-	mkdir -p /var/log/heat
-	chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --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/heat-api.install'
--- debian/heat-api.install	2013-05-29 17:36:41 +0000
+++ debian/heat-api.install	2013-06-10 18:48:25 +0000
@@ -1,3 +1,2 @@
 usr/bin/heat-api
 etc/heat/heat-api.conf
-etc/heat/heat-api-paste.ini	/usr/share/heat-api
 
=== added file 'debian/heat-api.manpages'
--- debian/heat-api.manpages	1970-01-01 00:00:00 +0000
+++ debian/heat-api.manpages	2013-06-10 18:48:25 +0000
@@ -0,0 +1,1 @@
+build/sphinx/man/heat-api.1
 
=== removed file 'debian/heat-api.manpages'
--- debian/heat-api.manpages	2013-05-29 17:36:41 +0000
+++ debian/heat-api.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-doc/build/man/heat-api.1
 
=== removed file 'debian/heat-api.postinst.in'
--- debian/heat-api.postinst.in	2013-05-29 17:36:41 +0000
+++ debian/heat-api.postinst.in	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ETC=/etc/heat
-
-#PKGOS-INCLUDE#
-
-if [ "$1" = "configure" ] ; then
-        . /usr/share/debconf/confmodule
-
-        pkgos_var_user_group heat
-
-        pkgos_write_new_conf heat heat-api-paste.ini
-        pkgos_write_admin_creds /etc/heat/heat-api-paste.ini filter:authtoken heat
-
-	pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s'
-
-        chown -R heat:adm /var/log/heat
-        chmod 0750 /var/log/heat
-fi
-
-#DEBHELPER#
-
-exit 0
 
=== removed file 'debian/heat-api.templates'
--- debian/heat-api.templates	2013-05-29 17:36:41 +0000
+++ debian/heat-api.templates	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-Template: heat/auth-host
-Type: string
-Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically this is also
- the URL of your OpenStack Identity Service (Keystone).
-
-Template: heat/admin-tenant-name
-Type: string
-Default: admin
-_Description: Auth server tenant name:
-
-Template: heat/admin-user
-Type: string
-Default: admin
-_Description: Auth server username:
-
-Template: heat/admin-password
-Type: password
-_Description: Auth server password:
-
-Template: heat/register-endpoint
-Type: boolean
-Default: false
-_Description: Register Heat in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
- accessible. This is done using "keystone service-create" and "keystone
- endpoint-create". Select if you want to run these commands now.
- .
- Note that you will need to have an up and running keystone server on which to
- connect using the Keystone auth token.
-
-Template: heat/keystone-ip
-Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that heat-api can
- contact Keystone to do the Heat service and endpoint creation.
-
-Template: heat/keystone-auth-token
-Type: password
-_Description: Keystone Auth Token:
- To configure its endpoint in Keystone, heat-api needs the Keystone auth
- token.
-
-Template: heat/endpoint-ip
-Type: string
-_Description: Heat endpoint IP address:
- Enter the IP address that will be used to contact Heat (eg: the Heat
- endpoint IP address).
- .
- This IP address should be accessible from the clients that will use this
- service, so if you are installing a public cloud, this should be a public
- IP address.
-
-Template: heat/region-name
-Type: string
-Default: regionOne
-_Description: Name of the region to register:
- Openstack can be used using availability zones, with each region representing
- a location. Please enter the zone that you wish to use when registering the
- endpoint.
 
=== added file 'debian/heat-api.upstart'
--- debian/heat-api.upstart	1970-01-01 00:00:00 +0000
+++ debian/heat-api.upstart	2013-06-10 18:48:25 +0000
@@ -0,0 +1,11 @@
+description "Heat enginge server'
+author "Chuck Short <[e-mail]>"
+
+start on runevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+exec start-stop-daemon --start --chuid heat \
+	--chdir /var/lib/heat --name heat \
+	--exec /usr/bin/heat-enginge
 
=== added file 'debian/heat-common.dirs'
--- debian/heat-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/heat-common.dirs	2013-06-10 18:48:25 +0000
@@ -0,0 +1,3 @@
+etc/heat
+var/lib/heat
+var/log/heat
 
=== modified file 'debian/heat-common.install'
--- debian/heat-common.install	2013-05-29 17:36:41 +0000
+++ debian/heat-common.install	2013-06-10 18:48:25 +0000
@@ -1,3 +1,10 @@
+etc/boto.cfg etc/heat
+etc/heat/api-paste.ini etc/heat
+etc/heat/policy.json etc/heat
 /usr/bin/heat-cfn
 /usr/bin/heat-boto
 /usr/bin/heat-watch
+/usr/bin/heat-db-setup
+/usr/bin/cinder-keystone-setup
+/usr/bin/heat-keystone-setup
+/usr/bin/heat-manage
 
=== added file 'debian/heat-common.manpages'
--- debian/heat-common.manpages	1970-01-01 00:00:00 +0000
+++ debian/heat-common.manpages	2013-06-10 18:48:25 +0000
@@ -0,0 +1,4 @@
+build/sphinx/man/heat-boto.1
+build/sphinx/man/heat-db-setup.1
+build/sphinx/man/heat-watch.1
+build/sphinx/man/heat-keystone-setup.1
 
=== removed file 'debian/heat-common.manpages'
--- debian/heat-common.manpages	2013-05-29 17:36:41 +0000
+++ debian/heat-common.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-doc/build/man/heat-cfn.1
 
=== added file 'debian/heat-common.postinst'
--- debian/heat-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/heat-common.postinst	2013-06-10 18:48:25 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	if !getent group heat > /dev/null 2>&1; then
+		addgroup --system heat >/dev/null
+	fi
+
+	if ! getent passwd heat > /dev/null 2>&1; then
+		adduser --system head --home /var/lib/heat --ingroup heat --no-create-home \
+			-shell /bin/false head
+	fi
+
+	if [ "$(id -gn nova)"  = "nogroup" ]; then
+		usermod -g heat heat
+	fi
+
+	chown -R heat:heat /etc/heat
+	chown -R heat:adm /var/log/heat
+	chown -R heat:heat /var/lib/heat
+fi
+
+#DEBEHELPER#
 
=== removed file 'debian/heat-common.postinst.in'
--- debian/heat-common.postinst.in	2013-05-29 17:36:41 +0000
+++ debian/heat-common.postinst.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ETC=/etc/heat
-
-#PKGOS-INCLUDE#
-
-if [ "$1" = "configure" ] ; then
-	pkgos_var_user_group heat
-	chown -R heat:adm /var/log/heat
-	chmod 0750 /var/log/heat
-	mkdir -p /etc/heat
-	mkdir -p /var/lib/heat
-	chown heat:heat -R /var/lib/heat /etc/heat
-fi
-
-#DEBHELPER#
 
=== removed file 'debian/heat-engine.config.in'
--- debian/heat-engine.config.in	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.config.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-CONF=/etc/heat/heat-engine.conf
-
-#PKGOS-INCLUDE#
-
-pkgos_var_user_group heat
-pkgos_dbc_read_conf -pkg heat-engine ${CONF} DEFAULT sql_connection heat $@
-
-exit 0
 
=== removed file 'debian/heat-engine.init'
--- debian/heat-engine.init	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.init	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          heat-engine
-# 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: Heat Engine
-# Description:       Heat Engine server
-### END INIT INFO
-
-# Author: Thomas Goirand <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat Engine"
-NAME=heat-engine
-DAEMON=/usr/bin/heat-engine
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
-	mkdir -p /var/log/heat
-	chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --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/heat-engine.install'
--- debian/heat-engine.install	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.install	2013-06-10 18:48:25 +0000
@@ -1,2 +1,2 @@
-etc/heat/heat-engine.conf	/usr/share/heat-engine
+etc/heat/heat-engine.conf	etc/heat
 usr/bin/heat-engine
 
=== added file 'debian/heat-engine.manpages'
--- debian/heat-engine.manpages	1970-01-01 00:00:00 +0000
+++ debian/heat-engine.manpages	2013-06-10 18:48:25 +0000
@@ -0,0 +1,1 @@
+build/sphinx/man/heat-engine.1
 
=== removed file 'debian/heat-engine.manpages'
--- debian/heat-engine.manpages	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-doc/build/man/heat-engine.1
 
=== removed file 'debian/heat-engine.postinst.in'
--- debian/heat-engine.postinst.in	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.postinst.in	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-CONF=/etc/heat/heat-engine.conf
-
-#PKGOS-INCLUDE#
-
-if [ "$1" = "configure" ] ; then
-	. /usr/share/debconf/confmodule
-	. /usr/share/dbconfig-common/dpkg/postinst
-
-	pkgos_var_user_group heat
-	pkgos_write_new_conf heat heat-engine.conf
-	pkgos_dbc_postinst ${CONF} DEFAULT sql_connection heat $@
-
-	# This is the equivalent of db-sync:
-	su heat -c  "python -m heat.db.sync"
-fi
-
-#DEBHELPER#
-
-exit 0
 
=== removed file 'debian/heat-engine.templates'
--- debian/heat-engine.templates	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.templates	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Template: heat/configure_db
-Type: boolean 
-Default: true
-_Description: Set up a database for heat-engine?
- No database has been set up for heat-engine to use. Before continuing, you
- should make sure you have:
- .
-  - the server host name (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.
- .
- If some of these requirements are missing, reject this option and run with  
- regular sqlite support.
- .
- You can change this setting later on by running 'dpkg-reconfigure -plow  
- heat-engine'.
 
=== added file 'debian/heat-engine.upstart'
--- debian/heat-engine.upstart	1970-01-01 00:00:00 +0000
+++ debian/heat-engine.upstart	2013-06-10 18:48:25 +0000
@@ -0,0 +1,11 @@
+description "Heat API server'
+author "Chuck Short <[e-mail]>"
+
+start on runevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+exec start-stop-daemon --start --chuid heat \
+	--chdir /var/lib/heat --name heat \
+	--exec /usr/bin/heat-api
 
=== removed file 'debian/patches/fix-package-version-detection-when-building-doc.patch'
--- debian/patches/fix-package-version-detection-when-building-doc.patch	2013-05-29 17:36:41 +0000
+++ debian/patches/fix-package-version-detection-when-building-doc.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Description: Fixes version detection when building docs
-Author: Thomas Goirand <[e-mail]>
-Forwarded: no
-Last-Update: 2013-05-16
-
-Index: heat/heat/openstack/common/version.py
-===================================================================
---- heat.orig/heat/openstack/common/version.py	2013-05-16 14:07:08.000000000 +0000
-+++ heat/heat/openstack/common/version.py	2013-05-16 14:07:08.000000000 +0000
-@@ -19,6 +19,7 @@
- """
- 
- import pkg_resources
-+import os
- 
- 
- class VersionInfo(object):
-@@ -54,6 +55,9 @@
-         if self.release is None:
-             self.release = self._get_version_from_pkg_resources()
- 
-+        if self.release is None:
-+            self.release = os.environ.get("OSLO_PACKAGE_VERSION", None)
-+
-         return self.release
- 
-     def version_string(self):
 
=== added file 'debian/patches/fix-ubuntu-configuration.patch'
--- debian/patches/fix-ubuntu-configuration.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ubuntu-configuration.patch	2013-06-10 18:48:25 +0000
@@ -0,0 +1,47 @@
+diff -Naurp heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-api-cfn.conf heat-2013.2.a50.g9f40fa3/etc/heat/heat-api-cfn.conf
+--- heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-api-cfn.conf	2013-06-10 09:46:38.000000000 -0500
++++ heat-2013.2.a50.g9f40fa3/etc/heat/heat-api-cfn.conf	2013-06-10 11:59:55.777608447 -0500
+@@ -27,7 +27,7 @@ use_syslog = False
+ # Facility to use. If unset defaults to LOG_USER.
+ # syslog_log_facility = LOG_LOCAL0
+ 
+-rpc_backend=heat.openstack.common.rpc.impl_qpid
++rpc_backend=heat.openstack.common.rpc.impl_kombu
+ 
+ [keystone_authtoken]
+ auth_host = 127.0.0.1
+diff -Naurp heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-api-cloudwatch.conf heat-2013.2.a50.g9f40fa3/etc/heat/heat-api-cloudwatch.conf
+--- heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-api-cloudwatch.conf	2013-06-10 09:46:38.000000000 -0500
++++ heat-2013.2.a50.g9f40fa3/etc/heat/heat-api-cloudwatch.conf	2013-06-10 11:59:45.053608191 -0500
+@@ -25,7 +25,7 @@ bind_host = 0.0.0.0
+ # Port the bind the server to
+ bind_port = 8003
+ 
+-rpc_backend=heat.openstack.common.rpc.impl_qpid
++rpc_backend=heat.openstack.common.rpc.impl_kombu
+ 
+ [keystone_authtoken]
+ auth_host = 127.0.0.1
+diff -Naurp heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-api.conf heat-2013.2.a50.g9f40fa3/etc/heat/heat-api.conf
+--- heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-api.conf	2013-06-10 09:46:38.000000000 -0500
++++ heat-2013.2.a50.g9f40fa3/etc/heat/heat-api.conf	2013-06-10 12:00:03.989608643 -0500
+@@ -25,7 +25,7 @@ bind_host = 0.0.0.0
+ # Port the bind the server to
+ bind_port = 8004
+ 
+-rpc_backend=heat.openstack.common.rpc.impl_qpid
++rpc_backend=heat.openstack.common.rpc.impl_kombu
+ 
+ 
+ 
+diff -Naurp heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-engine.conf heat-2013.2.a50.g9f40fa3/etc/heat/heat-engine.conf
+--- heat-2013.2.a50.g9f40fa3.orig/etc/heat/heat-engine.conf	2013-06-10 09:46:38.000000000 -0500
++++ heat-2013.2.a50.g9f40fa3/etc/heat/heat-engine.conf	2013-06-10 11:59:26.749607755 -0500
+@@ -67,6 +67,6 @@ sql_connection = mysql://heat:heat@local
+ 
+ db_backend=heat.db.sqlalchemy.api
+ 
+-rpc_backend=heat.openstack.common.rpc.impl_qpid
++rpc_backend=heat.openstack.common.rpc.impl_kombu
+ 
+ auth_encryption_key=%ENCRYPTION_KEY%
 
=== removed file 'debian/patches/removes-lxml-version-limitation-from-pip-requires.patch'
--- debian/patches/removes-lxml-version-limitation-from-pip-requires.patch	2013-05-29 17:36:41 +0000
+++ debian/patches/removes-lxml-version-limitation-from-pip-requires.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Description: Removes <= 2.3.5 from lxml pip-requires
- Warn upstream on IRC about this, they said it's no problem to remove the
- version thing, and they will remove it upstream.
-Author: Thomas Goirand <[e-mail]>
-Forwarded: no
-Last-Update: 2013-05-16
-
---- heat-2013.1.orig/tools/pip-requires
-+++ heat-2013.1/tools/pip-requires
-@@ -17,7 +17,7 @@ httplib2
- iso8601>=0.1.4
- kombu>=1.0.4
- argparse
--lxml>=2.3,<=2.3.5
-+lxml>=2.3
- sqlalchemy-migrate>=0.7.2
- python-novaclient
- PasteDeploy==1.5.0
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-29 17:36:41 +0000
+++ debian/patches/series	2013-06-10 18:48:25 +0000
@@ -1,2 +1,1 @@
-removes-lxml-version-limitation-from-pip-requires.patch
-fix-package-version-detection-when-building-doc.patch
+fix-ubuntu-configuration.patch
 
=== added file 'debian/pydist-overrides'
--- debian/pydist-overrides	1970-01-01 00:00:00 +0000
+++ debian/pydist-overrides	2013-06-10 18:48:25 +0000
@@ -0,0 +1,1 @@
+argparse
 
=== modified file 'debian/rules'
--- debian/rules	2013-05-29 17:36:41 +0000
+++ debian/rules	2013-06-10 18:48:25 +0000
@@ -2,16 +2,12 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/openstack-pkg-tools/pkgos.make
-
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 %:
 	dh $@  --with python2
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -u
+	testr init && testr run
 endif
 
 
@@ -20,38 +16,13 @@
 	rm -rf heat.egg-info
 	rm -rf doc/build
 	find . -iname '*.pyc' -delete
-	rm -f \
-		debian/heat-api-cfn.config \
-		debian/heat-api-cfn.postinst \
-		debian/heat-api-cloudwatch.config \
-		debian/heat-api-cloudwatch.postinst \
-		debian/heat-api.config \
-		debian/heat-api.postinst \
-		debian/heat-common.postinst \
-		debian/heat-engine.config \
-		debian/heat-engine.postinst
 
 override_dh_install:
 	dh_install
-	sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-engine/usr/share/heat-engine/heat-engine.conf
-	sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api-cloudwatch/etc/heat/heat-api-cloudwatch.conf
-	sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api-cfn/etc/heat/heat-api-cfn.conf
-	sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api/etc/heat/heat-api.conf
 
 override_dh_auto_build:
 	dh_auto_build
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.postinst
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cfn.config
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cfn.postinst
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cloudwatch.config
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cloudwatch.postinst
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api.config
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api.postinst
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.postinst
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-engine.config
-	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-engine.postinst
+	python setup.py build_sphinx
 
 override_dh_installman:
-	python setup.py build
-	make -C doc man
-	dh_installman
+	python setup.py build_sphinx
 
=== modified file 'debian/watch'
--- debian/watch	2013-05-29 17:36:41 +0000
+++ debian/watch	2013-06-10 18:48:25 +0000
@@ -1,2 +1,4 @@
 version=3
-https://github.com/openstack/heat/tags .*/(\d[\d\.]+)\.tar\.gz
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/heat/+download https://launchpad.net/heat/.*/.*/.*/heat-(.*)\.tar\.gz
+