Ubuntu Seeds

Merge lp:~xnox/ubuntu-seeds/drop-ndis-xubuntu.raring into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.raring

drop-ndis-xubuntu.raring
Merge into ubuntu.raring

Proposed by Dimitri John Ledkov on 2012-11-08

Status:	Superseded
Proposed branch:	lp:~xnox/ubuntu-seeds/drop-ndis-xubuntu.raring
Merge into:	lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.raring
Diff against target:	726 lines (+324/-38) (has conflicts) 11 files modified STRUCTURE (+11/-0) blacklist (+9/-0) desktop (+184/-4) dns-server (+0/-7) lamp-server (+0/-10) live (+31/-3) postgresql-server (+0/-14) ship (+42/-0) ship-live (+13/-0) supported (+33/-0) supported-desktop-extra (+1/-0) Text conflict in STRUCTURE Text conflict in desktop Contents conflict in development Contents conflict in doc/langpacks.txt Text conflict in live Contents conflict in mail-server Contents conflict in openssh-server Contents conflict in print-server Contents conflict in samba-server Contents conflict in server-ship Text conflict in ship Text conflict in ship-live Text conflict in supported Conflict adding file supported-desktop-extra. Moved existing file to supported-desktop-extra.moved.
To merge this branch:	bzr merge lp:~xnox/ubuntu-seeds/drop-ndis-xubuntu.raring
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Core Development Team		2012-11-08	Pending
Review via email: mp+133527@code.launchpad.net

Description of the change

Drop ndiswrapper utils & gui, kernel module not shipped

Unmerged revisions

929. By Dimitri John Ledkov on 2012-11-08: Drop ndiswrapper utils & gui, kernel module not shipped
928. By Colin Watson on 2012-10-18: platform.quantal -> platform.raring
927. By Micah Gersten on 2012-10-11: * Drop de from i386, not enough space
926. By Micah Gersten on 2012-10-03: * Switch xh and pt back from just i386 to !powerpc since we have room again
925. By Micah Gersten on 2012-09-20: * Drop aisleriot due to space concerns
924. By Micah Gersten on 2012-09-19: * Add back de on i386 to live image, should be enough space
923. By Micah Gersten on 2012-09-19: * Drop pt from amd64, lack of space
922. By Lionel Le Folgoc on 2012-09-17: restore indicator-sound by default
921. By Micah Gersten on 2012-09-10: * Reenable the indicator stuff that is already in the archive
920. By Micah Gersten on 2012-09-10: * Drop gnumeric for now due to space concerns

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brian Murray

Dimitri John Ledkov

Micah Gersten

Ubuntu Core Development Team

 === modified file 'STRUCTURE'
 --- STRUCTURE	2012-10-18 17:27:00 +0000
 +++ STRUCTURE	2012-11-08 17:31:26 +0000
@@ -1,3 +1,4 @@
++<<<<<<< TREE
  include platform.raring
  desktop: desktop-common
  dns-server: standard
@@ -23,3 +24,13 @@
  supported-desktop-extra: usb-live
  # make sure supported remains the last entry
  supported: supported-common server-ship cloud-image ship ship-live development usb-ship-live language-packs supported-desktop-extra
++=======
++include platform.raring
++desktop: desktop-common
++live: desktop
++ship: boot installer desktop d-i-requirements
++ship-live: boot live
++supported-desktop-extra: desktop ship-live supported-common
++# make sure supported remains the last entry
++supported: supported-desktop-extra
++>>>>>>> MERGE-SOURCE
 === modified file 'blacklist'
 --- blacklist	2005-02-11 19:27:34 +0000
 +++ blacklist	2012-11-08 17:31:26 +0000
@@ -61,3 +61,12 @@
  # mdz, 2004-06-14: upstream deliberately obfuscates vulnerabilities
  # mdz, 2004-06-20: CAN-2002-0757, CAN-2003-0101, SNS 74, SNS 75
  webmin
++
++# Xubuntu does not want LibreOffice at this time.
++libreoffice-core
++libreoffice-writer
++libreoffice-common
++libreoffice-hyphenation
++libreoffice-base-core
++libreoffice-l10n
++
 === modified file 'desktop'
 --- desktop	2012-11-07 17:21:04 +0000
 +++ desktop	2012-11-08 17:31:26 +0000
