Merge lp:~ari-tczew/gnome-codec-install/ubuntu into lp:~ubuntu-desktop/gnome-codec-install/ubuntu

[Artur Rona]

[Daniel Holbach (dholbach)]

I'll remove "Switch from cdbs to dh7. (Closes: #630005)" from the changelog entry, as it was done in Debian too.

Apart from that: good work.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-20 08:07:59 +0000
+++ debian/changelog	2015-03-11 23:06:58 +0000
@@ -1,9 +1,55 @@
-gnome-codec-install (0.4.7ubuntu5) UNRELEASEDoneiric; urgency=low
+gnome-codec-install (0.4.7+nmu2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control, debian/rules:
+      + Switch from cdbs to dh7. (Closes: #630005)
+    - debian/control:
+      + Depends on python-defer.
+    - GnomeCodecInstall/MainWindow.py:
+      + Add codec install warning dialog.
+      + Prefer native packages over foreign ones on a multiarch system.
+    - GnomeCodecInstall/PackageWorker.py:
+      + Import defer instead of aptdaemon.defer.
+      + Add missing argument for commit_package().
+
+ -- Artur Rona <[e-mail]>  Wed, 11 Mar 2015 23:48:17 +0100
+
+gnome-codec-install (0.4.7+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Convert to dh_python2 (Closes: #616829).
+
+ -- Luca Falavigna <[e-mail]>  Tue, 28 May 2013 09:35:04 +0200
+
+gnome-codec-install (0.4.7+nmu1ubuntu3) precise; urgency=low
+
+  * Rebuild to drop python2.6 dependencies.
+
+ -- Matthias Klose <[e-mail]>  Sat, 31 Dec 2011 02:03:14 +0000
+
+gnome-codec-install (0.4.7+nmu1ubuntu2) oneiric; urgency=low
 
   * GnomeCodecInstall/MainWindow.py:
     - prefer native packages over foreign ones on a multiarch system
-
- -- Michael Vogt <[e-mail]>  Tue, 20 Sep 2011 10:04:58 +0200
+      (LP: #851481)
+
+ -- Michael Vogt <[e-mail]>  Tue, 20 Sep 2011 10:22:38 +0200
+
+gnome-codec-install (0.4.7+nmu1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - switch to dh_python2
+    - Add codec install warning dialog
+
+ -- Michael Vogt <[e-mail]>  Fri, 17 Jun 2011 11:03:15 +0200
+
+gnome-codec-install (0.4.7+nmu1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Do not use functions from aptdaemon if aptdaemon is not
+    installed (Closes: #589580)
+
+ -- Julian Andres Klode <[e-mail]>  Sun, 30 Jan 2011 17:35:13 +0100
 
 gnome-codec-install (0.4.7ubuntu4) oneiric; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-06-10 08:23:41 +0000
+++ debian/control	2015-03-11 23:06:58 +0000
@@ -1,14 +1,13 @@
 Source: gnome-codec-install
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Sebastian Dröge <[e-mail]>
 Uploaders: Maintainers of GStreamer packages <[e-mail]>
 Build-Depends: debhelper (>= 7),
                gettext,
                intltool,
-               python,
-               python-dev  (>= 2.6.6-3~),
+               python (>= 2.6.6-3~),
                python-distutils-extra (>= 1.91),
                python-setuptools
 Standards-Version: 3.8.4

=== modified file 'debian/rules'
--- debian/rules	2011-06-10 08:23:41 +0000
+++ debian/rules	2015-03-11 23:06:58 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+DEB_PYTHON2_MODULE_PACKAGES=gnome-codec-install
 
 %:
 	dh $@ --with python2