Merge lp:~james-w/unattended-upgrades/karmic into lp:~ubuntu-core-dev/unattended-upgrades/ubuntu

[James Westby]

[James Westby (james-w)]

Update for Karmic, and revert the accidental sync of the package.

Thanks,

James

Unmerged revisions

86. By James Westby on 2009-05-03

Update for karmic.

* Override mistaken sync from Debian. (LP: #371222)
* Do the work under binary-indep in debian/rules as the package is
  not architecture specific. Thanks Lintian.

=== modified file 'data/50unattended-upgrades'
--- data/50unattended-upgrades	2008-11-26 09:48:12 +0000
+++ data/50unattended-upgrades	2009-05-03 14:04:45 +0000
@@ -1,7 +1,7 @@
 // Automatically upgrade packages from these (origin, archive) pairs
 Unattended-Upgrade::Allowed-Origins {
-	"Ubuntu jaunty-security";
-//	"Ubuntu jaunty-updates";
+	"Ubuntu karmic-security";
+//	"Ubuntu karmic-updates";
 };
 
 // List of packages to not update

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-02 09:51:37 +0000
+++ debian/changelog	2009-05-03 14:04:45 +0000
@@ -1,3 +1,12 @@
+unattended-upgrades (0.40) jaunty; urgency=low
+
+  * Update for karmic.
+  * Override mistaken sync from Debian. (LP: #371222)
+  * Do the work under binary-indep in debian/rules as the package is
+    not architecture specific. Thanks Lintian.
+
+ -- James Westby <[e-mail]>  Sun, 03 May 2009 14:50:06 +0100
+
 unattended-upgrades (0.39) jaunty; urgency=low
 
   * debian/po/fr.po:

=== modified file 'debian/rules'
--- debian/rules	2009-03-02 09:40:16 +0000
+++ debian/rules	2009-05-03 14:04:45 +0000
@@ -62,12 +62,12 @@
 	./setup.py install --prefix=$(CURDIR)/debian/$(PKG)/usr --install-layout=deb
 
 
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs