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

Proposed by Iain Lane on 2012-04-07
Status: Merged
Merged at revision: 85
Proposed branch: lp:~laney/ubuntu-wallpapers/ubuntu-wallpapers-extra-transitional
Merge into: lp:ubuntu-wallpapers
Diff against target: 62 lines (+24/-3)
2 files modified
debian/changelog (+13/-1)
debian/control (+11/-2)
To merge this branch: bzr merge lp:~laney/ubuntu-wallpapers/ubuntu-wallpapers-extra-transitional
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers 2012-04-07 Pending
Review via email: mp+101190@code.launchpad.net

Description of the Change

Add a transitional package to properly fix the attached bug.

To post a comment you must log in.
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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ubuntu-wallpapers (0.34.1) UNRELEASED; urgency=low1ubuntu-wallpapers (0.34.1) UNRELEASED; urgency=low
22
3 [ Ken VanDine ]
3 * debian/control4 * debian/control
4 - dropped build depends for xsltproc5 - dropped build depends for xsltproc
56
6 -- Ken VanDine <ken.vandine@canonical.com> Thu, 05 Apr 2012 13:19:36 -04007 [ Iain Lane ]
8 * debian/control
9 - Provide transitional package for ubuntu-wallpapers-extra, an old package
10 which was providing the Karmic wallpapers and thus shared files with
11 ubuntu-wallpapers-karmic. (LP: #975778)
12 - Put ubuntu-wallpapers (the package) in Section: metapackages as
13 dependencies of packages in this section are considered "manual" by apt
14 and therefore will not be removed on upgrades. This means that users
15 will keep wallpapers from old releases when upgrading. Thanks to James
16 Westby for pointing this out to me. (LP: #863509)
17
18 -- Iain Lane <laney@ubuntu.com> Sat, 07 Apr 2012 21:36:50 +0100
719
8ubuntu-wallpapers (0.34.0) precise; urgency=low20ubuntu-wallpapers (0.34.0) precise; urgency=low
921
1022
=== 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 @@
99
10Package: ubuntu-wallpapers10Package: ubuntu-wallpapers
11Architecture: all11Architecture: all
12Section: metapackages
12Depends: ${misc:Depends},13Depends: ${misc:Depends},
13 ubuntu-wallpapers-precise14 ubuntu-wallpapers-precise
14Suggests: ubuntu-wallpapers-oneiric,15Suggests: ubuntu-wallpapers-oneiric,
@@ -21,13 +22,21 @@
21 other default wallpapers for the current Ubuntu release.22 other default wallpapers for the current Ubuntu release.
2223
23Package: ubuntu-wallpapers-karmic24Package: ubuntu-wallpapers-karmic
24Conflicts: ubuntu-wallpapers (<< 0.34.0)25Conflicts: ubuntu-wallpapers (<< 0.34.0), ubuntu-wallpapers-extra (<< 0.34.1~)
25Replaces: ubuntu-wallpapers (<< 0.34.0)26Replaces: ubuntu-wallpapers (<< 0.34.0), ubuntu-wallpapers-extra (<< 0.34.1~)
26Architecture: all27Architecture: all
27Depends: ${misc:Depends}28Depends: ${misc:Depends}
28Description: Ubuntu 9.10 Wallpapers29Description: Ubuntu 9.10 Wallpapers
29 Wallpapers from the Ubuntu 9.10 community contest30 Wallpapers from the Ubuntu 9.10 community contest
3031
32Package: ubuntu-wallpapers-extra
33Depends: ubuntu-wallpapers-karmic, ${misc:Depends}
34Architecture: all
35Section: oldlibs
36Description: transitional dummy package for ubuntu-wallpapers-karmic
37 This package is a transitional package to facilitate upgrades from
38 ubuntu-wallpapers-extra to ubuntu-wallpapers-karmic. It can be safely removed.
39
31Package: ubuntu-wallpapers-lucid40Package: ubuntu-wallpapers-lucid
32Conflicts: ubuntu-wallpapers (<< 0.34.0)41Conflicts: ubuntu-wallpapers (<< 0.34.0)
33Replaces: ubuntu-wallpapers (<< 0.34.0)42Replaces: ubuntu-wallpapers (<< 0.34.0)