@@ -1,20 +1,32 @@
  Task-Per-Derivative: 1
  Task-Section: user
++<<<<<<< TREE
  Task-Description: Ubuntu desktop
  Task-Extended-Description: This task provides the Ubuntu desktop environment.
  Task-Key: ubuntu-desktop
  Task-Seeds: desktop-common
++=======
++Task-Description: Xubuntu desktop
++Task-Extended-Description: This task provides the Xubuntu desktop environment.
++Task-Key: xubuntu-desktop
++Task-Name: xubuntu-desktop
++Task-Seeds: desktop-common
++>>>>>>> MERGE-SOURCE
  = Hardware and Architecture Support =
  == Architecture-independent ==
++<<<<<<< TREE
   * libgd2-xpm # force the xpm-enabled version for edubuntu compatibility
  Bluetooth:
   * (gnome-bluetooth) # desktop bluetooth support
   * (bluez-gstreamer)
++=======
++ * libgd2-xpm # force the xpm-enabled version for edubuntu compatibility
++>>>>>>> MERGE-SOURCE
  = Network Services =
@@ -22,14 +34,20 @@
   * (avahi-autoipd)     # IPv4 link-local interface configuration support
   * (network-manager-gnome) # see NetworkRoaming spec
++<<<<<<< TREE
   * (network-manager-pptp)
   * (network-manager-pptp-gnome)
   * (libproxy1-plugin-gsettings)
   * (libproxy1-plugin-networkmanager)
++=======
++ * (network-manager-pptp)
++ * (network-manager-pptp-gnome)
++>>>>>>> MERGE-SOURCE
  = GUI infrastructure =
   * xterm                         # Provide a backup terminal and complete X env.
++<<<<<<< TREE
   * libnotify-bin		 # various scripts need notify-send (such as .bashrc's "alert")
  Extra fonts (should be common, but not so for space reasons):
@@ -37,9 +55,20 @@
   * (ttf-wqy-microhei)
   * (fonts-nanum)
   * (fonts-liberation)
++=======
++ * (libnotify-bin)		 # various scripts need notify-send (such as .bashrc's "alert")
++
++Extra fonts (should be common, but not so for space reasons):
++
++ * (ttf-wqy-microhei)
++ * (fonts-nanum)
++ * (fonts-opensymbol)
++ * (fonts-liberation)
++>>>>>>> MERGE-SOURCE
  Input methods:
++<<<<<<< TREE
   * (im-switch)
   * (ibus)
   * (ibus-gtk3)
@@ -51,7 +80,20 @@
  We've chosen GNOME as our desktop user interface of choice. Rather than using the meta-packages they are deliberately expanded so that we can select things a bit better.
++=======
++ * (im-switch)
++ * (ibus)
++ * (ibus-gtk)
++ * (ibus-table)
++ * (ibus-pinyin)
++ * (ibus-pinyin-db-android)
++
++= Desktop Xfce Apps =
++
++Common with Ubuntu:
++>>>>>>> MERGE-SOURCE
   * (apport-gtk)
++<<<<<<< TREE
   * (whoopsie)              # http://wiki.ubuntu.com/ErrorTracker - EvanDandrea
   * eog
   * (thunderbird)
@@ -64,14 +106,28 @@
   * gedit
   * software-center
   * (app-install-data-partner)
++=======
++ * (whoopsie)              # http://wiki.ubuntu.com/ErrorTracker
++ * (desktop-file-utils)
++ * (file-roller)
++ * (gcalctool)
++ * lightdm                 # Proposed GDM replacement for Oneiric, see https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-lightdm
++ * software-center
++ * (app-install-data-partner)
++>>>>>>> MERGE-SOURCE
   * (transmission-gtk)       # simple GNOME frontend for bittorrent downloads
++<<<<<<< TREE
   * gnome-control-center
   * system-config-printer-gnome
   * gnome-media
   * gnome-menus
   * gnome-session
   * seahorse
++=======
++ * (system-config-printer-gnome)
++>>>>>>> MERGE-SOURCE
   * (libpam-gnome-keyring)
