Synchronise grub and grub2 splashes with internal live-build splash for syslinux bootloaders.

8 files changed, 0 insertions, 57 deletions

diff --git a/contrib/grub-splash/lenny/COPYING b/contrib/grub-splash/lenny/COPYING
deleted file mode 100644
index f06b0e648..000000000
--- a/contrib/grub-splash/lenny/COPYING
+++ /dev/null
@@ -1,26 +0,0 @@
-The grub splash for Debian Live was made by Daniel Baumann <daniel@debian.org>
-based on the original work of Mark Riedesel.
-
-The contribution of Daniel is hereby placed in the public domain (no rights
-reserved).
-
----------------
-http://dugnet.com/klown/pics/klowner_debboot.png
-by Mark Riedesel, license same as open use logo
-
-To create klowner.rle:
-
-  1. convert klowner.png klowner.bmp
-  2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
-
-     (FBFDFA is the color used for the inside of the "n" in Debian.)
----------------
-
-Debian Open Use Logo License
-
-Copyright (c) 1999 Software in the Public Interest
-This logo or a modified version may be used by anyone to refer to the Debian
-project, but does not indicate endorsement by the project.
-
-Note: we would appreciate that you make the image a link to
-http://www.debian.org/ if you use it on a web page.
diff --git a/contrib/grub-splash/lenny/klowner.rle b/contrib/grub-splash/lenny/klowner.rle
deleted file mode 100644
index 126b6b2ee..000000000
--- a/contrib/grub-splash/lenny/klowner.rle
+++ /dev/null
diff --git a/contrib/grub-splash/lenny/klowner_debboot.png b/contrib/grub-splash/lenny/klowner_debboot.png
deleted file mode 100644
index 5ca51d816..000000000
--- a/contrib/grub-splash/lenny/klowner_debboot.png
+++ /dev/null
diff --git a/contrib/grub-splash/lenny/live.xpm.gz b/contrib/grub-splash/lenny/live.xpm.gz
deleted file mode 100644
index ea1623b4d..000000000
--- a/contrib/grub-splash/lenny/live.xpm.gz
+++ /dev/null
diff --git a/contrib/grub-splash/lenny/live_debboot.png b/contrib/grub-splash/lenny/live_debboot.png
deleted file mode 100644
index a246cfb29..000000000
--- a/contrib/grub-splash/lenny/live_debboot.png
+++ /dev/null
diff --git a/debian/copyright b/debian/copyright
index 80a0c28f0..c96991b50 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,10 +7,6 @@ Files: *
 Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
 License: GPL-3+
 
-Files: contrib/grub-splash/lenny
-Copyright: n/a
-License: other
-
 Files: share/bootloaders/*/splash.svg.in
 Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
 License: other
@@ -34,33 +30,6 @@ License: GPL-3+
 
 License: other
  The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
- on the original work of Mark Riedesel.
- .
- The contribution of Daniel is hereby placed in the public domain (no rights
- reserved).
- .
- ---------------
- http://dugnet.com/klown/pics/klowner_debboot.png
- by Mark Riedesel, license same as open use logo
- .
- To create klowner.rle:
- .
- 1. convert klowner.png klowner.bmp
- 2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
-    (FBFDFA is the color used for the inside of the "n" in Debian.)
- ---------------
- .
- Debian Open Use Logo License
- .
- Copyright (c) 1999 Software in the Public Interest
- This logo or a modified version may be used by anyone to refer to the Debian
- project, but does not indicate endorsement by the project.
- .
- Note: we would appreciate that you make the image a link to
- http://www.debian.org/ if you use it on a web page.
-
-License: other
- The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
  on the Debian Open Use Logo.
  .
  The contribution of Daniel is hereby placed in the public domain (no rights
diff --git a/templates/grub/splash.xpm.gz b/templates/grub/splash.xpm.gz
index ea1623b4d..f32e228a7 100644
--- a/templates/grub/splash.xpm.gz
+++ b/templates/grub/splash.xpm.gz
diff --git a/templates/grub2/splash.tga b/templates/grub2/splash.tga
index 854d0b26d..90b790db6 100644
--- a/templates/grub2/splash.tga
+++ b/templates/grub2/splash.tga