Merge lp:~didrocks/ubuntu-wallpapers/new-pkg into lp:ubuntu-wallpapers

[Didier Roche]

Prepare for daily landing

Prepare for daily landing

[lp:~didrocks/ubuntu-wallpapers/new-pkg]

95. By Didier Roche on 2012-12-10

Move it to split mode

[Mathieu Trudel-Lapierre (cyphermox)]

Ack.

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2012-12-10 14:31:20 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-11 13:25:35 +0000
+++ debian/changelog	2012-12-10 14:31:20 +0000
@@ -1,3 +1,13 @@
+ubuntu-wallpapers (0.35.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control, debian/compat, debian/rules:
+    - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
+    - Sanitize the build-deps order and remove all unsupported transitions
+    - transition from cdbs to dh9
+  * Move it to split mode
+
+ -- Didier Roche <[e-mail]>  Mon, 10 Dec 2012 15:15:03 +0100
+
 ubuntu-wallpapers (0.35.2) quantal; urgency=low
 
   * Update default 12.10 wallpaper (LP: #1048976)

=== modified file 'debian/compat'
--- debian/compat	2012-02-28 14:39:26 +0000
+++ debian/compat	2012-12-10 14:31:20 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2012-08-30 20:52:40 +0000
+++ debian/control	2012-12-10 14:31:20 +0000
@@ -2,10 +2,15 @@
 Section: x11
 Priority: optional
 Maintainer: Ubuntu Artwork Team <[e-mail]>
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-wallpapers/ubuntu
-Build-Depends: debhelper (>= 8), cdbs (>= 0.4.90~), python (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9),
+               python (>= 2.6.6-3~),
 Build-Depends-Indep: python-distutils-extra
 Standards-Version: 3.9.3
+# If you aren't a member of ~ubuntu-art-pkg but need to upload
+# packaging changes, just go ahead. ~ubuntu-art-pkg will notice
+# and sync up the code again.
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-wallpapers/ubuntu
+Vcs-Browser: https://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-wallpapers/ubuntu/files
 
 Package: ubuntu-wallpapers
 Architecture: all
@@ -23,65 +28,42 @@
  other default wallpapers for the current Ubuntu release.
 
 Package: ubuntu-wallpapers-karmic
-Conflicts: ubuntu-wallpapers (<< 0.34.0), ubuntu-wallpapers-extra (<< 0.34.1~)
-Replaces: ubuntu-wallpapers (<< 0.34.0), ubuntu-wallpapers-extra (<< 0.34.1~)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 9.10 Wallpapers
  Wallpapers from the Ubuntu 9.10 community contest
 
-Package: ubuntu-wallpapers-extra
-Depends: ubuntu-wallpapers-karmic, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Priority: extra
-Description: transitional dummy package for ubuntu-wallpapers-karmic
- This package is a transitional package to facilitate upgrades from
- ubuntu-wallpapers-extra to ubuntu-wallpapers-karmic. It can be safely removed.
-
 Package: ubuntu-wallpapers-lucid
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 10.04 Wallpapers
  Wallpapers from the Ubuntu 10.04 community contest
 
 Package: ubuntu-wallpapers-maverick
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 10.10 Wallpapers
  Wallpapers from the Ubuntu 10.10 community contest
 
 Package: ubuntu-wallpapers-natty
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 11.04 Wallpapers
  Wallpapers from the Ubuntu 11.04 community contest
 
 Package: ubuntu-wallpapers-oneiric
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 11.10 Wallpapers
  Wallpapers from the Ubuntu 11.10 community contest
 
 Package: ubuntu-wallpapers-precise
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 12.04 Wallpapers
  Wallpapers from the Ubuntu 12.04 community contest
 
 Package: ubuntu-wallpapers-quantal
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Ubuntu 12.10 Wallpapers

=== modified file 'debian/rules'
--- debian/rules	2012-04-05 15:12:07 +0000
+++ debian/rules	2012-12-10 14:31:20 +0000
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON2_MODULE_PACKAGES := ubuntu-wallpapers
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-install/ubuntu-wallpapers::
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ --with python2 --parallel
+
+override_dh_install:
 	rm -r debian/tmp/usr/lib/python*
+	dh_install --fail-missing
+
+#install/ubuntu-wallpapers::
+#	rm -r debian/tmp/usr/lib/python*