++<<<<<<< TREE
   * gnome-system-monitor     # SebastienBacher
   * gnome-power-manager		# OliverGrawert finally ready for shipment
   * gnome-terminal
@@ -82,8 +138,15 @@
   * gucharmap               # SebastienBacher
   * checkbox-qt
   * language-selector-gnome # MichaelVogt
++=======
++ * (gnome-system-tools)
++ * (gnome-time-admin)
++ * (gucharmap)               # SebastienBacher
++ * language-selector-gnome	   # MichaelVogt
++>>>>>>> MERGE-SOURCE
   * (firefox)
   * (firefox-gnome-support)
++<<<<<<< TREE
   * (xul-ext-ubufox)        # ubuntu firefox tweaks - AlexanderSack
   * nautilus                # SebastienBacher
   * nautilus-sendto
@@ -101,10 +164,17 @@
   * update-notifier
   * (vino) # vnc server
   * yelp
++=======
++ * (xul-ext-ubufox)        # ubuntu firefox tweaks - AlexanderSack
++ * software-properties-gtk # default GUI sources.list editor / extra drivers
++ * update-manager
++ * (update-notifier)
++>>>>>>> MERGE-SOURCE
   * zenity
   * (xdg-utils)		   # useful utilities
   * xdg-user-dirs
   * xdg-user-dirs-gtk
++<<<<<<< TREE
   * pulseaudio
   * (pulseaudio-module-gconf)
   * (pulseaudio-module-x11)
@@ -130,29 +200,96 @@
  Settings: we have some settings overrides by default in an unique package.
   * ubuntu-settings
++=======
++ * (gvfs-fuse)			# let non-GNOME apps see GVFS via fuse
++ * (gvfs-backends)      # otherwise no network tab
++
++Xfce core:
++ * xfwm4
++ * xfdesktop4
++ * xfce4-panel
++ * xfce4-settings
++ * xfce4-session
++ * thunar
++ * xfce4-appfinder
++ * tumbler
++ * thunar-volman
++ * (libxfce4ui-utils)   # for xfce4-about
++
++Xfce goodies:
++ * (xfce4-xkb-plugin)
++ * (xfce4-mailwatch-plugin)
++ * (xfce4-verve-plugin)
++ * (xfce4-quicklauncher-plugin)
++ * (xfce4-weather-plugin)
++ * (xfce4-cpugraph-plugin)
++ * (xfce4-systemload-plugin)
++ * (xfce4-netload-plugin)
++ * (xfce4-screenshooter)
++ * (xfce4-notes-plugin)
++ * (xfce4-dict)
++ * (xfce4-places-plugin)
++ * (thunar-archive-plugin)
++ * (thunar-media-tags-plugin)
++ * (xfce4-volumed)
++ * (xfce4-terminal)
++ * (orage)
++ * (ristretto)
++ * (xfce4-power-manager)
++ * (gigolo)
++ * (xfce4-taskmanager)
++ * (xfburn)
++ * (parole)
++ * xfce4-notifyd
++
++Indicator/Ayatana stuff:
++ * (xfce4-indicator-plugin)
++ * (indicator-application-gtk2)
++ * (indicator-sound-gtk2)
++
++Games: We only ship a few by default.
++# * (aisleriot) [!powerpc]
++# * (gnome-mahjongg) [!powerpc]
++ * (gnomine) [!powerpc]
++ * (gnome-sudoku) [!powerpc]
++
++Themes:
++ * gtk2-engines			# DanielHolbach (gtk2-engines were merged into one package)
++ * gtk2-engines-pixbuf          # Required by some themes the user might install
++ * dmz-cursor-theme
++>>>>>>> MERGE-SOURCE
  The gstreamer0.10 packages we want to install:
-- * gstreamer0.10-alsa
-- * gstreamer0.10-plugins-base-apps
-- * gstreamer0.10-pulseaudio
++ * (gstreamer0.10-pulseaudio)
++ * (gstreamer0.10-plugins-base-apps)
++ * libasound2-plugins
  Accessibility tools:
   * (gnome-accessibility-themes)
++<<<<<<< TREE
   * (gnome-orca)
++=======
++>>>>>>> MERGE-SOURCE
   * (onboard)
   * (brltty)
   * (xcursor-themes)
