Ubuntu
ubuntu-release-upgrader package

Merge lp:~ubuntu-branches/ubuntu/vivid/ubuntu-release-upgrader/vivid-proposed-201509301543 into lp:ubuntu/vivid-proposed/ubuntu-release-upgrader

  1. Vivid (15.04)
  2. vivid-proposed-201509301543
  3. Merge into vivid-proposed
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/vivid/ubuntu-release-upgrader/vivid-proposed-201509301543
Merge into: lp:ubuntu/vivid-proposed/ubuntu-release-upgrader
Diff against target: 514 lines (+492/-2) (has conflicts)
3 files modified
data/DistUpgrade.cfg.trusty (+132/-0)
debian/bzr-builddeb.conf (+0/-2)
utils/demoted.cfg.trusty (+360/-0)
Conflict adding file data/DistUpgrade.cfg.trusty.  Moved existing file to data/DistUpgrade.cfg.trusty.moved.
Conflict adding file data/demoted.cfg.trusty.  Moved existing file to data/demoted.cfg.trusty.moved.
Conflict adding file utils/demoted.cfg.trusty.  Moved existing file to utils/demoted.cfg.trusty.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/vivid/ubuntu-release-upgrader/vivid-proposed-201509301543
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+272934@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/vivid-proposed/ubuntu-release-upgrader reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/vivid/ubuntu-release-upgrader/vivid-proposed-201509301543. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

79. By Brian Murray

