Merge lp:~mythbuntu/ubuntu-seeds/mythbuntu.jaunty into lp:~mythbuntu-dev/ubuntu-seeds/mythbuntu.hardy

[Mario Limonciello]

=== modified file 'STRUCTURE'
--- STRUCTURE	2008-04-16 14:32:31 +0000
+++ STRUCTURE	2010-04-06 15:48:19 +0000
@@ -1,14 +1,9 @@
-include platform.hardy
-desktop: desktop-common
-openssh-server: standard
-samba-server: standard
-backend-master: desktop
-backend-slave: desktop
-frontend: desktop
-server-ship: boot openssh-server samba-server
-ship: boot desktop d-i-requirements common backend-master backend-slave frontend
-live: desktop common
+include platform.jaunty
+desktop:
+backend-master:
+backend-slave:
+frontend:
+ship: boot desktop d-i-requirements backend-master backend-slave frontend
+live: desktop
 ship-live: boot live
-development: desktop
-common: standard
-supported: server-ship ship ship-live development supported-common backend-master
+supported: ship ship-live supported-common backend-master

=== removed file 'common'
--- common	2008-04-09 06:14:35 +0000
+++ common	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-= MythTV =
-Applications
- * mythtv-frontend
- * mplayer
- * xine-ui
- * vlc
- * mythtv-backend-master
- * mythtv
-
-Plugins / Themes
- * mythweb
- * mythvideo
- * mythnews
- * mythflix
- * mythweather
- * mythgame
- * mythmusic
- * mythgallery
- * mythtv-themes
- * mythphone
- * mytharchive
- * mythcontrols
- * mythbrowser
- * mythstream
- * mythmovies
-
-= Lirc =
- * lirc
- * mythbuntu-lirc-generator

=== modified file 'desktop'
--- desktop	2008-04-08 23:32:05 +0000
+++ desktop	2010-04-06 15:48:19 +0000
@@ -5,6 +5,10 @@
 Task-Key: mythbuntu-desktop
 
 = Ubuntu Packages =
+
+Swanky swag
+ * notify-osd
+
 Restricted Modules support
  * jockey-gtk
 
@@ -15,6 +19,7 @@
  * (avahi-autoipd)  # IPv4 link-local interface configuration support
  * (network-manager-gnome)
  * (gnome-system-tools)
+ * (policykit-gnome)
 
 ACPI Support
  * acpi
@@ -38,19 +43,39 @@
  * mythbuntu-gdm-theme
  * gtk2-engines-mythbuntu
  * mythbuntu-default-settings
- * mythtv-theme-mythbuntu
+ * (mythtv-theme-mythbuntu)
 
 Useful Packages
  * mythbuntu-desktop
  * mythbuntu-control-centre
+ * mythbuntu-lirc-generator
 
 MythTV
  * mythtv-common
- * (mythtv-status)
-
-BulletProofX
- * displayconfig-gtk
-
+ * (mythtv)
+ * (mythtv-backend-master)
+
+
+Media Apps
+ * (mplayer)
+ * (xine-ui)
+ * (vlc)
+
+Plugins
+ * (mythweb)
+ * (mythvideo)
+ * (mythweather)
+ * (mythmusic)
+ * (mythgallery)
+ * (mytharchive)
+ * (mythcontrols)
+ * (mythmovies)
+
+
+Useful utilities
+ * (xmltv)
+ * (dvb-utils)
+ * (hdhomerun-config)
 
 Update Support
  * update-manager
@@ -58,9 +83,7 @@
 
 XFCE Based Stuff
  * (thunar)
- * (xfce4-icon-theme)
- * xfce4-mcs-manager
- * xfce4-mcs-plugins
+ * (tango-icon-theme)
  * xfce4-panel
  * xfce4-session
  * xfce4-utils
@@ -71,6 +94,7 @@
 
 =MythTV Themes=
 Official
+ * (mythtv-themes)
  * (mythtv-theme-gray-osd)
  * (mythtv-theme-isthmus)
  * (mythtv-theme-iulius)
@@ -90,6 +114,23 @@
  * (mythtv-theme-blootubelite-wide)
  * (mythtv-theme-glass-wide)
  * (mythtv-theme-neon-wide)
+ * (mythtv-theme-metallurgy-wide)
+ * (mythtv-theme-metallurgy-osd)
  * (mythtv-theme-projectgrayhem)
  * (mythtv-theme-projectgrayhem-osd)
  * (mythtv-theme-projectgrayhem-wide)
+
+Support
+ * (mythbuntu-log-grabber)
+
+Kernel Modules
+ * (gcc)
+ * (make)
+ * (linux-headers-generic) [i386]
+ * (linux-headers-powerpc) [powerpc]
+ * (linux-headers-powerpc64-smp) [powerpc]
+ * (linux-headers-generic) [amd64]
+
+Services
+ * (openssh-server)
+ * (samba)