++<<<<<<< TREE
   * (speech-dispatcher)
   * (mousetweaks)
   * at-spi2-core
   * libatk-adaptor
   * (libgail-common)
   * (qt-at-spi)
++=======
++ * (espeak)
++ * (speech-dispatcher)
++>>>>>>> MERGE-SOURCE
  = Other Desktop GUI Apps =
++<<<<<<< TREE
   * (libreoffice-style-human) [!powerpc]
   * (libreoffice-gnome) [!powerpc]
   * (libreoffice-writer) [!powerpc]
@@ -195,8 +332,35 @@
  = Documentation =
++=======
++ * (simple-scan)
++# * (gnumeric)
++ * (abiword)
++ * (abiword-plugin-grammar)
++ * (abiword-plugin-mathview)
++ * (xscreensaver)
++ * (screensaver-default-images)
++ * (xscreensaver-gl)
++ * (xscreensaver-data)
++ * (catfish)
++ * (gthumb)
++ * (gmusicbrowser)
++ * (thunderbird)
++ * (pidgin)
++ * (pidgin-microblog)
++ * (pidgin-otr)
++ * (xchat)
++ * (leafpad)
++ * (evince)
++ * (blueman)
++ * (alacarte) # menu editor
++ * (pavucontrol) # mixer
++
++= Documentation =
++
++>>>>>>> MERGE-SOURCE
   * doc-base			# integrates with scrollkeeper
-- * (ubuntu-docs)
++ * (xubuntu-docs)
  = Development =
@@ -207,14 +371,30 @@
   * (gcc)
   * (make)
++<<<<<<< TREE
   * (linux-headers-generic-pae) [i386]
++=======
++ * (linux-headers-generic) [i386]
++>>>>>>> MERGE-SOURCE
   * (linux-headers-generic) [amd64]
++<<<<<<< TREE
   * (linux-headers-omap4) [armhf armel]
++=======
++ * (linux-headers-dove) [armel]
++>>>>>>> MERGE-SOURCE
  = Other =
++<<<<<<< TREE
   * ubuntu-desktop # metapackage for everything here
   * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent)
   * (libwmf0.2-7-gtk)
   * (plymouth-theme-ubuntu-logo)
   * (python3-aptdaemon.pkcompat) # needed to keep packagekit off the images
++=======
++ * xubuntu-desktop # metapackage for everything here
++ * xubuntu-default-settings
++ * xubuntu-artwork
++ * lightdm-gtk-greeter
++ * (pastebinit)
++>>>>>>> MERGE-SOURCE
 === renamed file 'development' => 'development.THIS'
 === removed file 'dns-server'
 --- dns-server	2006-07-21 10:01:31 +0000
 +++ dns-server	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
--Task-Section: server
--Task-Description: DNS server
--Task-Extended-Description: Selects the BIND DNS server and its documentation.
--Task-Key: bind9
--
-- * bind9
-- * bind9-doc
 === renamed file 'doc/langpacks.txt' => 'doc/langpacks.txt.THIS'
 === removed file 'lamp-server'
 --- lamp-server	2006-09-14 00:48:30 +0000
 +++ lamp-server	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
--Task-Section: server
--Task-Description: LAMP server
--Task-Extended-Description: Selects a ready-made Linux/Apache/MySQL/PHP server.
--Task-Key: apache2, mysql-server
--
-- * apache2
-- * apache2-mpm-prefork
-- * php5-mysql
-- * libapache2-mod-php5
-- * mysql-server
 === modified file 'live'
 --- live	2012-10-12 19:26:06 +0000
 +++ live	2012-11-08 17:31:26 +0000
@@ -1,7 +1,7 @@
  Task-Per-Derivative: 1
  Task-Section: user
--Task-Description: Ubuntu live CD
--Task-Extended-Description: This task provides the extra packages installed on the Ubuntu live CD. It is neither useful nor recommended to install this task in other environments.
++Task-Description: Xubuntu live CD
++Task-Extended-Description: This task provides the extra packages installed on the Xubuntu live CD. It is neither useful nor recommended to install this task in other environments.
  Task-Relevance: 2
  Task-Key: ubiquity-frontend-gtk
  Task-Test-new-install: skip show
