[debian-edu-commits] r80590 - trunk/src/build/CD-administrator

[holger at alioth.debian.org]

Author: holger
Date: 2013-06-13 17:27:47 +0000 (Thu, 13 Jun 2013)
New Revision: 80590

Added:
   trunk/src/build/CD-administrator/debian-edu-installer-logo-squeeze.png
   trunk/src/build/CD-administrator/debian-edu-installer-logo-wheezy.png
Removed:
   trunk/src/build/CD-administrator/debian-edu-installer-logo.png
Modified:
   trunk/src/build/CD-administrator/CONF-squeeze-amd64-i386-netinst.sh
   trunk/src/build/CD-administrator/CONF-squeeze-dvd.sh
   trunk/src/build/CD-administrator/CONF-squeeze-source-dvd.sh
   trunk/src/build/CD-administrator/CONF-squeeze-test-amd64-i386-netinst.sh
   trunk/src/build/CD-administrator/CONF-squeeze-test-dvd.sh
   trunk/src/build/CD-administrator/CONF-wheezy-amd64-i386-netinst.sh
   trunk/src/build/CD-administrator/CONF-wheezy-test-amd64-i386-netinst.sh
   trunk/src/build/CD-administrator/CONF-wheezy-test-dvd-amd64.sh
Log:
use wheezy installer image for wheezy builds and squeeze image for squeeze ones

Modified: trunk/src/build/CD-administrator/CONF-squeeze-amd64-i386-netinst.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-squeeze-amd64-i386-netinst.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-squeeze-amd64-i386-netinst.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -116,7 +116,7 @@
 export OUT=$TDIR/CD/squeeze-i386
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-squeeze.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Modified: trunk/src/build/CD-administrator/CONF-squeeze-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-squeeze-dvd.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-squeeze-dvd.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -123,7 +123,7 @@
 export OUT=$TDIR/CD/squeeze-dvd
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-squeeze.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Modified: trunk/src/build/CD-administrator/CONF-squeeze-source-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-squeeze-source-dvd.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-squeeze-source-dvd.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -345,7 +345,7 @@
 #export SPLASHPNG="$BASEDIR/../splash-skolelinux.png"
 
 # If set, overrides the logo used by g-i
-#export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+#export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-squeeze.png"
 
 # Used by build.sh to determine what to build, this is the name of a target
 # in the Makefile. Use bin-official_images to build only binary CDs. The

Modified: trunk/src/build/CD-administrator/CONF-squeeze-test-amd64-i386-netinst.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-squeeze-test-amd64-i386-netinst.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-squeeze-test-amd64-i386-netinst.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -116,7 +116,7 @@
 export OUT=$TDIR/CD/squeeze-test-i386
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-squeeze.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Modified: trunk/src/build/CD-administrator/CONF-squeeze-test-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-squeeze-test-dvd.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-squeeze-test-dvd.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -123,7 +123,7 @@
 export OUT=$TDIR/CD/squeeze-test-dvd
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-squeeze.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Modified: trunk/src/build/CD-administrator/CONF-wheezy-amd64-i386-netinst.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-wheezy-amd64-i386-netinst.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-wheezy-amd64-i386-netinst.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -116,7 +116,7 @@
 export OUT=$TDIR/CD/wheezy-i386
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-wheezy.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Modified: trunk/src/build/CD-administrator/CONF-wheezy-test-amd64-i386-netinst.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-wheezy-test-amd64-i386-netinst.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-wheezy-test-amd64-i386-netinst.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -116,7 +116,7 @@
 export OUT=$TDIR/CD/wheezy-test-i386
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-wheezy.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Modified: trunk/src/build/CD-administrator/CONF-wheezy-test-dvd-amd64.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-wheezy-test-dvd-amd64.sh	2013-06-13 17:21:23 UTC (rev 80589)
+++ trunk/src/build/CD-administrator/CONF-wheezy-test-dvd-amd64.sh	2013-06-13 17:27:47 UTC (rev 80590)
@@ -116,7 +116,7 @@
 export OUT=$TDIR/CD/wheezy-test-dvd-amd64
 
 #edu logo
-export LOGOPNG="$BASEDIR/../debian-edu-installer-logo.png"
+export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-wheezy.png"
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.

Copied: trunk/src/build/CD-administrator/debian-edu-installer-logo-squeeze.png (from rev 80588, trunk/src/build/CD-administrator/debian-edu-installer-logo.png)
===================================================================
(Binary files differ)

Added: trunk/src/build/CD-administrator/debian-edu-installer-logo-wheezy.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/build/CD-administrator/debian-edu-installer-logo-wheezy.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/src/build/CD-administrator/debian-edu-installer-logo.png
===================================================================
(Binary files differ)