Merge lp:~laney/ubuntu-wallpapers/ubuntu-wallpapers-extra-transitional into lp:ubuntu-wallpapers

[Iain Lane]

Add a transitional package to properly fix the attached bug.

[lp:~laney/ubuntu-wallpapers/ubuntu-wallpapers-extra-transitional]

86. By Iain Lane on 2012-04-07

Put ubuntu-wallpapers (the package) in Section: metapackages as
dependencies of packages in this section are considered "manual" by apt
and therefore will not be removed on upgrades. This means that users
will keep wallpapers from old releases when upgrading. Thanks to James
Westby for pointing this out to me. (LP: #863509)

[Iain Lane (laney)]

I pushed another commit to hopefully fix bug #863509 by using the fact that "metapackages" is in apt's Never-MarkAuto-Sections.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-05 17:20:30 +0000
+++ debian/changelog	2012-04-07 23:12:18 +0000
@@ -1,9 +1,21 @@
 ubuntu-wallpapers (0.34.1) UNRELEASED; urgency=low
 
+  [ Ken VanDine ]
   * debian/control
     - dropped build depends for xsltproc
 
- -- Ken VanDine <[e-mail]>  Thu, 05 Apr 2012 13:19:36 -0400
+  [ Iain Lane ]
+  * debian/control
+    - Provide transitional package for ubuntu-wallpapers-extra, an old package
+      which was providing the Karmic wallpapers and thus shared files with
+      ubuntu-wallpapers-karmic. (LP: #975778)
+     - Put ubuntu-wallpapers (the package) in Section: metapackages as
+       dependencies of packages in this section are considered "manual" by apt
+       and therefore will not be removed on upgrades. This means that users
+       will keep wallpapers from old releases when upgrading. Thanks to James
+       Westby for pointing this out to me. (LP: #863509)
+
+ -- Iain Lane <[e-mail]>  Sat, 07 Apr 2012 21:36:50 +0100
 
 ubuntu-wallpapers (0.34.0) precise; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2012-04-05 17:20:30 +0000
+++ debian/control	2012-04-07 23:12:18 +0000
@@ -9,6 +9,7 @@
 
 Package: ubuntu-wallpapers
 Architecture: all
+Section: metapackages
 Depends: ${misc:Depends},
          ubuntu-wallpapers-precise
 Suggests: ubuntu-wallpapers-oneiric,
@@ -21,13 +22,21 @@
  other default wallpapers for the current Ubuntu release.
 
 Package: ubuntu-wallpapers-karmic
-Conflicts: ubuntu-wallpapers (<< 0.34.0)
-Replaces: ubuntu-wallpapers (<< 0.34.0)
+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
+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)