@@ -10,6 +10,7 @@
   * Languages: en
   * language-pack-${Languages}
   * language-pack-gnome-${Languages}
++<<<<<<< TREE
  # subset of English language support which we want by default:
   * libreoffice-help-en-us [i386 amd64]
@@ -25,8 +26,31 @@
   * language-pack-${Languages} [i386 powerpc]
   * language-pack-gnome-${Languages} [i386 powerpc]
++=======
++
++# subset of English language support which we want by default:
++ * firefox-locale-en
++ * hunspell-en-us
++ * wamerican
++
++ * Languages: es zh-hans xh pt
++ * language-pack-${Languages} [!powerpc]
++ * language-pack-gnome-${Languages} [!powerpc]
++
++#Enough room on i386, not enough on amd64:
++ * Languages: fr
++ * language-pack-${Languages} [i386]
++ * language-pack-gnome-${Languages} [i386]
++
++>>>>>>> MERGE-SOURCE
   * gparted
-- * cifs-utils # Needed by casper for CIFS root=
++<<<<<<< TREE
++ * cifs-utils # Needed by casper for CIFS root=
++=======
++ * cifs-utils # Needed by casper for CIFS root=
++
++ * xubuntu-live-settings # lp: #840094
++>>>>>>> MERGE-SOURCE
  == Ubiquity components ==
@@ -34,6 +58,7 @@
   * ubiquity-frontend-gtk
   * ubiquity-ubuntu-artwork
++<<<<<<< TREE
   * ubiquity-slideshow-ubuntu [!armel] [!armhf] # webkit is broken on arm atm (LP: #1066046)
  == Kernel ==
@@ -41,3 +66,6 @@
   * Signed-Kernel-Stem: linux-signed linux-signed-image
   * ${Signed-Kernel-Stem}-generic [amd64]
++=======
++ * ubiquity-slideshow-xubuntu
++>>>>>>> MERGE-SOURCE
 === renamed file 'mail-server' => 'mail-server.THIS'
 === renamed file 'openssh-server' => 'openssh-server.THIS'
 === removed file 'postgresql-server'
 --- postgresql-server	2007-09-19 15:12:33 +0000
 +++ postgresql-server	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
--Task-Section: server
--Task-Description: PostgreSQL database
--Task-Extended-Description: This task selects client and server packages for the PostgreSQL database.
--Task-Extended-Description: .
--Task-Extended-Description: PostgreSQL is an SQL relational database, offering increasing SQL92
--Task-Extended-Description: compliance and some SQL3 features.  It is suitable for use with multi-user
--Task-Extended-Description: database access, through its facilities for transactions and fine-grained
--Task-Extended-Description: locking.
--Task-Key: postgresql
--
-- * postgresql
-- * postgresql-client
-- * postgresql-doc
-- * postgresql-contrib
 === renamed file 'print-server' => 'print-server.THIS'
 === renamed file 'samba-server' => 'samba-server.THIS'
 === renamed file 'server-ship' => 'server-ship.THIS'
 === modified file 'ship'
 --- ship	2012-07-05 12:06:55 +0000
 +++ ship	2012-11-08 17:31:26 +0000
@@ -1,17 +1,28 @@
  == Kernel ==
++<<<<<<< TREE
   * linux [amd64 i386]
++=======
++ * linux [amd64] # not i386 because top-level 'linux' is -generic-pae now
++>>>>>>> MERGE-SOURCE
  == Server ==
   * ssh
   * nfs-kernel-server   # need an NFS server
++<<<<<<< TREE
   * ltsp-server-standalone [amd64 i386] # for LTSP-on-install
   * ltsp-client [amd64 i386]            # for LTSP-on-install
   * ldm [amd64 i386] # seeded because its not a hard dependency of ltsp-client anymore
   * ldm-ubuntu-theme [amd64 i386] # seeded to make it available for LTSP-on-install
   * open-iscsi
   * open-iscsi-udeb
++=======
++ * ltsp-server-standalone [amd64 i386] # for LTSP-on-install
++ * ltsp-client [amd64 i386]            # for LTSP-on-install
++ * ldm [amd64 i386] # seeded because its not a hard dependency of ltsp-client anymore
++ * ldm-xubuntu-theme [amd64 i386] # seeded to make it available for LTSP-on-install
++>>>>>>> MERGE-SOURCE
  == Networking ==
