Merge lp:~vorlon/ubuntu/precise/eglibc/obsolete-conffile into lp:ubuntu/precise/eglibc

Proposed by Steve Langasek on 2012-04-09
Status: Merged
Merged at revision: 277
Proposed branch: lp:~vorlon/ubuntu/precise/eglibc/obsolete-conffile
Merge into: lp:ubuntu/precise/eglibc
Diff against target: 41 lines (+8/-1)
3 files modified
debian/changelog (+4/-0)
debian/control.in/libc (+1/-1)
debian/debhelper.in/libc.preinst (+3/-0)
To merge this branch: bzr merge lp:~vorlon/ubuntu/precise/eglibc/obsolete-conffile
Reviewer Review Type Date Requested Status
Adam Conrad 2012-04-09 Pending
Review via email: mp+101264@code.launchpad.net

Description of the change

Adam, can you double-check that this looks sane to you for handling conffile
removal on upgrades? We don't want to leave stale conffiles on the system,
but we also don't want to do anything here that might break the upgrade.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-24 08:51:13 +0000
3+++ debian/changelog 2012-04-09 18:16:19 +0000
4@@ -12,6 +12,10 @@
5 depending on the no-longer-existent /lib/init/readlink.
6 * Drop obsolete gdm upgrade handling code that only applies for upgrades
7 from hardy to lucid.
8+ * Remove the /etc/ld.so.conf.d/i486-linux-gnu.conf conffile on upgrade on
9+ i386, since it's no longer shipped and we should give consistent results
10+ on upgrade and install; and add a Breaks on the three library packages
11+ in lucid that used this path.
12
13 -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 24 Mar 2012 00:47:58 -0700
14
15
16=== modified file 'debian/control.in/libc'
17--- debian/control.in/libc 2012-01-11 15:01:07 +0000
18+++ debian/control.in/libc 2012-04-09 18:16:19 +0000
19@@ -16,7 +16,7 @@
20 libc6-ppc64 [ppc64],
21 libc6-s390x [s390x],
22 libc6-sparc64 [sparc64]
23-Breaks: nscd (<< 2.15)
24+Breaks: nscd (<< 2.15), liblouis0 (<< 2.3.0-2) [i386], liblouisxml1 (<< 2.4.0-2) [i386], libhwloc0 [i386]
25 Description: Embedded GNU C Library: Shared libraries
26 Contains the standard libraries that are used by nearly all programs on
27 the system. This package includes shared versions of the standard C library
28
29=== modified file 'debian/debhelper.in/libc.preinst'
30--- debian/debhelper.in/libc.preinst 2012-03-25 19:05:21 +0000
31+++ debian/debhelper.in/libc.preinst 2012-04-09 18:16:19 +0000
32@@ -150,6 +150,9 @@
33 rm_conffile LIBC "/etc/init.d/glibc.sh"
34 update-rc.d glibc.sh remove >/dev/null
35 fi
36+ if dpkg --compare-versions "$preversion" lt "2.15-0ubuntu7"; then
37+ rm_conffile LIBC "/etc/ld.so.conf.d/i486-linux-gnu.conf"
38+ fi
39
40 # Load debconf module if available
41 if [ -f /usr/share/debconf/confmodule ] ; then

Subscribers

People subscribed via source and target branches