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

[Ubuntu Package Importer]

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)

Unmerged revisions

79. By Brian Murray on 2015-09-28

* 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)

=== 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 @@
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
+# the views below support upgrades over ssh connection
+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
+
+# Distro contains global information about the upgrade
+[Distro]
+# the meta-pkgs we support
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
+   xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
+   kubuntu-netbook, lubuntu-core, lubuntu-desktop, ubuntu-gnome-desktop
+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
+Demotions=demoted.cfg
+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
+RemovalBlacklistFile=removal_blacklist.cfg
+# if those packages were installed, make sure to keep them installed
+KeepInstalledPkgs=xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
+# hints for for stuff that should be done right after the cache calculated
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradeInstall=apt
+PostInstallScripts=./xorg_fix_proprietary.py
+EnableApport=yes
+# this supported blacklisting certain versions to ensure we do not upgrade
+#  - blcr-dkms fails to build on kernel 2.6.35
+#BadVersions=blcr-dkms_0.8.2-13
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+[KernelRemoval]
+Version=3.13.0
+BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
+  linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools
+Types=386,ec2,generic,rt,server,virtual
+
+# information about the individual meta-pkgs
+[ubuntu-desktop]
+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
+
+[kubuntu-desktop]
+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager
+# those packages are marked as obsolete right after the upgrade
+ForcedObsoletes=ivman, gtk-qt-engine
+# help the resolver a bit: LP: #1426132
+PostUpgradeInstall=baloo-kf5
+
+[kubuntu-netbook]
+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
+
+[ubuntu-netbook]
+KeyDependencies=gdm, ubuntu-netbook-default-settings
+
+[xubuntu-core]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[xubuntu-desktop]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[ubuntustudio-desktop]
+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
+
+[ichthux-desktop]
+KeyDependencies=ichthux-artwork, ichthux-default-settings
+
+[mythbuntu-desktop]
+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
+
+[lubuntu-core]
+KeyDependencies=lubuntu-artwork, lubuntu-default-settings, openbox
+
+[lubuntu-desktop]
+KeyDependencies=lubuntu-core, lubuntu-default-settings
+
+[ubuntu-gnome-desktop]
+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
+
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=trusty
+To=vivid
+ValidOrigin=Ubuntu
+ValidMirrors = mirrors.cfg
+Components=main,restricted,universe,multiverse
+Pockets=security,updates,proposed,backports
+;AllowThirdParty=False
+
+;[PreRequists]
+;Packages=release-upgrader-apt,release-upgrader-dpkg
+;SourcesList=prerequists-sources.list
+;SourcesList-ia64=prerequists-sources.ports.list
+;SourcesList-hppa=prerequists-sources.ports.list
+
+[Aufs]
+; this is a xor option, either full or chroot overlay
+;EnableFullOverlay=yes
+;EnableChrootOverlay=yes
+; sync changes from the chroot back to the real system
+;EnableChrootRsync=yes
+; what chroot dir to use
+;ChrootDir=/tmp/upgrade-chroot
+; the RW dir to use (either for full overlay or chroot overlay)
+;RWDir=/tmp/upgrade-rw
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400

=== 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 @@
-[BUILDDEB]
-native = True