=== removed file 'development'
--- development	2008-02-17 02:08:07 +0000
+++ development	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-Moved from desktop:
-
- * python-adns              # MRS, stable and useful
- * python-apt               # MRS, we need to be able to interact with APT
- * python-cddb              # MRS, great for desktop users to be able to manage CD's in Python
- * python-clientcookie      # MRS, unless a better cgi-style framework is below
- * python-crypto            # MRS, very useful even though it's very specific
- * python-egenix-mxproxy    # MRS, 
- * python-egenix-mxstack    # MRS, 
- * python-egenix-mxtexttools # MRS, 
- * python-egenix-mxtools    # MRS, 
- * python-epydoc            # MRS, 
- * python-examples          # MRS, 
- * python2.4-examples       # as long as we have 2.4 in main
- * python-gd                # MRS, 
- * python-genetic
- * python-geoip
- * python-gnupginterface
- * python-gst0.10
- * python-htmlgen
- * python-id3lib
- * python-imaging-sane
- * python-jabber
- * python-dictclient
- * python-librdf
- * python-pycurl
- * python-ldap
- * python-mysqldb
- * python-newt
- * python-pam
- * python-pexpect
- * python-pisock
- * python-pqueue
- * python-pyao
- * python-pylibacl
- * python-pyopenssl
- * python-pyvorbis
- * python-pyxattr
- * python-reportlab
- * python-simpletal
- * python-unit
- * python-xdg                   # SebastienBacher
- * python-xmpp
- * python-libxml2
- * python-libxslt1
-
-Moved from supported:
-
- * python-pygresql         # JamesTroup, from hoglet
- * python-nevow
- * python-twisted
- * python-samba
- * idle             # Python IDE
- * python-pullparser        # modules, where python2.4-foo is in main
- * python-gpod

=== removed directory 'doc'
=== removed file 'doc/langpacks.txt'
--- doc/langpacks.txt	2007-03-15 13:01:01 +0000
+++ doc/langpacks.txt	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-Language pack sizes
-===================
-
-langpack-o-matic has a script 'langpacksize' that helps to determine
-which packages fit on the CDs. You can download the latest version from 
-
-  http://codebrowse.launchpad.net/~pitti/langpack-o-matic/main/files
-
-This script prints a table of languages vs. categories and their
-single and cumulative sizes; by default, the numbers are bytes, but
-when being invoked with 'MB' as first argument, the numbers will be
-MB.
-
-E. g.:
-
-en     G:     5.30  K:     5.55  G+K:     7.93  GSum:     5.30  KSum:     5.55 G+KSum:     7.93
-es     G:     3.57  K:     4.76  G+K:     6.16  GSum:     8.87  KSum:    10.32 G+KSum:    14.09
-
-'G' is the size of base+gnome (as needed for Ubuntu CDs), 'K' is the
-size of base+kde (Kubuntu), 'G+K' is the size of base+gnome+kde
-(Edubuntu). In this context, 'base' means packages which are UI
-independent, such as coreutils, gcc, or hwdb-client.
-
-The 'Sum' field show the cumulative size of the packages for that
-language and all languages above it.
-
-The list is vertically ordered by the priority, i. e. they should be
-added from top to down.
-
-Please note that these sizes do not only include language-pack-*, but
-also the size of packages that provide input support for a particular
-language.
-
-
-Input support packages
-======================
-
-When shipping a language on a CD, the required input support packages
-must be shipped as well:
-
-zh: scim-chewing scim-pinyin scim-tables-zh
-ja: scim-anthy
-ko: scim-hangul
-am ar bn gu hi kn ml ne pa ru ta te vi: scim-tables-additional

=== modified file 'live'
--- live	2008-04-11 15:09:13 +0000
+++ live	2010-04-06 15:48:19 +0000
@@ -1,10 +1,9 @@
 Task-Per-Derivative: 1
 Task-Section: user
 Task-Description: Mythbuntu 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-Extended-Description: This task provides the extra packages installed on the Mythbuntu live CD. It is neither useful nor recommended to install this task in other environments.
 Task-Relevance: 2
 Task-Key: ubiquity-frontend-mythbuntu
-Task-Seeds: common
 Task-Test-new-install: skip show
 
 = Ubiquity components =
@@ -25,24 +24,3 @@
  * thunar
  * thunar-volman
  * gnome-mount
-
-= Live CD Installable or Removable possibilities =
- * vnc4-common
- * x11vnc
- * openssh-server
- * libgnome2-perl
- * samba
-
-= Additional Live Session Requirements =
- * squashfs-tools
- * casper
- * discover1
- * language-selector-common
- * dpkg-dev
-
-= Network Manager on live disk =
- * network-manager-gnome
- * gnome-system-tools
-
-= Update Support =
- * update-notifier