@@ -26,18 +37,30 @@
  == Hardware & Network Access ==
   * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
++<<<<<<< TREE
   * ndiswrapper-utils-1.9 [amd64 i386]
   * ndisgtk
++=======
++ * eagle-usb-utils        # needed for some ADSL modems
++ * bpalogin
++
++>>>>>>> MERGE-SOURCE
   * libatm1	# suggested by ppp for PPP-over-ATM
   * setserial	# needed by folks with nonstandard serial ports
   * b43-fwcutter
  == Common language packs ==
++<<<<<<< TREE
   * Languages: en
++=======
++ # must have
++ * Languages: en es xh pt
++>>>>>>> MERGE-SOURCE
   * language-pack-${Languages}
   * language-pack-gnome-${Languages}
++<<<<<<< TREE
   # no space on powerpc
   * Languages: es
@@ -49,15 +72,34 @@
   * libreoffice-help-en-us [i386 amd64 amd64+mac]
   * hunspell-en-us
   * openoffice.org-hyphenation
++=======
++
++# subset of English language support which we want by default:
++ * firefox-locale-en
++ * hunspell-en-us
++ * wamerican
++
++Enough room on amd64 armel i386, not enough on powerpc:
++ * Languages: de fr bn hi zh-hans ja
++ * language-pack-${Languages} [!powerpc]
++ * language-pack-gnome-${Languages} [!powerpc]
++
++# * Languages: ar ru ja
++# * language-pack-${Languages} [i386]
++# * language-pack-gnome-${Languages} [i386]
++>>>>>>> MERGE-SOURCE
  == Installer ==
   * bootstrap-base
   * grub # needed for dmraid et al
   * oem-config-gtk
++<<<<<<< TREE
   * oem-config-slideshow-ubuntu
   * uboot-mkimage [armel]
   * partman-iscsi
++=======
++>>>>>>> MERGE-SOURCE
  == Transitional packages ==
 === modified file 'ship-live'
 --- ship-live	2012-10-15 09:47:18 +0000
 +++ ship-live	2012-11-08 17:31:26 +0000
@@ -7,8 +7,12 @@
   * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
   * sl-modem-daemon	# needed for some Winmodems (see OutoftheboxWinmodem)
++<<<<<<< TREE
   * ndiswrapper-utils-1.9 [amd64 i386]
   * ndisgtk
++=======
++ * bpalogin
++>>>>>>> MERGE-SOURCE
   * libatm1	# suggested by ppp for PPP-over-ATM
   * setserial	# needed by folks with nonstandard serial ports
@@ -21,14 +25,23 @@
  == Installer ==
++<<<<<<< TREE
   * grub # needed for dmraid et al
   * grub-efi [amd64]
   * grub-efi-amd64-signed [amd64]
   * shim-signed [amd64]
++=======
++ * grub # needed for dmraid et al
++ * grub-efi [amd64]
++>>>>>>> MERGE-SOURCE
   * oem-config-gtk
++<<<<<<< TREE
   * oem-config-slideshow-ubuntu
   * lupin-support [amd64 i386] # installer-for-windows
   * uboot-mkimage [armel] # needed on dove for uboot
++=======
++ * lupin-support [amd64 i386] # installer-for-windows
++>>>>>>> MERGE-SOURCE
  == Blacklist ==
 === modified file 'supported'
 --- supported	2012-09-24 18:33:01 +0000
 +++ supported	2012-11-08 17:31:26 +0000
@@ -1,3 +1,4 @@
++<<<<<<< TREE
  Most of what was formerly in the supported seed is now in the dvd seed. This
  seed now includes some things that are too big for a DVD, and of course also
  inherits from everything else.
@@ -201,9 +202,15 @@
   * postgresql-plpython3-9.1
   * postgresql-pltcl-9.1
++=======
++>>>>>>> MERGE-SOURCE
  = Rescued from Extra =
++<<<<<<< TREE
   * Extra-Include: *-dbg *-debug *-dev *-doc *-docs *-gcj gir1.2-* *-examples
++=======
++ * Extra-Include: *-dbg *-debug *-dev *-doc *-docs *-gcj
++>>>>>>> MERGE-SOURCE
  ... and some miscellaneous exclusions for things we don't want to drag in
  automatically (note that Extra-Exclude *only* prevents packages from being
@@ -213,8 +220,12 @@
   * Extra-Exclude: libgnat*-dev libgnat*-dbg gnat*-doc
   * Extra-Exclude: gpc*-doc
   * Extra-Exclude: lib*mudflap*
++<<<<<<< TREE
   * Extra-Exclude: gfortran-4.1-doc gfortran-4.2-doc gfortran-4.3-doc lib*gfortran1-dbg
   * Extra-Exclude: lib*go0-dbg
++=======
++ * Extra-Exclude: gfortran-4.1-doc gfortran-4.2-doc gfortran-4.3-doc lib*gfortran1-dbg
++>>>>>>> MERGE-SOURCE
   * Extra-Exclude: lib*objc1-dbg
   * Extra-Exclude: libavformat-dev libpostproc-dev
   * Extra-Exclude: libgdchart-gd2-xpm-dev
@@ -228,6 +239,7 @@
   * Extra-Exclude: libxaw6*		# built from the same source as libxaw7*
   * Extra-Exclude: nvidia-glx-legacy-dev # nvidia-glx-legacy is unsupportable
   * Extra-Exclude: python-qt3-gl-dbg # We don't want python-qt3-gl in main
++<<<<<<< TREE
   * Extra-Exclude: python-qt4-gl python-qt4-gl-dbg # We don't want python-qt4-gl in main
   * Extra-Exclude: g77-doc # pulls in gcc-3.4
   * Extra-Exclude: libkiten-dev
@@ -247,6 +259,24 @@
   * Extra-Exclude: packagekit-dbg
   * Extra-Exclude: rest-bench-dbg
   * Extra-Exclude: grub-coreboot-dbg grub-emu-dbg grub-ieee1275-dbg
++=======
++ * Extra-Exclude: python-qt4-gl python-qt4-gl-dbg # We don't want python-qt4-gl in main
++ * Extra-Exclude: g77-doc # pulls in gcc-3.4
++ * Extra-Exclude: libkiten-dev
++ * Extra-Exclude: sendmail-doc
++ * Extra-Exclude: mono-dbg # only useful with mono-debugger, currently in universe
++ * Extra-Exclude: python-renderpm-dbg
++ * Extra-Exclude: python-reportlab-accel-dbg # packages aren't in main, -dbg shouldn't cause them to be
++ * Extra-Exclude: libnewlib-dev # not used in main, we only want newlib-spu for powerpc
++ * Extra-Exclude: sendmail-doc # sendmail source is only in main for libmilter
++ * Extra-Exclude: libgnumail-java-doc # depends on classpath
++ * Extra-Exclude: libcommons-dbcp-java-doc # depends on classpath
++ * Extra-Exclude: javacc-doc # depends on classpath
++ * Extra-Exclude: virtuoso-vad-doc # depends on binaries that were not MIR-approved
++ * Extra-Exclude: libgl1-mesa-dri-experimental-dbg # LP: #638097
++ * Extra-Exclude: python-vigra-doc # libvigraimpex is in main, but nothing uses python-vigra
++
++>>>>>>> MERGE-SOURCE
  Transitional packages:
@@ -269,6 +299,7 @@
   * Extra-Exclude: python-qt3-dbg
   * Extra-Exclude: python-qtext-dbg
   * Extra-Exclude: qt-x11-free-dbg
++<<<<<<< TREE
  Temporary workarounds:
@@ -284,3 +315,5 @@
   * checkbox-gtk # still supported by the checkbox team and default "testing apps" applications (-qt doesn't support it yet)
   * icedtea-plugin
   * evolution # still supported for business environment
++=======
++>>>>>>> MERGE-SOURCE
 === added file 'supported-desktop-extra'
 --- supported-desktop-extra	1970-01-01 00:00:00 +0000
 +++ supported-desktop-extra	2012-11-08 17:31:26 +0000
@@ -0,0 +1,1 @@
++This seed exists only to allow fine tuning the 3y support time
 === renamed file 'supported-desktop-extra' => 'supported-desktop-extra.moved'