Changeset 4804


Ignore:
Timestamp:
Jul 8, 2011, 11:18:25 AM (9 years ago)
Author:
fasma
Message:

Added caixamagicalxde-meta package

Location:
packages/cm16/caixamagicalxde-meta
Files:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/caixamagicalxde-meta/cmiffy/debdiff.patch

    r4803 r4804  
     1diff -Naur lubuntu-meta-0.24.orig//core-amd64 lubuntu-meta-0.24//core-amd64
     2--- lubuntu-meta-0.24.orig//core-amd64  2011-04-25 19:54:27.000000000 +0100
     3+++ lubuntu-meta-0.24//core-amd64       2011-07-08 11:00:56.481384879 +0100
     4@@ -1,10 +1,10 @@
     5 dbus-x11
     6-lubuntu-artwork
     7-lubuntu-default-settings
     8+caixamagicalxde-artwork
     9+caixamagicalxde-default-settings
     10 lxpanel
     11 lxsession
     12 openbox
     13 pcmanfm
     14-plymouth-theme-lubuntu-logo
     15-plymouth-theme-lubuntu-text
     16+plymouth-theme-caixamagicalxde-logo
     17+plymouth-theme-caixamagicalxde-text
     18 xorg
     19diff -Naur lubuntu-meta-0.24.orig//core-armel lubuntu-meta-0.24//core-armel
     20--- lubuntu-meta-0.24.orig//core-armel  2011-04-25 19:55:32.000000000 +0100
     21+++ lubuntu-meta-0.24//core-armel       2011-07-08 11:00:30.831384893 +0100
     22@@ -1,10 +1,10 @@
     23 dbus-x11
     24-lubuntu-artwork
     25-lubuntu-default-settings
     26+caixamagicalxde-artwork
     27+caixamagicalxde-default-settings
     28 lxpanel
     29 lxsession
     30 openbox
     31 pcmanfm
     32-plymouth-theme-lubuntu-logo
     33-plymouth-theme-lubuntu-text
     34+plymouth-theme-caixamagicalxde-logo
     35+plymouth-theme-caixamagicalxde-text
     36 xorg
     37diff -Naur lubuntu-meta-0.24.orig//core-i386 lubuntu-meta-0.24//core-i386
     38--- lubuntu-meta-0.24.orig//core-i386   2011-04-25 19:53:55.000000000 +0100
     39+++ lubuntu-meta-0.24//core-i386        2011-07-08 10:59:56.211384908 +0100
     40@@ -1,10 +1,10 @@
     41 dbus-x11
     42-lubuntu-artwork
     43-lubuntu-default-settings
     44+caixamagicalxde-artwork
     45+caixamagicalxde-default-settings
     46 lxpanel
     47 lxsession
     48 openbox
     49 pcmanfm
     50-plymouth-theme-lubuntu-logo
     51-plymouth-theme-lubuntu-text
     52+plymouth-theme-caixamagicalxde-logo
     53+plymouth-theme-caixamagicalxde-text
     54 xorg
     55diff -Naur lubuntu-meta-0.24.orig//core-ia64 lubuntu-meta-0.24//core-ia64
     56--- lubuntu-meta-0.24.orig//core-ia64   2010-11-14 16:18:08.000000000 +0000
     57+++ lubuntu-meta-0.24//core-ia64        2011-07-08 10:59:20.811384924 +0100
     58@@ -1,7 +1,7 @@
     59 dbus-x11
     60-lubuntu-artwork
     61-lubuntu-default-settings
     62-lubuntu-plymouth-theme
     63+caixamagicalxde-artwork
     64+caixamagicalxde-default-settings
     65+caixamagicalxde-plymouth-theme
     66 lxpanel
     67 lxsession
     68 openbox
     69diff -Naur lubuntu-meta-0.24.orig//core-powerpc lubuntu-meta-0.24//core-powerpc
     70--- lubuntu-meta-0.24.orig//core-powerpc        2011-04-25 19:55:00.000000000 +0100
     71+++ lubuntu-meta-0.24//core-powerpc     2011-07-08 10:58:54.191384935 +0100
     72@@ -1,10 +1,10 @@
     73 dbus-x11
     74-lubuntu-artwork
     75-lubuntu-default-settings
     76+caixamagicalxde-artwork
     77+caixamagicalxde-default-settings
     78 lxpanel
     79 lxsession
     80 openbox
     81 pcmanfm
     82-plymouth-theme-lubuntu-logo
     83-plymouth-theme-lubuntu-text
     84+plymouth-theme-caixamagicalxde-logo
     85+plymouth-theme-caixamagicalxde-text
     86 xorg
     87diff -Naur lubuntu-meta-0.24.orig//core-sparc lubuntu-meta-0.24//core-sparc
     88--- lubuntu-meta-0.24.orig//core-sparc  2010-11-14 16:18:08.000000000 +0000
     89+++ lubuntu-meta-0.24//core-sparc       2011-07-08 10:58:20.751384949 +0100
     90@@ -1,7 +1,7 @@
     91 dbus-x11
     92-lubuntu-artwork
     93-lubuntu-default-settings
     94-lubuntu-plymouth-theme
     95+caixamagicalxde-artwork
     96+caixamagicalxde-default-settings
     97+caixamagicalxde-plymouth-theme
     98 lxpanel
     99 lxsession
     100 openbox
     101diff -Naur lubuntu-meta-0.24.orig//debian/control lubuntu-meta-0.24//debian/control
     102--- lubuntu-meta-0.24.orig//debian/control      2010-11-14 16:18:08.000000000 +0000
     103+++ lubuntu-meta-0.24//debian/control   2011-07-08 10:55:38.401385022 +0100
     104@@ -1,4 +1,4 @@
     105-Source: lubuntu-meta
     106+Source: caixamagicalxde-meta
     107 Section: metapackages
     108 Priority: optional
     109 Maintainer: Lubuntu Team <lubuntu-desktop@lists.launchpad.net>
     110@@ -6,19 +6,21 @@
     111 Standards-Version: 3.8.3
     112 Build-Depends: debhelper (>= 7.0.50), germinate (>= 1.18)
     113 
     114-Package: lubuntu-desktop
     115+Package: caixamagicalxde-desktop
     116 Architecture: i386 amd64 powerpc ia64 sparc lpia armel
     117 Depends: ${germinate:Depends}, ${misc:Depends}
     118 Recommends: ${germinate:Recommends}
     119-Description: Lubuntu Desktop environment
     120- This package is the LXDE desktop as a lightweight Ubuntu environment.
     121+Conflicts: lubuntu-desktop
     122+Description: Caixa Magica LXDE Desktop environment
     123+ This package is the LXDE desktop as a lightweight Caixa Magica environment.
     124 
     125-Package: lubuntu-core
     126+Package: caixamagicalxde-core
     127 Architecture: i386 amd64 powerpc ia64 sparc lpia armel
     128 Depends: ${germinate:Depends}, ${misc:Depends}
     129 Recommends: ${germinate:Recommends}
     130-Description: Lubuntu Desktop environment - minimal installation
     131- This package is the LXDE desktop as a lightweight Ubuntu environment.
     132+Conflicts: lubuntu-core
     133+Description: Caixa Magica LXDE Desktop environment - minimal installation
     134+ This package is the LXDE desktop as a lightweight Caixa Magica environment.
     135  .
     136- This package provides the minimal installation of Lubuntu.
     137+ This package provides the minimal installation of Caixa Magica LXDE.
     138 
     139diff -Naur lubuntu-meta-0.24.orig//desktop-amd64 lubuntu-meta-0.24//desktop-amd64
     140--- lubuntu-meta-0.24.orig//desktop-amd64       2011-04-25 19:54:27.000000000 +0100
     141+++ lubuntu-meta-0.24//desktop-amd64    2011-07-08 11:15:39.141384491 +0100
     142@@ -1,9 +1,7 @@
     143-abiword
     144 ace-of-penguins
     145 alsa-base
     146 alsa-utils
     147 anacron
     148-apport-gtk
     149 audacious
     150 audacious-plugins
     151 chromium-browser
     152@@ -24,8 +22,6 @@
     153 gnome-power-manager
     154 gnome-system-tools
     155 gnome-time-admin
     156-gnumeric
     157-gnumeric-doc
     158 gpicview
     159 gucharmap
     160 guvcview
     161@@ -35,8 +31,15 @@
     162 jockey-gtk
     163 language-selector-gnome
     164 leafpad
     165+libreoffice-calc
     166+libreoffice-gnome
     167+libreoffice-help-en-us
     168+libreoffice-impress
     169+libreoffice-math
     170+libreoffice-style-human
     171+libreoffice-writer
     172 logrotate
     173-lubuntu-core
     174+caixamagicalxde-core
     175 lxappearance
     176 lxappearance-obconf
     177 lxdm
     178@@ -52,7 +55,7 @@
     179 lzma
     180 mobile-broadband-provider-info
     181 modemmanager
     182-mtpaint
     183+shotwell
     184 network-manager-gnome
     185 ntp
     186 nvidia-common
     187@@ -66,6 +69,7 @@
     188 ppp
     189 scrot
     190 simple-scan
     191+software-center
     192 software-properties-gtk
     193 sylpheed
     194 sylpheed-doc
     195diff -Naur lubuntu-meta-0.24.orig//desktop-armel lubuntu-meta-0.24//desktop-armel
     196--- lubuntu-meta-0.24.orig//desktop-armel       2011-04-25 19:55:32.000000000 +0100
     197+++ lubuntu-meta-0.24//desktop-armel    2011-07-08 11:12:46.571384567 +0100
     198@@ -1,9 +1,7 @@
     199-abiword
     200 ace-of-penguins
     201 alsa-base
     202 alsa-utils
     203 anacron
     204-apport-gtk
     205 audacious
     206 audacious-plugins
     207 chromium-browser
     208@@ -24,8 +22,6 @@
     209 gnome-power-manager
     210 gnome-system-tools
     211 gnome-time-admin
     212-gnumeric
     213-gnumeric-doc
     214 gpicview
     215 gucharmap
     216 guvcview
     217@@ -36,7 +32,7 @@
     218 language-selector-gnome
     219 leafpad
     220 logrotate
     221-lubuntu-core
     222+caixamagicalxde-core
     223 lxappearance
     224 lxappearance-obconf
     225 lxdm
     226@@ -52,7 +48,7 @@
     227 lzma
     228 mobile-broadband-provider-info
     229 modemmanager
     230-mtpaint
     231+shotwell
     232 network-manager-gnome
     233 ntp
     234 obconf
     235@@ -65,6 +61,7 @@
     236 ppp
     237 scrot
     238 simple-scan
     239+software-center
     240 software-properties-gtk
     241 sylpheed
     242 sylpheed-doc
     243diff -Naur lubuntu-meta-0.24.orig//desktop-i386 lubuntu-meta-0.24//desktop-i386
     244--- lubuntu-meta-0.24.orig//desktop-i386        2011-04-25 19:53:55.000000000 +0100
     245+++ lubuntu-meta-0.24//desktop-i386     2011-07-08 11:15:25.871384495 +0100
     246@@ -1,9 +1,7 @@
     247-abiword
     248 ace-of-penguins
     249 alsa-base
     250 alsa-utils
     251 anacron
     252-apport-gtk
     253 audacious
     254 audacious-plugins
     255 chromium-browser
     256@@ -24,8 +22,6 @@
     257 gnome-power-manager
     258 gnome-system-tools
     259 gnome-time-admin
     260-gnumeric
     261-gnumeric-doc
     262 gpicview
     263 gucharmap
     264 guvcview
     265@@ -35,8 +31,15 @@
     266 jockey-gtk
     267 language-selector-gnome
     268 leafpad
     269+libreoffice-calc
     270+libreoffice-gnome
     271+libreoffice-help-en-us
     272+libreoffice-impress
     273+libreoffice-math
     274+libreoffice-style-human
     275+libreoffice-writer
     276 logrotate
     277-lubuntu-core
     278+caixamagicalxde-core
     279 lxappearance
     280 lxappearance-obconf
     281 lxdm
     282@@ -52,7 +55,7 @@
     283 lzma
     284 mobile-broadband-provider-info
     285 modemmanager
     286-mtpaint
     287+shotwell
     288 network-manager-gnome
     289 ntp
     290 nvidia-common
     291@@ -66,6 +69,7 @@
     292 ppp
     293 scrot
     294 simple-scan
     295+software-center
     296 software-properties-gtk
     297 sylpheed
     298 sylpheed-doc
     299diff -Naur lubuntu-meta-0.24.orig//desktop-ia64 lubuntu-meta-0.24//desktop-ia64
     300--- lubuntu-meta-0.24.orig//desktop-ia64        2010-11-14 16:18:08.000000000 +0000
     301+++ lubuntu-meta-0.24//desktop-ia64     2011-07-08 11:13:18.691384552 +0100
     302@@ -1,9 +1,7 @@
     303-abiword
     304 ace-of-penguins
     305 alsa-base
     306 alsa-utils
     307 anacron
     308-apport-gtk
     309 aqualung
     310 cheese
     311 chromium-browser-l10n
     312@@ -19,7 +17,6 @@
     313 gnome-mplayer
     314 gnome-power-manager
     315 gnome-system-tools
     316-gnumeric
     317 gpicview
     318 gvfs-fuse
     319 hardinfo
     320@@ -27,7 +24,7 @@
     321 language-selector
     322 leafpad
     323 logrotate
     324-lubuntu-core
     325+caixamagicalxde-core
     326 lxappearance
     327 lxdm
     328 lxinput
     329@@ -38,7 +35,7 @@
     330 lxtask
     331 lxterminal
     332 modemmanager
     333-mtpaint
     334+shotwell
     335 network-manager-gnome
     336 ntp
     337 obconf
     338@@ -50,6 +47,7 @@
     339 ppp
     340 scrot
     341 simple-scan
     342+software-center
     343 software-properties-gtk
     344 sylpheed
     345 sylpheed-i18n
     346diff -Naur lubuntu-meta-0.24.orig//desktop-powerpc lubuntu-meta-0.24//desktop-powerpc
     347--- lubuntu-meta-0.24.orig//desktop-powerpc     2011-04-25 19:55:00.000000000 +0100
     348+++ lubuntu-meta-0.24//desktop-powerpc  2011-07-08 11:15:54.071384484 +0100
     349@@ -1,9 +1,7 @@
     350-abiword
     351 ace-of-penguins
     352 alsa-base
     353 alsa-utils
     354 anacron
     355-apport-gtk
     356 audacious
     357 audacious-plugins
     358 chromium-browser-l10n
     359@@ -23,8 +21,6 @@
     360 gnome-power-manager
     361 gnome-system-tools
     362 gnome-time-admin
     363-gnumeric
     364-gnumeric-doc
     365 gpicview
     366 gucharmap
     367 guvcview
     368@@ -34,8 +30,15 @@
     369 jockey-gtk
     370 language-selector-gnome
     371 leafpad
     372+libreoffice-calc
     373+libreoffice-gnome
     374+libreoffice-help-en-us
     375+libreoffice-impress
     376+libreoffice-math
     377+libreoffice-style-human
     378+libreoffice-writer
     379 logrotate
     380-lubuntu-core
     381+caixamagicalxde-core
     382 lxappearance
     383 lxappearance-obconf
     384 lxdm
     385@@ -51,7 +54,7 @@
     386 lzma
     387 mobile-broadband-provider-info
     388 modemmanager
     389-mtpaint
     390+shotwell
     391 network-manager-gnome
     392 ntp
     393 obconf
     394@@ -64,6 +67,7 @@
     395 ppp
     396 scrot
     397 simple-scan
     398+software-center
     399 software-properties-gtk
     400 sylpheed
     401 sylpheed-doc
     402diff -Naur lubuntu-meta-0.24.orig//desktop-sparc lubuntu-meta-0.24//desktop-sparc
     403--- lubuntu-meta-0.24.orig//desktop-sparc       2010-11-14 16:18:08.000000000 +0000
     404+++ lubuntu-meta-0.24//desktop-sparc    2011-07-08 11:13:46.231384541 +0100
     405@@ -1,9 +1,7 @@
     406-abiword
     407 ace-of-penguins
     408 alsa-base
     409 alsa-utils
     410 anacron
     411-apport-gtk
     412 aqualung
     413 cheese
     414 chromium-browser-l10n
     415@@ -19,7 +17,6 @@
     416 gnome-mplayer
     417 gnome-power-manager
     418 gnome-system-tools
     419-gnumeric
     420 gpicview
     421 gvfs-fuse
     422 hardinfo
     423@@ -27,7 +24,7 @@
     424 language-selector
     425 leafpad
     426 logrotate
     427-lubuntu-core
     428+caixamagicalxde-core
     429 lxappearance
     430 lxdm
     431 lxinput
     432@@ -38,7 +35,7 @@
     433 lxtask
     434 lxterminal
     435 modemmanager
     436-mtpaint
     437+shotwell
     438 network-manager-gnome
     439 ntp
     440 obconf
     441@@ -50,6 +47,7 @@
     442 ppp
     443 scrot
     444 simple-scan
     445+software-center
     446 software-properties-gtk
     447 sylpheed
     448 sylpheed-i18n
     449diff -Naur lubuntu-meta-0.24.orig//Makefile lubuntu-meta-0.24//Makefile
     450--- lubuntu-meta-0.24.orig//Makefile    2010-11-14 16:18:08.000000000 +0000
     451+++ lubuntu-meta-0.24//Makefile 2011-07-08 10:53:37.321385075 +0100
     452@@ -11,7 +11,7 @@
     453        # since ran from bzr checkout, do not want to kill it...
     454        # rm -rf .bzr
     455        rm -f *.old
     456-       rm -rf $(DEST)/lubuntu-meta-*
     457-       mkdir -p $(DEST)/lubuntu-meta-$(VERSION)
     458+       rm -rf $(DEST)/caixamagicalxde-meta-*
     459+       mkdir -p $(DEST)/caixamagicalxde-meta-$(VERSION)
     460        # copy only main files from this directory, no .bzr, etc...
     461-       cp -r * $(DEST)/lubuntu-meta-$(VERSION)
     462+       cp -r * $(DEST)/caixamagicalxde-meta-$(VERSION)
     463diff -Naur lubuntu-meta-0.24.orig//metapackage-map lubuntu-meta-0.24//metapackage-map
     464--- lubuntu-meta-0.24.orig//metapackage-map     2011-04-25 19:55:32.000000000 +0100
     465+++ lubuntu-meta-0.24//metapackage-map  2011-07-08 10:53:02.821385090 +0100
     466@@ -1,2 +1,2 @@
     467-desktop lubuntu-desktop
     468-core lubuntu-core
     469+desktop caixamagicalxde-desktop
     470+core caixamagicalxde-core
     471diff -Naur lubuntu-meta-0.24.orig//README lubuntu-meta-0.24//README
     472--- lubuntu-meta-0.24.orig//README      2010-11-14 16:18:08.000000000 +0000
     473+++ lubuntu-meta-0.24//README   2011-07-08 11:01:34.591384865 +0100
     474@@ -4,4 +4,4 @@
     475 - The Packages files (nonexistent packages will be skipped)
     476 
     477 - debootstrap (packages not yet added to debootstrap will not be added
     478-  to ubuntu-base)
     479+  to caixamagica-base)
     480diff -Naur lubuntu-meta-0.24.orig//update.cfg lubuntu-meta-0.24//update.cfg
     481--- lubuntu-meta-0.24.orig//update.cfg  2010-11-14 16:19:03.000000000 +0000
     482+++ lubuntu-meta-0.24//update.cfg       2011-07-08 11:02:06.311384851 +0100
     483@@ -1,5 +1,5 @@
     484 [DEFAULT]
     485-dist: natty
     486+dist: horn
     487 
     488 [natty]
     489 seeds: desktop core
     490@@ -18,3 +18,16 @@
     491 seed_base: bzr+ssh://bazaar.launchpad.net/~lubuntu-desktop/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/
     492 seed_dist: lubuntu.%(dist)s
     493 
     494+[horn]
     495+seeds: desktop core
     496+architectures: i386 amd64 powerpc armel
     497+seed_base: http://people.ubuntu.com/~ubuntu-archive/seeds/
     498+archive_base/default: http://ftp.caixamagica.pt/caixamagica
     499+archive_base/ports: http://ports.ubuntu.com/ubuntu-ports/
     500+archive_base/armel: %(archive_base/ports)s
     501+archive_base/ia64: %(archive_base/ports)s
     502+archive_base/lpia: %(archive_base/ports)s
     503+archive_base/powerpc: %(archive_base/ports)s
     504+archive_base/sparc: %(archive_base/ports)s
     505+components: main restricted universe multiverse
     506+
Note: See TracChangeset for help on using the changeset viewer.