Ubuntu

Merge lp:~ubuntu-branches/ubuntu/oneiric/base-files/oneiric-201105041859 into lp:ubuntu/oneiric/base-files

Proposed by James Westby on 2011-05-04
Status: Merged
Merged at revision: 75
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/base-files/oneiric-201105041859
Merge into: lp:ubuntu/oneiric/base-files
Diff against target: 125 lines (+44/-6) 4 files modified (has conflicts)
Text conflict in debian/changelog
Text conflict in debian/postinst.in
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/base-files/oneiric-201105041859
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-05-04 Pending
Review via email: mp+59981@code.launchpad.net

Description of the Change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/base-files now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/base-files/oneiric-201105041859. A merge should be performed if necessary.

To post a comment you must log in.
James Westby (james-w) wrote :

Hi,

It appears as though Scott had changes that were staged in bzr and not uploaded,
and they weren't part of the next upload.

Thanks,

James

Colin Watson (cjwatson) wrote :

Indeed - i.e. real merge required.

Scott Moser (smoser) wrote :

Well, Scott's changes can fairly easily be re-applied to current oneiric. His changelog entries describe the conflicting changes.
http://paste.ubuntu.com/628527/

Barry Warsaw (barry) wrote :

I'll sponsor the patch, but I do get one warning when I install the resulting .deb:

(Reading database ... 298323 files and directories currently installed.)
Preparing to replace base-files 6.3ubuntu2 (using base-files_6.3ubuntu3_amd64.deb) ...
Unpacking replacement base-files ...
dpkg: warning: unable to delete old directory '/var/lock': Device or resource busy
Setting up base-files (6.3ubuntu3) ...
Processing triggers for man-db ...
Processing triggers for install-info ...

Preview Diff

1=== modified file 'debian/1777-dirs'
2--- debian/1777-dirs 2002-02-08 16:36:54 +0000
3+++ debian/1777-dirs 2011-05-04 19:04:14 +0000
4@@ -1,3 +1,2 @@
5 tmp
6-var/lock
7 var/tmp
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2011-05-04 10:31:43 +0000
11+++ debian/changelog 2011-05-04 19:04:14 +0000
12@@ -1,3 +1,4 @@
13+<<<<<<< TREE
14 base-files (6.3ubuntu1) oneiric; urgency=low
15
16 * Merge with Debian; remaining changes:
17@@ -160,6 +161,17 @@
18 -- Santiago Vila <sanvila@debian.org> Sun, 31 Jan 2010 13:16:14 +0100
19
20 base-files (5.0.0ubuntu29) oneiric; urgency=low
21+=======
22+base-files (5.0.0ubuntu30) UNRELEASED; urgency=low
23+
24+ * debian/1777-dirs: remove /var/lock (replaced by /run/lock on tmpfs)
25+ * debian/directory-list: remove /var/run and /var/lock, add /run
26+ * debian/postinst.in: replace references to /var/run with /run
27+
28+ -- Scott James Remnant <scott@netsplit.com> Tue, 03 May 2011 14:33:55 -0700
29+
30+base-files (5.0.0ubuntu29) natty; urgency=low
31+>>>>>>> MERGE-SOURCE
32
33 * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Oneiric!
34
35
36=== modified file 'debian/directory-list'
37--- debian/directory-list 2011-05-04 10:31:43 +0000
38+++ debian/directory-list 2011-05-04 19:04:14 +0000
39@@ -12,6 +12,7 @@
40 mnt
41 proc
42 root
43+run
44 sbin
45 tmp
46 usr
47@@ -34,8 +35,6 @@
48 var/lib/dpkg
49 var/lib/misc
50 var/local
51-var/lock
52 var/log
53-var/run
54 var/spool
55 var/tmp
56
57=== modified file 'debian/postinst.in'
58--- debian/postinst.in 2011-05-04 10:31:43 +0000
59+++ debian/postinst.in 2011-05-04 19:04:14 +0000
60@@ -67,6 +67,7 @@
61 echo -n>/var/log/lastlog
62 fi
63 chown root:utmp /var/log/wtmp /var/log/btmp /var/log/lastlog
64+<<<<<<< TREE
65 chmod 664 /var/log/wtmp /var/log/lastlog
66 chmod 660 /var/log/btmp
67 if [ ! -f /var/run/utmp ]; then
68@@ -75,6 +76,33 @@
69 chown root:utmp /var/run/utmp
70 chmod 664 /var/run/utmp
71 fi
72+=======
73+ chmod 664 /var/log/wtmp /var/log/btmp /var/log/lastlog
74+fi
75+
76+if [ "$1" = "configure" ] && [ "$2" != "" ]; then
77+ if [ ! -d /var/spool/mail ] && [ ! -L /var/spool/mail ]; then
78+ if [ -f /etc/base-files.mailsymlink ]; then
79+ ln -sf `cat /etc/base-files.mailsymlink` /var/spool/mail
80+ else
81+ install_directory var/spool/mail 2775 mail
82+ fi
83+ fi
84+ if [ ! -L /var/mail ] && [ ! -d /var/mail ]; then
85+ ln -sf spool/mail /var/mail
86+ fi
87+fi
88+
89+preserve_directory floppy
90+preserve_directory cdrom
91+preserve_directory initrd
92+
93+if [ ! -f /run/utmp ]; then
94+ echo -n>/run/utmp
95+fi
96+chown root:utmp /run/utmp
97+chmod 664 /run/utmp
98+>>>>>>> MERGE-SOURCE
99
100 if [ ! -d /var/lib/dpkg ]; then
101 mkdir -m 755 -p /var/lib/dpkg
102@@ -93,12 +121,12 @@
103 fi
104
105 # Establish a fresh MOTD on package upgrade, ensures that the symlink is not broken
106-[ -d "/etc/update-motd.d" ] && run-parts --lsbsysinit /etc/update-motd.d > /var/run/motd || true
107+[ -d "/etc/update-motd.d" ] && run-parts --lsbsysinit /etc/update-motd.d > /run/motd || true
108
109 if dpkg --compare-versions "$2" lt 5.0.0ubuntu17 && [ ! -e "/etc/motd" ]; then
110 # Create symlink on installation (or versioned upgrade);
111 # thereafter, the admin is free to modify accordingly
112- ln -sf /var/run/motd /etc/motd
113+ ln -sf /run/motd /etc/motd
114 fi
115
116 if [ "$1" = "configure" ] && [ "$2" != "" ]; then
117@@ -109,7 +137,7 @@
118 # text to the pam_motd dynamically generated motd
119 mv -f /etc/motd.tail /etc/motd.tail.old
120 # Clear out old MOTD, will be regenerated on next login
121- rm -f /var/run/motd
122+ rm -f /run/motd
123 fi
124 fi
125 # If we're upgrading base-files, remove the upgrade-available flag

Subscribers

People subscribed via source and target branches

to all changes: