Harald Sitter has proposed merging
lp:~kubuntu-members/debian-cd/kubuntu-raring-artwork into
lp:~ubuntu-cdimage/debian-cd/ubuntu.
Requested reviews:
Ubuntu CD Image Team (ubuntu-cdimage)
For more details, see:
https://code.launchpad.net/~kubuntu-members/debian-cd/kubuntu-raring-artwork/+merge/157998
--
https://code.launchpad.net/~kubuntu-members/debian-cd/kubuntu-raring-artwork/+merge/157998
Your team Kubuntu Members is subscribed to branch
lp:~kubuntu-members/debian-cd/kubuntu-raring-artwork.
=== added file 'data/raring/kubuntu-access.pcx'
Binary files data/raring/kubuntu-access.pcx 1970-01-01 00:00:00 +0000 and data/raring/kubuntu-access.pcx 2013-04-10 06:54:25 +0000 differ
=== added file 'data/raring/kubuntu-blank.pcx'
Binary files data/raring/kubuntu-blank.pcx 1970-01-01 00:00:00 +0000 and data/raring/kubuntu-blank.pcx 2013-04-10 06:54:25 +0000 differ
=== removed symlink 'data/raring/kubuntu-netbook.pcx'
=== target was u'kubuntu.pcx'
=== removed symlink 'data/raring/kubuntu-netbook.png'
=== target was u'kubuntu.png'
=== modified file 'data/raring/kubuntu.pcx'
Binary files data/raring/kubuntu.pcx 2012-10-29 11:22:22 +0000 and data/raring/kubuntu.pcx 2013-04-10 06:54:25 +0000 differ
=== modified file 'data/raring/kubuntu.png'
Binary files data/raring/kubuntu.png 2012-10-29 11:22:22 +0000 and data/raring/kubuntu.png 2013-04-10 06:54:25 +0000 differ
=== modified file 'tools/boot/raring/boot-amd64'
--- tools/boot/raring/boot-amd64 2013-03-14 17:01:23 +0000
+++ tools/boot/raring/boot-amd64 2013-04-10 06:54:25 +0000
@@ -182,7 +182,7 @@
HIDDEN_TIMEOUT=
if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
case $PROJECT in
- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin)
+ ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu)
HIDDEN_TIMEOUT=2
;;
mythbuntu)
@@ -328,7 +328,7 @@
background=0x958490
screen-colour=0x270A1E
EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-netbook ]; then
+elif [ "$PROJECT" = kubuntu ]; then
cat >> boot$N/isolinux/gfxboot.cfg <<EOF
foreground=0xFFFFFF
background=0x000000
@@ -347,7 +347,7 @@
access-options=v1 brltty
access-options-v1=access=v1 FRONTEND_BACKGROUND=dark
EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-netbook ]; then
+elif [ "$PROJECT" = kubuntu ]; then
cat >> boot$N/isolinux/gfxboot.cfg <<EOF
access-options=v1 v2 brltty m1
EOF
=== modified file 'tools/boot/raring/boot-amd64+mac'
--- tools/boot/raring/boot-amd64+mac 2013-03-14 17:01:23 +0000
+++ tools/boot/raring/boot-amd64+mac 2013-04-10 06:54:25 +0000
@@ -170,7 +170,7 @@
HIDDEN_TIMEOUT=
if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
case $PROJECT in
- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin)
+ ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu)
HIDDEN_TIMEOUT=2
;;
mythbuntu)
@@ -309,7 +309,7 @@
background=0x958490
screen-colour=0x270A1E
EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-netbook ]; then
+elif [ "$PROJECT" = kubuntu ]; then
cat >> boot$N/isolinux/gfxboot.cfg <<EOF
foreground=0xFFFFFF
background=0x000000
@@ -328,7 +328,7 @@
access-options=v1 brltty
access-options-v1=access=v1 FRONTEND_BACKGROUND=dark
EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-netbook ]; then
+elif [ "$PROJECT" = kubuntu ]; then
cat >> boot$N/isolinux/gfxboot.cfg <<EOF
access-options=v1 v2 brltty m1
EOF
=== modified file 'tools/boot/raring/boot-i386'
--- tools/boot/raring/boot-i386 2013-03-14 17:01:23 +0000
+++ tools/boot/raring/boot-i386 2013-04-10 06:54:25 +0000
@@ -171,7 +171,7 @@
HIDDEN_TIMEOUT=
if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
case $PROJECT in
- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin)
+ ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu)
HIDDEN_TIMEOUT=2
;;
mythbuntu)
@@ -308,7 +308,7 @@
background=0x958490
screen-colour=0x270A1E
EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-netbook ]; then
+elif [ "$PROJECT" = kubuntu ]; then
cat >> boot$N/isolinux/gfxboot.cfg <<EOF
foreground=0xFFFFFF
background=0x000000
@@ -327,7 +327,7 @@
access-options=v1 brltty
access-options-v1=access=v1 FRONTEND_BACKGROUND=dark
EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-netbook ]; then
+elif [ "$PROJECT" = kubuntu ]; then
cat >> boot$N/isolinux/gfxboot.cfg <<EOF
access-options=v1 v2 brltty m1
EOF
=== modified file 'tools/boot/raring/common.sh'
--- tools/boot/raring/common.sh 2013-03-13 11:48:30 +0000
+++ tools/boot/raring/common.sh 2013-04-10 06:54:25 +0000
@@ -24,9 +24,6 @@
kubuntu)
DEFAULT_PRESEED='file=/cdrom/preseed/kubuntu.seed'
;;
- kubuntu-netbook)
- DEFAULT_PRESEED='file=/cdrom/preseed/kubuntu-netbook.seed'
- ;;
edubuntu)
DEFAULT_PRESEED='file=/cdrom/preseed/edubuntu.seed'
;;
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