=== removed file 'openssh-server'
--- openssh-server	2007-08-23 09:17:33 +0000
+++ openssh-server	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-Task-Section: server
-Task-Description: OpenSSH server
-Task-Extended-Description: Selects packages needed for an OpenSSH server.
-Task-Key: openssh-server
-
- * openssh-server

=== removed file 'samba-server'
--- samba-server	2007-09-21 14:57:59 +0000
+++ samba-server	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Task-Section: server
-Task-Description: Samba File server
-Task-Extended-Description: This task sets up your system to be a Samba file server, which is 
-Task-Extended-Description: especially suitable in networks with both Windows and Linux systems.
-Task-Key: samba
-
- * samba
- * samba-doc
- * smbclient
- * smbfs
- * winbind

=== removed file 'server-ship'
--- server-ship	2008-02-17 02:08:07 +0000
+++ server-ship	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-= Kernel =
-
-We seed both linux-* and linux-image-* so that it's easier to build CD
-images without the restricted component. The linux-* kernels include
-restricted modules.
-
- * Kernel-Stem: linux linux-image
-
-== i386 ==
-
- * ${Kernel-Stem}-server [i386]
- * ${Kernel-Stem}-server-bigiron [i386]
- * linux-headers-server [i386]
- * linux-headers-server-bigiron [i386]
-
-== powerpc ==
-
- * ${Kernel-Stem}-powerpc-smp [powerpc]
- * linux-headers-powerpc-smp [powerpc]
-
-== amd64 ==
-
- * ${Kernel-Stem}-server [amd64]
- * linux-headers-server [amd64]
-
-== sparc ==
-
- * ${Kernel-Stem}-sparc64-smp [sparc]
- * linux-headers-sparc64-smp [sparc]
-
-== hppa ==
-
- * ${Kernel-Stem}-hppa32 [hppa]
- * ${Kernel-Stem}-hppa64 [hppa]
- * linux-headers-hppa32 [hppa]
- * linux-headers-hppa64 [hppa]
-
-== ia64 ==
-
- * ${Kernel-Stem}-itanium [ia64]
- * ${Kernel-Stem}-mckinley [ia64]
- * linux-headers-itanium [ia64]
- * linux-headers-mckinley [ia64]
-
-= From Ship =
-
- * ssh
- * lsb-core
- * lsb-cxx
- * ntp
- * nis
- * mailx
- * mutt
- * build-essential
- * fakeroot
- * devscripts
- * setserial
-
-== Filesystems ==
-
- * xfsprogs
- * jfsutils
- * hfsplus [powerpc]  # ColinWatson
- * lvm2
- * mdadm
- * dmsetup
- * cryptsetup
-
-== For language support in the installer ==
-
- * console-terminus
- * unifont
-
-= Cluster =
-
- * redhat-cluster-suite
- * ocfs2-tools
- * libaio1
- * libaio-dev
- * ipvsadm
- * keepalived
- * multipath-tools
-
-= Servers and Daemons =
-
-Samba:
-
- * %samba
-
-Database:
-
- * %mysql-dfsg-5.0
- * %postgresql-8.2
-
-Proxy:
-
- * squid # RobertCollins
-
-LDAP:
-
- * slapd
- * ldap-utils
- * ldap-auth-client	# metapackage that pulls in lib{pam,nss}-ldap and configuration magic
-
-Web:
-
- * %apache2
- * libapache2-mod-auth-mysql # FabioMassimoDiNitto
- * libapache2-mod-auth-pgsql # FabioMassimoDiNitto
- * libapache2-mod-macro      # FabioMassimoDiNitto
- * libapache2-mod-perl2 # python is in supported
- * libapache2-mod-python        #ThomMay
- * libapache2-mod-python-doc    #ThomMay
- * libapache2-mod-auth-pam       # FabioMassimoDiNitto
- * libapache2-mod-auth-plain     # FabioMassimoDiNitto
- * libapache2-mod-auth-sys-group # FabioMassimoDiNitto
- * libapache2-mod-security       # FabioMassimoDiNitto
-
- * zope3-sandbox
-
- * elinks
-
-PHP:
-
- * %php5
-
-Email:
-
- * %dovecot                   # ThomMay
- * %exim4
- * %postfix
-
-Must also consider webmail and so on...
-
-FTP/TFTP:
-
- * vsftpd # a secure ftpd
- * tftpd-hpa # The one from OpenBSD which supports PXE
- * tftp-hpa # client
-
-Other:
-
- * dhcp3-server
- * snmp
- * snmpd
- * sensord
- * lm-sensors
- * openbsd-inetd
- * nbd-server
-
-Application Servers:
-
- * python-moinmoin        # moin (>= 1.5)
- * mailman
-
-RCS:
-
- * %subversion
- * cvs
- * git-core
- * bzr
-
-Utilities:
-
- * analog                 # essential for any web server, possible candidate for desktop integration
- * graphviz
-
-= Network =
-
- * nmap                   # network diagnostics
- * dnstracer              # dns network diagnostics
- * iptraf                 # sysadmin's toy, may be a candidate for removal
- * traceroute             # we have iputils-tracepath in base, this is only for real traceroute lovers
- * pptpd                  # server that allows setup of Microsoft-compatible VPN
- * ifenslave-2.6          # interface bonding/trunking/etherchannel
- * ipsec-tools            # IPsec configuration
- * vlan                   # userland tools to config 8021q support
- * bridge-utils           # userland tools to config kernel bridging feature
-
-IPv6 tools:
-
- * freenet6               # FabioMassimoDiNitto
- * radvd                  # FabioMassimoDiNitto
- * quagga                 # RobertCollins
-
-Firewall:
-
- * shorewall
-
-Security:
-
- * cricket                # JamesTroup, from Hoglet
- * checksecurity          # JamesTroup, from Hoglet
- * aide                   # JamesTroup, from Hoglet
-
-Download:
- * bittornado             # used on the servers.
-
-= Shells =
-
- * zsh
-
-= System Administration Tools =
-
- * attr                 # will move to base if we go to selinux
- * quota
- * backuppc             # RobertCollins
- * debian-goodies
- * whois                # FabioMassimoDiNitto
- * minicom              # useful for serial access to anything
- * cu                   # super-basic serial access
- * john                 # detects weak passwords, might be needed in desktop
- * libpam-cracklib      # enables weak password checking during password change, should it be in desktop?
- * chkrootkit           # forensic detection of rootkit
- * xinetd               # JamesTroup, from hoglet
- * libcap-bin
- * libpam-opie
- * opie-client
- * opie-server
- * sasl2-bin
- * autofs
- * awstats
- * acct
- * authbind                     # BIGGER SECURITAH REVIEW
- * siege
- * bonnie++
- * smartmontools   # hard disk diagnostics
- * mtx		   # ChuckShort - ServerPackageReview
- * logwatch	   # ChuckShort - ServerPackageReview
-
-= Documentation =
-
- * ubuntu-serverguide
-
-== Miscellaneous ==
-
- * miscfiles
- * lilo
-
-kill if we run out of space
-== LTSP ==
-
- * ltsp-server
- * ltsp-server-standalone
-
-= From desktop =
-
- * bc
- * screen
- * lftp
- * slocate              # tool to index user files
- * zip
- * unzip                # also used for .zip support in file-roller
- * cupsys                       # our preferred printer management infrastructure
- * cupsys-bsd                   # gives us lpc, lpq, lpr, lprm
- * cupsys-client                # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
- * foomatic-db-engine           # integrate the foomatic printer driver engine
- * foomatic-db                  # the foomatic printer driver database
- * foomatic-filters             # converter from postscript to printer-specific formats
- * foomatic-db-hpijs            # printer drivers from the hp inkjet project
- * openprinting-ppds
- * cupsys-driver-gutenprint     # a ton of cupsys ppds, for real comprehensive printer support
- * pnm2ppa                      # several ppds require this
- * ghostscript                  # some ppds require this
- * hplip                        # support for HP all-in-one printers
- * libxp6 # required for some third party apps. See #15739
-
-== Blacklist ==
-
-libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
-
- * !libavcodec*

=== modified file 'ship-live'
--- ship-live	2008-02-17 02:08:07 +0000
+++ ship-live	2010-04-06 15:48:19 +0000
@@ -3,43 +3,22 @@
 installing the contents of the live CD in order to get online and fetch more
 packages.
 
-== Development ==
-
-These packages are needed in order to build Ubuntu packages.
-
- * build-essential
- * fakeroot
-
-== Hardware & Network Access ==
- * network-manager-gnome
-
-
-
-
- * ndiswrapper-utils [amd64 i386]
- * ndiswrapper-utils-1.9 [amd64 i386]
-
-
-
-
-
-* linux-wlan-ng
- * avm-fritz-firmware
-
-
-
-
- * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems
- * elfspe2 [powerpc] # SPE access for Cell systems
-
 == Video Drivers ==
+
  * xorg-driver-fglrx
- * nvidia-glx
- * nvidia-glx-new
- * nvidia-glx-legacy
+
+ * nvidia-glx-180
+# * nvidia-glx-177
+ * nvidia-glx-173
+ * nvidia-glx-96
+ * nvidia-glx-71
 
 == Services ==
- * vnc4server
+
+# vnc4server doesn't work with newer xorg
+# * vnc4server
+ * x11vnc
+
  * nfs-kernel-server
  * portmap
- * xmltv
+ * hdhomerun-config