=== 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 @@
+# demoted packages from trusty to vivid
+auth-client-config
+automake1.10
+automake1.4
+cgroup-lite
+chkrootkit
+cpp-4.8
+cpp-4.8-aarch64-linux-gnu
+cpp-4.8-arm-linux-gnueabihf
+cpp-4.8-doc
+cpp-4.8-powerpc-linux-gnu
+cpp-4.8-powerpc64le-linux-gnu
+dbus-cpp-dev-examples
+dh-linktree
+firefox-globalmenu
+friends
+friends-dispatcher
+friends-facebook
+friends-flickr
+friends-twitter
+g++-4.8
+g++-4.8-aarch64-linux-gnu
+g++-4.8-arm-linux-gnueabihf
+g++-4.8-multilib
+g++-4.8-multilib-arm-linux-gnueabihf
+g++-4.8-multilib-powerpc-linux-gnu
+g++-4.8-powerpc-linux-gnu
+g++-4.8-powerpc64le-linux-gnu
+gcc-4.8
+gcc-4.8-aarch64-linux-gnu
+gcc-4.8-aarch64-linux-gnu-base
+gcc-4.8-arm-linux-gnueabihf
+gcc-4.8-arm-linux-gnueabihf-base
+gcc-4.8-base
+gcc-4.8-doc
+gcc-4.8-multilib
+gcc-4.8-multilib-arm-linux-gnueabihf
+gcc-4.8-multilib-powerpc-linux-gnu
+gcc-4.8-plugin-dev
+gcc-4.8-powerpc-linux-gnu
+gcc-4.8-powerpc-linux-gnu-base
+gcc-4.8-powerpc64le-linux-gnu
+gcc-4.8-powerpc64le-linux-gnu-base
+gcc-4.8-source
+gccgo-4.8-doc
+gcj-4.8
+gcj-4.8-jdk
+gcj-4.8-jre
+gcj-4.8-jre-headless
+gcj-4.8-jre-lib
+gcj-4.8-source
+gfortran-4.7-doc
+gfortran-4.8
+gfortran-4.8-doc
+gfortran-4.8-multilib
+gir1.2-friends-0.1
+gir1.2-friends-gtk-0.1
+gir1.2-gtk-vnc-2.0
+gobjc-4.8
+gtk3-engines-unico
+ibus-pinyin
+latex-beamer
+latex-xcolor
+ldap-auth-client
+ldap-auth-config
+lib32asan0
+lib32asan0-dbg
+lib32gcc-4.8-dev
+lib32gfortran-4.8-dev
+lib32go4
+lib32go4-dbg
+lib32go5
+lib32go5-dbg
+lib32objc-4.8-dev
+lib32stdc++-4.8-dev
+lib32stdc++6-4.7-dbg
+lib32stdc++6-4.7-dev
+lib32stdc++6-4.8-dbg
+lib64asan0
+lib64asan0-dbg
+lib64asan0-powerpc-cross
+lib64gcc-4.8-dev
+lib64gcc-4.8-dev-powerpc-cross
+lib64gfortran-4.8-dev
+lib64go4
+lib64go4-dbg
+lib64go5
+lib64go5-dbg
+lib64objc-4.8-dev
+lib64stdc++-4.8-dev
+lib64stdc++-4.8-dev-powerpc-cross
+lib64stdc++6-4.7-dbg
+lib64stdc++6-4.7-dev
+lib64stdc++6-4.8-dbg
+libasan0
+libasan0-armhf-cross
+libasan0-dbg
+libasan0-powerpc-cross
+libboost-chrono-dev
+libcglib-java
+libcglib-java-doc
+libcrypt-passwdmd5-perl
+libcuda1-331
+libcuda1-331-updates
+libdbus-cpp-dev
+libeasymock-java
+libeasymock-java-doc
+libfriends-dev
+libfriends-gtk-dev
+libfriends-gtk0
+libfriends0
+libgcc-4.8-dev
+libgcc-4.8-dev-arm64-cross
+libgcc-4.8-dev-armhf-cross
+libgcc-4.8-dev-powerpc-cross
+libgcc-4.8-dev-ppc64el-cross
+libgcj14
+libgcj14-awt
+libgcj14-dbg
+libgcj14-dev
+libgfortran-4.8-dev
+libgo4
+libgo4-dbg
+libgo5
+libgo5-dbg
+libgtk-vnc-1.0-0
+libgtk-vnc-1.0-0-dbg
+libgtk-vnc-1.0-dev
+libgtk-vnc-2.0-0
+libgtk-vnc-2.0-0-dbg
+libgtk-vnc-2.0-dev
+libgvnc-1.0-0
+libgvnc-1.0-0-dbg
+libgvnc-1.0-dev
+libipc-system-simple-perl
+libllvm3.4
+libllvm3.4-dbg
+libmono-2.0-1
+libnss-ldap
+libnss-mdns-i386
+libobjc-4.8-dev
+liborcus-dev
+libossp-uuid-dev
+libossp-uuid16
+libpam-ldap
+libpango1.0-0-dbg
+libphobos-4.8-dev
+libphonon-perl
+libplatform-api-headers
+libplatform-api1-dev
+libplatform-api1-doc
+libplatform-hardware-api-headers
+libplatform-hardware-api1-dev
+libprocess-cpp-dev
+libprocess-cpp-doc
+libpyzy-1.0-0
+libpyzy-dev
+libqimageblitz-dbg
+libqimageblitz-dev
+libqimageblitz-perl
+libqimageblitz4
+libqscintilla-perl
+libqscintilla2-11
+libqscintilla2-dev
+libqscintilla2-doc
+libqscintilla2-l10n
+libqt3support4-perl
+libqt5scintilla2-11
+libqt5scintilla2-dev
+libqt5scintilla2-l10n
+libqt5serialport5
+libqt5serialport5-dev
+libqt5webkit5-qmlwebkitplugin
+libqt5x11extras5
+libqt5x11extras5-dev
+libqtcore4-perl
+libqtdbus4-perl
+libqtdeclarative4-perl
+libqtgui4-perl
+libqthelp4-perl
+libqtnetwork4-perl
+libqtopengl4-perl
+libqtscript4-perl
+libqtsql4-perl
+libqtsvg4-perl
+libqttest4-perl
+libqtuitools4-perl
+libqtwebkit4-perl
+libqtxml4-perl
+libqtxmlpatterns4-perl
+librabbitmq-dbg
+librabbitmq-dev
+librabbitmq1
+libruby1.9.1
+libruby1.9.1-dbg
+libsexy-dev
+libsexy-doc
+libsexy2
+libsfasan0-armhf-cross
+libsfgcc-4.8-dev-armhf-cross
+libsfstdc++-4.8-dev-armhf-cross
+libsmokebase3
+libsmokephonon3
+libsmokeqimageblitz3
+libsmokeqsci3
+libsmokeqt3support4-3
+libsmokeqt4-dbg
+libsmokeqt4-dev
+libsmokeqtcore4-3
+libsmokeqtdbus4-3
+libsmokeqtdeclarative4-3
+libsmokeqtgui4-3
+libsmokeqthelp4-3
+libsmokeqtnetwork4-3
+libsmokeqtopengl4-3
+libsmokeqtscript4-3
+libsmokeqtsql4-3
+libsmokeqtsvg4-3
+libsmokeqttest4-3
+libsmokeqtuitools4-3
+libsmokeqtwebkit4-3
+libsmokeqtxml4-3
+libsmokeqtxmlpatterns4-3
+libsoprano-dbg
+libsoprano-dev
+libsoprano-doc
+libsoprano4
+libspe2-doc
+libstdc++-4.8-dev
+libstdc++-4.8-dev-arm64-cross
+libstdc++-4.8-dev-armhf-cross
+libstdc++-4.8-dev-powerpc-cross
+libstdc++-4.8-dev-ppc64el-cross
+libstdc++-4.8-doc
+libstdc++-4.8-pic
+libstdc++6-4.7-dbg
+libstdc++6-4.7-doc
+libstdc++6-4.8-dbg
+libterm-size-perl
+libtest-checkdeps-perl
+libtext-csv-perl
+libtext-csv-xs-perl
+libthumbnailer-dev
+libthumbnailer0
+libtree-dagnode-perl
+libubuntu-location-service-dev
+libvala-0.18-0
+libvala-0.18-0-dbg
+libvala-0.18-dev
+libvirtodbc0
+libx32asan0
+libx32asan0-dbg
+libx32gcc-4.8-dev
+libx32gfortran-4.8-dev
+libx32go4
+libx32go4-dbg
+libx32go5
+libx32go5-dbg
+libx32objc-4.8-dev
+libx32stdc++-4.8-dev
+libx32stdc++6-4.7-dbg
+libx32stdc++6-4.7-dev
+libx32stdc++6-4.8-dbg
+libzip-dev
+libzip2
+llvm-3.4
+llvm-3.4-dev
+llvm-3.4-doc
+llvm-3.4-examples
+llvm-3.4-runtime
+m17n-contrib
+nvidia-libopencl1-304
+nvidia-libopencl1-304-updates
+nvidia-libopencl1-331
+nvidia-libopencl1-331-updates
+nvidia-opencl-icd-331
+nvidia-opencl-icd-331-updates
+openvswitch-pki
+perlqt-dbg
+perlqt-dev
+pgf
+pwgen
+pyqt5-dev
+pyqt5-doc
+pyqt5-examples
+python-appindicator
+python-cloudfiles
+python-gtk-vnc
+python-hp3parclient
+python-hplefthandclient
+python-hplefthandclient-doc
+python-librabbitmq
+python-nose-testconfig
+python-notify
+python-oops
+python-oops-amqp
+python-oops-datedir-repo
+python-oops-twisted
+python-oops-wsgi
+python-pyudev
+python-sane
+python-sane-dbg
+python-smbc
+python-txlongpoll
+python-vte
+python3-dbus.mainloop.pyqt5
+python3-dbus.mainloop.pyqt5-dbg
+python3-pyqt5
+python3-pyqt5-dbg
+python3-pyqt5.qtmultimedia
+python3-pyqt5.qtmultimedia-dbg
+python3-pyqt5.qtopengl
+python3-pyqt5.qtopengl-dbg
+python3-pyqt5.qtpositioning
+python3-pyqt5.qtpositioning-dbg
+python3-pyqt5.qtquick
+python3-pyqt5.qtquick-dbg
+python3-pyqt5.qtsensors
+python3-pyqt5.qtsensors-dbg
+python3-pyqt5.qtserialport
+python3-pyqt5.qtserialport-dbg
+python3-pyqt5.qtsql
+python3-pyqt5.qtsql-dbg
+python3-pyqt5.qtsvg
+python3-pyqt5.qtsvg-dbg
+python3-pyqt5.qtwebkit
+python3-pyqt5.qtwebkit-dbg
+python3-pyqt5.qtx11extras
+python3-pyqt5.qtx11extras-dbg
+python3-pyqt5.qtxmlpatterns
+python3-pyqt5.qtxmlpatterns-dbg
+python3-sane
+python3-sane-dbg
+qtserialport5-dbg
+qtserialport5-doc
+qtx11extras5-dbg
+qtx11extras5-doc
+ruby1.9.1
+ruby1.9.1-dev
+ruby1.9.1-examples
+shared-desktop-ontologies
+smoke-dev-tools
+smokegen-dbg
+soprano-daemon
+texlive-luatex
+thunderbird-globalmenu
+ubuntu-location-service-doc
+ubuntu-location-service-examples
+ubuntu-wallpapers-trusty
+unity-lens-friends
+vala-0.18-doc
+valac-0.18
+valac-0.18-dbg
+valac-0.18-vapi
+virt-manager
+virtinst
+virtuoso-opensource-6.1-common
+x11-xfs-utils
+xserver-xorg-input-void
+xserver-xorg-video-s3

=== renamed file 'utils/demoted.cfg.trusty' => 'utils/demoted.cfg.trusty.moved'