Merged with invirtibuilder fixes

diff --git a/build-hooks/post-build b/build-hooks/post-build
index 0acaefb..b9f1430 100755 (executable)
--- a/build-hooks/post-build
+++ b/build-hooks/post-build
@@ -195,7 +195,7 @@ def main():
             parser.print_help()
             return 1
         database.connect()
-        build = database.Build.query().get(args[0])
+        build = database.Build.query.get(args[0])
         short_commit = builder.canonicalize_commit(build.package, build.commit, shorten=True)
         values = { 'build_id' : build.build_id,
                    'commit' : build.commit,

diff --git a/debian/changelog b/debian/changelog
index 5616940..1528521 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+invirt-dev (0.1.27) unstable; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 03:40:11 -0400
+
+invirt-dev (0.1.26~glasgall7) precise; urgency=low
+
+  * Actually invoke sbuild correctly. Oops.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 18 Apr 2013 23:21:47 -0400
+
+invirt-dev (0.1.26~glasgall6) precise; urgency=low
+
+  * Specify a maintainer when building packages (sbuild behavior changed)
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 18 Apr 2013 22:19:51 -0400
+
+invirt-dev (0.1.26~glasgall5) precise; urgency=low
+
+  * more API updates
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 18 Apr 2013 18:42:55 -0400
+
+invirt-dev (0.1.26~glasgall4) precise; urgency=low
+
+  * Replace calls to session.save_or_update with session.add (removal of
+    deprecated API use)
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 18 Apr 2013 18:32:24 -0400
+
+invirt-dev (0.1.26~glasgall3ubuntu1) precise; urgency=low
+
+  * Change Depends on emacs21 to emacs, now that emacs22 and up are a thing.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 16 Apr 2013 21:51:40 -0400
+
+invirt-dev (0.1.26~glasgall3) precise; urgency=low
+
+  * Port packaging to dh_python2
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 16 Apr 2013 21:46:24 -0400
+
 invirt-dev (0.1.26) unstable; urgency=low
 
   * invirtibuilder creates missing pocket branches in super-repository

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index 8401a8b..fb13f93 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: invirt-dev
 Section: servers
 Priority: important
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), python-all-dev, python-support, python-setuptools, python-debian, python-apt
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>=2.6.6-3), python-setuptools, python-debian, python-apt
+Standards-Version: 3.9.3
 
 Package: invirt-dev
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg-dev-el, emacs21, reprepro, apache2, postfix, screen, dh-make, fakeroot, quilt, patchutils, config-package-dev, sbuild, equivs, invirt-base, invirt-database, remctl-server, update-inetd, openbsd-inetd | inet-superserver, python-pyinotify, python-debian, git-core (>= 1:1.6.4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg-dev-el, emacs, reprepro, apache2, postfix, screen, dh-make, fakeroot, quilt, patchutils, config-package-dev, sbuild, equivs, invirt-base, invirt-database, remctl-server, update-inetd, openbsd-inetd | inet-superserver, python-pyinotify, python-debian, git-core (>= 1:1.6.4)
 Description: Invirt build and apt server
  This packages the build scripts and apt-repository configuration for Invirt.

diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644 (file)
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-

diff --git a/debian/rules b/debian/rules
index 7f3b99b..09190f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM=pysupport
+%:
+       dh $@ --with python2
 
 # We use --no-start instead of letting dh_installinit do its thing
 # because, in the postinst, dh_installinit's automatically added code
@@ -8,10 +8,5 @@ DEB_PYTHON_SYSTEM=pysupport
 #
 # This means that when the initscript is started, Python modules
 # installed by the package haven't been fully installed yet.
-DEB_DH_INSTALLINIT_ARGS += --no-start --name invirtibuilder
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-clean::
-       rm -rf python/invirt.builder.egg-info
+override_dh_installinit:
+       dh_installinit --no-start --name invirtibuilder

diff --git a/invirtibuilder b/invirtibuilder
index eac57f3..598820c 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -133,12 +133,13 @@ def sbuild(package, ref, distro, arch, workdir, arch_all=False):
     nmutag = b.distroToSuffix(distro)
     env = os.environ.copy()
     env['NMUTAG'] = nmutag
-
+    maintainer = "Invirt Autobuilder <%s>" % (config.contact,)
     # Run sbuild with a hack in place to append arbitrary versions
     args = ['perl', '-I/usr/share/invirt-dev', '-MSbuildHack',
             '/usr/bin/sbuild',
             '--binNMU=171717', '--make-binNMU=Build with sbuild',
-            '-v', '-d', distro, '--arch', arch]
+            '-v', '-d', distro, '-m', maintainer, 
+            '--arch', arch]
     if arch_all:
         args.append('-A')
     args.append(getDscName(package, ref))
@@ -354,7 +355,7 @@ def build():
         db.pocket = pocket
         db.commit = commit
         db.principal = principal
-        database.session.save_or_update(db)
+        database.session.add(db)
         database.session.commit()
 
         database.session.begin()
@@ -443,7 +444,7 @@ def build():
             if logfile is not None:
                 logfile.close()
 
-            database.session.save_or_update(db)
+            database.session.add(db)
             database.session.commit()
 
             # Finally, now that everything is done, remove the