* Support upgrading from Trusty to Vivid directly since Utopic is End of
  Life. (LP: #1497024)
* DistUpgrade/build-tarball.sh: Copy the contents of demoted.cfg so it is
  not a broken symlink. (LP: #1498193)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'data/DistUpgrade.cfg.trusty'
--- data/DistUpgrade.cfg.trusty 1970-01-01 00:00:00 +0000
+++ data/DistUpgrade.cfg.trusty 2015-09-30 15:53:45 +0000
@@ -0,0 +1,132 @@
1[View]
2# the views will be tried in this order, if one fails to import, the next
3# is tried
4View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
5#View=DistUpgradeViewNonInteractive
6#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
7# the views below support upgrades over ssh connection
8SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
9
10# Distro contains global information about the upgrade
11[Distro]
12# the meta-pkgs we support
13MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
14 xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
15 kubuntu-netbook, lubuntu-core, lubuntu-desktop, ubuntu-gnome-desktop
16BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
17Demotions=demoted.cfg
18#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
19RemovalBlacklistFile=removal_blacklist.cfg
20# if those packages were installed, make sure to keep them installed
21KeepInstalledPkgs=xserver-xorg-video-all
22KeepInstalledSection=translations
23RemoveObsoletes=yes
24#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
25# hints for for stuff that should be done right after the cache calculated
26# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
27# quirks handling)
28#PostUpgradePurge=linux-restricted-modules-common
29#PostUpgradeRemove=xsettings-kde
30#PostUpgradeUpgrade=brasero,edubuntu-desktop
31#PostUpgradeInstall=apt
32PostInstallScripts=./xorg_fix_proprietary.py
33EnableApport=yes
34# this supported blacklisting certain versions to ensure we do not upgrade
35# - blcr-dkms fails to build on kernel 2.6.35
36#BadVersions=blcr-dkms_0.8.2-13
37# ubiquity slideshow
38#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
39
40[KernelRemoval]
41Version=3.13.0
42BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
43 linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools
44Types=386,ec2,generic,rt,server,virtual
45
46# information about the individual meta-pkgs
47[ubuntu-desktop]
48KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
49# those pkgs will be marked remove right after the distUpgrade in the cache
50PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
51ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
52
53[kubuntu-desktop]
54KeyDependencies=plasma-desktop, kubuntu-settings-desktop
55PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager
56# those packages are marked as obsolete right after the upgrade
57ForcedObsoletes=ivman, gtk-qt-engine
58# help the resolver a bit: LP: #1426132
59PostUpgradeInstall=baloo-kf5
60
61[kubuntu-netbook]
62KeyDependencies=plasma-netbook, kubuntu-settings-netbook
63
64[ubuntu-netbook]
65KeyDependencies=gdm, ubuntu-netbook-default-settings
66
67[xubuntu-core]
68KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
69PostUpgradeRemove=notification-daemon
70
71[xubuntu-desktop]
72KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
73PostUpgradeRemove=notification-daemon
74
75[ubuntustudio-desktop]
76KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
77
78[ichthux-desktop]
79KeyDependencies=ichthux-artwork, ichthux-default-settings
80
81[mythbuntu-desktop]
82KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
83
84[lubuntu-core]
85KeyDependencies=lubuntu-artwork, lubuntu-default-settings, openbox
86
87[lubuntu-desktop]
88KeyDependencies=lubuntu-core, lubuntu-default-settings
89
90[ubuntu-gnome-desktop]
91KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
92
93
94[Files]
95BackupExt=distUpgrade
96LogDir=/var/log/dist-upgrade/
97
98[Sources]
99From=trusty
100To=vivid
101ValidOrigin=Ubuntu
102ValidMirrors = mirrors.cfg
103Components=main,restricted,universe,multiverse
104Pockets=security,updates,proposed,backports
105;AllowThirdParty=False
106
107;[PreRequists]
108;Packages=release-upgrader-apt,release-upgrader-dpkg
109;SourcesList=prerequists-sources.list
110;SourcesList-ia64=prerequists-sources.ports.list
111;SourcesList-hppa=prerequists-sources.ports.list
112
113[Aufs]
114; this is a xor option, either full or chroot overlay
115;EnableFullOverlay=yes
116;EnableChrootOverlay=yes
117; sync changes from the chroot back to the real system
118;EnableChrootRsync=yes
119; what chroot dir to use
120;ChrootDir=/tmp/upgrade-chroot
121; the RW dir to use (either for full overlay or chroot overlay)
122;RWDir=/tmp/upgrade-rw
123
124[Network]
125MaxRetries=3
126
127[NonInteractive]
128ForceOverwrite=yes
129RealReboot=no
130DebugBrokenScripts=no
131DpkgProgressLog=no
132;TerminalTimeout=2400
0133
=== renamed file 'data/DistUpgrade.cfg.trusty' => 'data/DistUpgrade.cfg.trusty.moved'
=== added symlink 'data/demoted.cfg.trusty'
=== target is u'../utils/demoted.cfg.trusty'
=== renamed symlink 'data/demoted.cfg.trusty' => 'data/demoted.cfg.trusty.moved'
=== removed file 'debian/bzr-builddeb.conf'
--- debian/bzr-builddeb.conf 2012-06-25 12:10:31 +0000
+++ debian/bzr-builddeb.conf 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1[BUILDDEB]
2native = True
30
=== added file 'utils/demoted.cfg.trusty'
--- utils/demoted.cfg.trusty 1970-01-01 00:00:00 +0000
+++ utils/demoted.cfg.trusty 2015-09-30 15:53:45 +0000
@@ -0,0 +1,360 @@
1# demoted packages from trusty to vivid
2auth-client-config
3automake1.10
4automake1.4
5cgroup-lite
6chkrootkit
7cpp-4.8
8cpp-4.8-aarch64-linux-gnu
9cpp-4.8-arm-linux-gnueabihf
10cpp-4.8-doc
11cpp-4.8-powerpc-linux-gnu
12cpp-4.8-powerpc64le-linux-gnu
13dbus-cpp-dev-examples
14dh-linktree
15firefox-globalmenu
16friends
17friends-dispatcher
18friends-facebook
19friends-flickr
20friends-twitter
21g++-4.8
22g++-4.8-aarch64-linux-gnu
23g++-4.8-arm-linux-gnueabihf
24g++-4.8-multilib
25g++-4.8-multilib-arm-linux-gnueabihf
26g++-4.8-multilib-powerpc-linux-gnu
27g++-4.8-powerpc-linux-gnu
28g++-4.8-powerpc64le-linux-gnu
29gcc-4.8
30gcc-4.8-aarch64-linux-gnu
31gcc-4.8-aarch64-linux-gnu-base
32gcc-4.8-arm-linux-gnueabihf
33gcc-4.8-arm-linux-gnueabihf-base
34gcc-4.8-base
35gcc-4.8-doc
36gcc-4.8-multilib
37gcc-4.8-multilib-arm-linux-gnueabihf
38gcc-4.8-multilib-powerpc-linux-gnu
39gcc-4.8-plugin-dev
40gcc-4.8-powerpc-linux-gnu
41gcc-4.8-powerpc-linux-gnu-base
42gcc-4.8-powerpc64le-linux-gnu
43gcc-4.8-powerpc64le-linux-gnu-base
44gcc-4.8-source
45gccgo-4.8-doc
46gcj-4.8
47gcj-4.8-jdk
48gcj-4.8-jre
49gcj-4.8-jre-headless
50gcj-4.8-jre-lib
51gcj-4.8-source
52gfortran-4.7-doc
53gfortran-4.8
54gfortran-4.8-doc
55gfortran-4.8-multilib
56gir1.2-friends-0.1
57gir1.2-friends-gtk-0.1
58gir1.2-gtk-vnc-2.0
59gobjc-4.8
60gtk3-engines-unico
61ibus-pinyin
62latex-beamer
63latex-xcolor
64ldap-auth-client
65ldap-auth-config
66lib32asan0
67lib32asan0-dbg
68lib32gcc-4.8-dev
69lib32gfortran-4.8-dev
70lib32go4
71lib32go4-dbg
72lib32go5
73lib32go5-dbg
74lib32objc-4.8-dev
75lib32stdc++-4.8-dev
76lib32stdc++6-4.7-dbg
77lib32stdc++6-4.7-dev
78lib32stdc++6-4.8-dbg
79lib64asan0
80lib64asan0-dbg
81lib64asan0-powerpc-cross
82lib64gcc-4.8-dev
83lib64gcc-4.8-dev-powerpc-cross
84lib64gfortran-4.8-dev
85lib64go4
86lib64go4-dbg
87lib64go5
88lib64go5-dbg
89lib64objc-4.8-dev
90lib64stdc++-4.8-dev
91lib64stdc++-4.8-dev-powerpc-cross
92lib64stdc++6-4.7-dbg
93lib64stdc++6-4.7-dev
94lib64stdc++6-4.8-dbg
95libasan0
96libasan0-armhf-cross
97libasan0-dbg
98libasan0-powerpc-cross
99libboost-chrono-dev
100libcglib-java
101libcglib-java-doc
102libcrypt-passwdmd5-perl
103libcuda1-331
104libcuda1-331-updates
105libdbus-cpp-dev
106libeasymock-java
107libeasymock-java-doc
108libfriends-dev
109libfriends-gtk-dev
110libfriends-gtk0
111libfriends0
112libgcc-4.8-dev
113libgcc-4.8-dev-arm64-cross
114libgcc-4.8-dev-armhf-cross
115libgcc-4.8-dev-powerpc-cross
116libgcc-4.8-dev-ppc64el-cross
117libgcj14
118libgcj14-awt
119libgcj14-dbg
120libgcj14-dev
121libgfortran-4.8-dev
122libgo4
123libgo4-dbg
124libgo5
125libgo5-dbg
126libgtk-vnc-1.0-0
127libgtk-vnc-1.0-0-dbg
128libgtk-vnc-1.0-dev
129libgtk-vnc-2.0-0
130libgtk-vnc-2.0-0-dbg
131libgtk-vnc-2.0-dev
132libgvnc-1.0-0
133libgvnc-1.0-0-dbg
134libgvnc-1.0-dev
135libipc-system-simple-perl
136libllvm3.4
137libllvm3.4-dbg
138libmono-2.0-1
139libnss-ldap
140libnss-mdns-i386
141libobjc-4.8-dev
142liborcus-dev
143libossp-uuid-dev
144libossp-uuid16
145libpam-ldap
146libpango1.0-0-dbg
147libphobos-4.8-dev
148libphonon-perl
149libplatform-api-headers
150libplatform-api1-dev
151libplatform-api1-doc
152libplatform-hardware-api-headers
153libplatform-hardware-api1-dev
154libprocess-cpp-dev
155libprocess-cpp-doc
156libpyzy-1.0-0
157libpyzy-dev
158libqimageblitz-dbg
159libqimageblitz-dev
160libqimageblitz-perl
161libqimageblitz4
162libqscintilla-perl
163libqscintilla2-11
164libqscintilla2-dev
165libqscintilla2-doc
166libqscintilla2-l10n
167libqt3support4-perl
168libqt5scintilla2-11
169libqt5scintilla2-dev
170libqt5scintilla2-l10n
171libqt5serialport5
172libqt5serialport5-dev
173libqt5webkit5-qmlwebkitplugin
174libqt5x11extras5
175libqt5x11extras5-dev
176libqtcore4-perl
177libqtdbus4-perl
178libqtdeclarative4-perl
179libqtgui4-perl
180libqthelp4-perl
181libqtnetwork4-perl
182libqtopengl4-perl
183libqtscript4-perl
184libqtsql4-perl
185libqtsvg4-perl
186libqttest4-perl
187libqtuitools4-perl
188libqtwebkit4-perl
189libqtxml4-perl
190libqtxmlpatterns4-perl
191librabbitmq-dbg
192librabbitmq-dev
193librabbitmq1
194libruby1.9.1
195libruby1.9.1-dbg
196libsexy-dev
197libsexy-doc
198libsexy2
199libsfasan0-armhf-cross
200libsfgcc-4.8-dev-armhf-cross
201libsfstdc++-4.8-dev-armhf-cross
202libsmokebase3
203libsmokephonon3
204libsmokeqimageblitz3
205libsmokeqsci3
206libsmokeqt3support4-3
207libsmokeqt4-dbg
208libsmokeqt4-dev
209libsmokeqtcore4-3
210libsmokeqtdbus4-3
211libsmokeqtdeclarative4-3
212libsmokeqtgui4-3
213libsmokeqthelp4-3
214libsmokeqtnetwork4-3
215libsmokeqtopengl4-3
216libsmokeqtscript4-3
217libsmokeqtsql4-3
218libsmokeqtsvg4-3
219libsmokeqttest4-3
220libsmokeqtuitools4-3
221libsmokeqtwebkit4-3
222libsmokeqtxml4-3
223libsmokeqtxmlpatterns4-3
224libsoprano-dbg
225libsoprano-dev
226libsoprano-doc
227libsoprano4
228libspe2-doc
229libstdc++-4.8-dev
230libstdc++-4.8-dev-arm64-cross
231libstdc++-4.8-dev-armhf-cross
232libstdc++-4.8-dev-powerpc-cross
233libstdc++-4.8-dev-ppc64el-cross
234libstdc++-4.8-doc
235libstdc++-4.8-pic
236libstdc++6-4.7-dbg
237libstdc++6-4.7-doc
238libstdc++6-4.8-dbg
239libterm-size-perl
240libtest-checkdeps-perl
241libtext-csv-perl
242libtext-csv-xs-perl
243libthumbnailer-dev
244libthumbnailer0
245libtree-dagnode-perl
246libubuntu-location-service-dev
247libvala-0.18-0
248libvala-0.18-0-dbg
249libvala-0.18-dev
250libvirtodbc0
251libx32asan0
252libx32asan0-dbg
253libx32gcc-4.8-dev
254libx32gfortran-4.8-dev
255libx32go4
256libx32go4-dbg
257libx32go5
258libx32go5-dbg
259libx32objc-4.8-dev
260libx32stdc++-4.8-dev
261libx32stdc++6-4.7-dbg
262libx32stdc++6-4.7-dev
263libx32stdc++6-4.8-dbg
264libzip-dev
265libzip2
266llvm-3.4
267llvm-3.4-dev
268llvm-3.4-doc
269llvm-3.4-examples
270llvm-3.4-runtime
271m17n-contrib
272nvidia-libopencl1-304
273nvidia-libopencl1-304-updates
274nvidia-libopencl1-331
275nvidia-libopencl1-331-updates
276nvidia-opencl-icd-331
277nvidia-opencl-icd-331-updates
278openvswitch-pki
279perlqt-dbg
280perlqt-dev
281pgf
282pwgen
283pyqt5-dev
284pyqt5-doc
285pyqt5-examples
286python-appindicator
287python-cloudfiles
288python-gtk-vnc
289python-hp3parclient
290python-hplefthandclient
291python-hplefthandclient-doc
292python-librabbitmq
293python-nose-testconfig
294python-notify
295python-oops
296python-oops-amqp
297python-oops-datedir-repo
298python-oops-twisted
299python-oops-wsgi
300python-pyudev
301python-sane
302python-sane-dbg
303python-smbc
304python-txlongpoll
305python-vte
306python3-dbus.mainloop.pyqt5
307python3-dbus.mainloop.pyqt5-dbg
308python3-pyqt5
309python3-pyqt5-dbg
310python3-pyqt5.qtmultimedia
311python3-pyqt5.qtmultimedia-dbg
312python3-pyqt5.qtopengl
313python3-pyqt5.qtopengl-dbg
314python3-pyqt5.qtpositioning
315python3-pyqt5.qtpositioning-dbg
316python3-pyqt5.qtquick
317python3-pyqt5.qtquick-dbg
318python3-pyqt5.qtsensors
319python3-pyqt5.qtsensors-dbg
320python3-pyqt5.qtserialport
321python3-pyqt5.qtserialport-dbg
322python3-pyqt5.qtsql
323python3-pyqt5.qtsql-dbg
324python3-pyqt5.qtsvg
325python3-pyqt5.qtsvg-dbg
326python3-pyqt5.qtwebkit
327python3-pyqt5.qtwebkit-dbg
328python3-pyqt5.qtx11extras
329python3-pyqt5.qtx11extras-dbg
330python3-pyqt5.qtxmlpatterns
331python3-pyqt5.qtxmlpatterns-dbg
332python3-sane
333python3-sane-dbg
334qtserialport5-dbg
335qtserialport5-doc
336qtx11extras5-dbg
337qtx11extras5-doc
338ruby1.9.1
339ruby1.9.1-dev
340ruby1.9.1-examples
341shared-desktop-ontologies
342smoke-dev-tools
343smokegen-dbg
344soprano-daemon
345texlive-luatex
346thunderbird-globalmenu
347ubuntu-location-service-doc
348ubuntu-location-service-examples
349ubuntu-wallpapers-trusty
350unity-lens-friends
351vala-0.18-doc
352valac-0.18
353valac-0.18-dbg
354valac-0.18-vapi
355virt-manager
356virtinst
357virtuoso-opensource-6.1-common
358x11-xfs-utils
359xserver-xorg-input-void
360xserver-xorg-video-s3
0361
=== renamed file 'utils/demoted.cfg.trusty' => 'utils/demoted.cfg.trusty.moved'

Subscribers

People subscribed via source and target branches

to all changes: