[Branch ~ubuntu-core-dev/ubuntu-seeds/xubuntu.hardy] Rev 754: * Merge from xubuntu-dev ree.

[noreply at launchpad.net]

------------------------------------------------------------
revno: 754
committer: Luke Yelavich <luke.yelavich at canonical.com>
branch nick: xubuntu.hardy
timestamp: Thu 2008-04-10 13:46:53 +1000
message:
  * Merge from xubuntu-dev ree.
modified:
  desktop
  live
  ship
  supported
    ------------------------------------------------------------
    revno: 744.1.8
    committer: Cody A.W. Somerville <cody-somerville at ubuntu.com>
    branch nick: xubuntu.hardy
    timestamp: Thu 2008-04-10 00:41:20 -0300
    message:
      Merged in ubuntu-core-dev seeds.
    modified:
      supported
    ------------------------------------------------------------
    revno: 744.1.7
    committer: Cody A.W. Somerville <cody-somerville at ubuntu.com>
    branch nick: xubuntu.hardy
    timestamp: Wed 2008-04-09 22:52:33 -0300
    message:
      Attempt to fix the language package situation, a bit of cleanup, and seed xfce4-governor-plugin in desktop.
    modified:
      desktop
      live
      ship
      supported

=== modified file 'desktop'
--- a/desktop	2008-04-02 23:02:35 +0000
+++ b/desktop	2008-04-10 01:52:33 +0000
@@ -73,6 +73,7 @@
  * (xfce4-smartbookmark-plugin)
  * (xfce4-dict-plugin)
  * (xfce4-places-plugin)
+ * (xfce4-governor-plugin)
 
  * (orage)
  * thunar

=== modified file 'live'
--- a/live	2007-11-22 17:15:09 +0000
+++ b/live	2008-04-10 01:52:33 +0000
@@ -6,21 +6,26 @@
 Task-Key: ubiquity-frontend-gtk
 Task-Test-new-install: skip show
 
- * Languages: en zh es bn hi ar xh pt ru ja de fr
+ * Languages: en
  * language-pack-${Languages}
+ * aspell-${Languages}
+ * myspell-en-gb       
+ * myspell-en-us
+ * myspell-en-za
+ * myspell-en-au
+ * gimp-help-${Languages}
  * language-pack-gnome-${Languages}
- * mozilla-firefox-locale-${Languages}
  * thunderbird-locale-${Languages}
 
- # other languages, alphabetically, up to CD limit
- * Languages: af am as az be bg br bs ca cs cy da el eo et eu fa fi ga gl gu he hr hu ia id is it ka kn ko ku lg li lo lt lv mg mi mk ml mn mr ms my nb ru se si sk sl uk vi yi hu ro ca af zu
- * language-pack-${Languages} [i386 amd64]
+ * Languages: es bn ja de fr pt xh hi ar ru af am as az be bg br bs ca cs cy da el eo et eu fa fi ga gl gu he hr hu ia id is it ka kn ko ku lg li lo lt lv mg mi mk ml mn mr ms my nb  ne nl nn no or pa pl rm r$
+ * language-pack-${Languages}
+ * aspell-${Languages}
+ * myspell-${Languages}
+ * gimp-help-${Languages}
  * language-pack-gnome-${Languages}
-# * mozilla-firefox-locale-${Languages}
-# * thunderbird-locale-${Languages}
+ * thunderbird-locale-${Languages}
 
  * ntfsprogs
-
  * gparted
 
 == Ubiquity components ==

=== modified file 'ship'
--- a/ship	2008-03-21 11:19:33 +0000
+++ b/ship	2008-04-10 01:52:33 +0000
@@ -12,11 +12,6 @@
  * lsb-cxx [amd64 hppa i386 ia64 sparc]
  * lsb-graphics [amd64 hppa i386 ia64 sparc]
 
-== OOo2 ==
-
-== * openoffice.org-gtk	# before OOo to avoid openoffice.org-style-default
-== * openoffice.org
-
 == Server ==
 
  * ssh
@@ -70,20 +65,24 @@
 
 == Common language packs ==
 
- # languages which have language-support installed too
  * Languages: en
  * language-pack-${Languages}
+ * aspell-${Languages}
+ * myspell-en-gb
+ * myspell-en-us
+ * myspell-en-za
+ * myspell-en-au
+ * gimp-help-${Languages}
+ * language-pack-gnome-${Languages}
+ * thunderbird-locale-${Languages}
 
- # most popular languages
- * Languages: es bn ja de fr pt xh hi ar ru
+ * Languages: es bn ja de fr pt xh hi ar ru af am as az be bg br bs ca cs cy da el eo et eu fa fi ga gl gu he hr hu ia id is it ka kn ko ku lg li lo lt lv mg mi mk ml mn mr ms my nb  ne nl nn no or pa pl rm ro rw se si sk sl sq sr sv ta tg th tk tl tr ug uk ur uz vi wa wo yi yo zu
  * language-pack-${Languages}
-
- # other languages, alphabetically, up to CD limit
- * Languages: af am as az be bg br bs ca cs cy da el eo et eu fa fi ga gl gu he hr hu ia id is it ka kn ko ku lg li lo lt lv mg mi mk ml mn mr ms my nb
- * language-pack-${Languages} [i386 amd64]
-
- * Languages: ne nl nn no or pa pl rm ro rw se si sk sl sq sr sv ta tg th tk tl tr ug uk ur uz vi wa wo yi yo zu
- * language-pack-${Languages} [i386 amd64]
+ * aspell-${Languages}
+ * myspell-${Languages}
+ * gimp-help-${Languages}
+ * language-pack-gnome-${Languages}
+ * thunderbird-locale-${Languages}
 
 == Installer ==
 

=== modified file 'supported'
--- a/supported	2008-04-04 13:11:38 +0000
+++ b/supported	2008-04-10 03:41:20 +0000
@@ -4,12 +4,7 @@
 
 = Desktop =
 
- * openoffice.org-filter-binfilter
  * libuno-cil
- * openoffice.org-style-andromeda
- * openoffice.org-style-default
- * openoffice.org-style-industrial
- * openoffice.org-style-tango
  * gnome-accessibility-themes-extras
 
 = Standards =
@@ -167,11 +162,6 @@
  * libc6-prof [amd64 i386 lpia powerpc sparc hppa]
  * libc6.1-prof [ia64]
  * gcc-4.2-locales
- * openoffice.org-qa-tools
- * openoffice.org-qa-api-tests
- * openoffice.org-officebean
- * openoffice.org-help-br
- * openoffice.org-l10n-br
  * libxsltc-java
 
 == Documentation ==
@@ -265,4 +255,7 @@
 
  * /^language-pack-[^-]+$/
  * /^language-pack-gnome-[^-]+$/
- * /^language-support-[^-]+$/
+
+= OMG! =
+
+ * firefox-themes-ubuntu



--
Xubuntu Hardy Seeds
https://code.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/xubuntu.hardy

You are receiving this branch notification because you are subscribed to it.