Stable update proposal: debian-edu-artwork
Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.
I propose to update the version of debian-edu-artwork in the stable
repository from 0.0.18.0.edu.etch.3 to 0.0.21.0.edu.etch.2. It adds
new artwork and fixes a bug in the code to activate the default KDE
wallpaper.
The new version is still missing binaries on powerpc and amd64. This
should be solved before the package is pushed into the stable release.
Here is the diff -r output between the two versions:
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/debian/changelog debian-edu-artwork-0.0.21.0.edu.etch.2/debian/changelog
--- debian-edu-artwork-0.0.18.0.edu.etch.3/debian/changelog 2007-07-05 00:02:26.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/debian/changelog 2007-08-02 19:30:46.000000000 +0200
@@ -1,13 +1,50 @@
-debian-edu-artwork (0.0.18.0.edu.etch.3) terra; urgency=low
+debian-edu-artwork (0.0.21.0.edu.etch.2) unstable; urgency=low
+
+ * Backport for Debian Edu/Etch.
+ * Correct KDEDIRS value used in the Xsession.d script
+ art/kde/25debian-edu-artwork, to enable the Debian Edu background
+ by default.
+
+ -- Petter Reinholdtsen <pere@debian.org> Thu, 2 Aug 2007 19:28:54 +0200
+
+debian-edu-artwork (0.0.21.0.edu.etch.1) unstable; urgency=low
+
+ * Backport for Debian Edu/Etch.
+ * New versions of DVD label and cover from James Herrington, this
+ time with source files included.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 22 Jul 2007 17:35:39 +0200
+
+debian-edu-artwork (0.0.21) unstable; urgency=low
+
+ * Add GPL licensed DVD label by James Herrington to media-cover.
+ * Remove more generated files in the clean target of
+ art/usplash/. (Closes: #434114)
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 22 Jul 2007 17:30:46 +0200
+
+debian-edu-artwork (0.0.20) unstable; urgency=low
+
+ * Start work on customized g-i logo image. Image made using Gimp
+ and licenced using GPL by Ralf Gesellensetter.
+ * Include media cover images. Storing them in /usr/share/pixmaps/
+ for now. First one is for the DVD made by James Herrington.
+ * Add .info files next to artwork to document who made them and
+ that their license is GPL.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sat, 21 Jul 2007 18:14:54 +0200
+
+debian-edu-artwork (0.0.19) unstable; urgency=low
* Change how kdm is configured to use the new /etc/default/kdm.d/
- method instead of the policy breaking editing during postinst.
+ method instead of the policy breaking editing during
+ postinst. (Closes: #431699)
* Update default settings used when restoring the old kdm configuration
to match the current defaults in kdm from version 3.5.5a.dfsg.1-6.
* Use full path when specifying background wallpaper, to avoid
strange path rewriting done by init.d/kdm.
- -- Petter Reinholdtsen <pere@debian.org> Thu, 5 Jul 2007 00:02:13 +0200
+ -- Petter Reinholdtsen <pere@debian.org> Sat, 7 Jul 2007 12:38:47 +0200
debian-edu-artwork (0.0.18) unstable; urgency=low
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i: debian-edu-installer-logo.info
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i: debian-edu-installer-logo.png
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i: debian-edu-installer-logo.xcf
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/g-i/Makefile.am debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i/Makefile.am
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/g-i/Makefile.am 2006-10-24 12:05:34.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i/Makefile.am 2007-07-21 18:14:07.000000000 +0200
@@ -1 +1,8 @@
-EXTRA_DIST = README
+logodir = $(datadir)/pixmaps
+
+logo_DATA = debian-edu-installer-logo.png
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(logodir)
+
+EXTRA_DIST = README $(logo_DATA) debian-edu-installer-logo.xcf
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/g-i/Makefile.in debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i/Makefile.in
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/g-i/Makefile.in 2007-07-04 09:38:15.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i/Makefile.in 2007-07-22 17:29:50.000000000 +0200
@@ -13,6 +13,7 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -43,6 +44,15 @@
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(logodir)"
+logoDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(logo_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -125,7 +135,9 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-EXTRA_DIST = README
+logodir = $(datadir)/pixmaps
+logo_DATA = debian-edu-installer-logo.png
+EXTRA_DIST = README $(logo_DATA) debian-edu-installer-logo.xcf
all: all-am
.SUFFIXES:
@@ -159,6 +171,23 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
+install-logoDATA: $(logo_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(logodir)" || $(mkdir_p) "$(DESTDIR)$(logodir)"
+ @list='$(logo_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(logoDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(logodir)/$$f'"; \
+ $(logoDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(logodir)/$$f"; \
+ done
+
+uninstall-logoDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(logo_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(logodir)/$$f'"; \
+ rm -f "$(DESTDIR)$(logodir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -195,8 +224,11 @@
done
check-am: all-am
check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
installdirs:
+ for dir in "$(DESTDIR)$(logodir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -239,7 +271,7 @@
info-am:
-install-data-am:
+install-data-am: install-data-local install-logoDATA
install-exec-am:
@@ -265,17 +297,21 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-logoDATA
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ install install-am install-data install-data-am \
+ install-data-local install-exec install-exec-am install-info \
+ install-info-am install-logoDATA install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+ uninstall-logoDATA
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(logodir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/g-i/README debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i/README
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/g-i/README 2006-10-24 12:03:49.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/g-i/README 2007-07-21 18:14:07.000000000 +0200
@@ -1,5 +1,12 @@
We should find a way to replace the banner image used in the graphical
version of the debian installer. The image used by g-i is
-/usr/share/graphics/logo_debian.png from the rootskel-gtk package. It
-is unknown how to properly replace it in a custom debian distribution.
+/usr/share/graphics/logo_debian.png from the rootskel-gtk package.
+It is a PNG image data, 800 x 75, 8-bit/color RGBA, non-interlaced.
+
+It is unknown how to properly replace it in a custom debian distribution.
Perhaps we need to make our own g-i boot images to make it happen.
+
+An idea is to modify debian-cd to append a compressed cpio archive with
+this replacement file to the initrd.gz file used when booting g-i. It
+will then replace the original file when the initrd is unpackaged into
+memory.
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/kde/25debian-edu-artwork debian-edu-artwork-0.0.21.0.edu.etch.2/art/kde/25debian-edu-artwork
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/kde/25debian-edu-artwork 2006-09-15 07:32:53.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/kde/25debian-edu-artwork 2007-08-02 19:30:47.000000000 +0200
@@ -1,2 +1,2 @@
-KDEDIRS="/usr/share/debian-edu-artwork/kde-profile/default:$KDEDIRS"
+KDEDIRS="/usr/share/debian-edu-artwork/kde-profile:$KDEDIRS"
export KDEDIRS
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/kdm-theme: preview.info
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art: logo
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/Makefile.am debian-edu-artwork-0.0.21.0.edu.etch.2/art/Makefile.am
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/Makefile.am 2006-10-24 12:05:02.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/Makefile.am 2007-07-21 18:14:01.000000000 +0200
@@ -1 +1 @@
-SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash
+SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/Makefile.in debian-edu-artwork-0.0.21.0.edu.etch.2/art/Makefile.in
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/Makefile.in 2007-07-04 09:38:15.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/Makefile.in 2007-07-21 18:14:01.000000000 +0200
@@ -134,7 +134,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash
+SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
all: all-recursive
.SUFFIXES:
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art: media-cover
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/splash: debian-edu-splash.info
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/splashy: debian-edu-splashy.info
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art/usplash: debian-edu-usplash.info
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/usplash/Makefile.am debian-edu-artwork-0.0.21.0.edu.etch.2/art/usplash/Makefile.am
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/usplash/Makefile.am 2006-08-01 15:19:46.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/usplash/Makefile.am 2007-07-22 17:29:50.000000000 +0200
@@ -39,5 +39,7 @@
debian-edu-usplash.so
CLEANFILES = \
helvB10.o helvB10.c \
+ debian-edu-usplash.so \
debian-edu-usplash.o \
+ debian-edu-usplash.c \
debian-edu-usplash-theme.o
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/art/usplash/Makefile.in debian-edu-artwork-0.0.21.0.edu.etch.2/art/usplash/Makefile.in
--- debian-edu-artwork-0.0.18.0.edu.etch.3/art/usplash/Makefile.in 2007-07-04 09:38:16.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/art/usplash/Makefile.in 2007-07-22 17:29:50.000000000 +0200
@@ -155,7 +155,9 @@
CLEANFILES = \
helvB10.o helvB10.c \
+ debian-edu-usplash.so \
debian-edu-usplash.o \
+ debian-edu-usplash.c \
debian-edu-usplash-theme.o
all: $(BUILT_SOURCES)
Only in debian-edu-artwork-0.0.21.0.edu.etch.2/art: wallpapers
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/configure debian-edu-artwork-0.0.21.0.edu.etch.2/configure
--- debian-edu-artwork-0.0.18.0.edu.etch.3/configure 2007-07-04 09:38:26.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/configure 2007-07-21 18:14:12.000000000 +0200
@@ -1681,7 +1681,7 @@
MAJOR_VERSION=0
MINOR_VERSION=0
-MICRO_VERSION=14
+MICRO_VERSION=20
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
am__api_version="1.9"
@@ -3367,7 +3367,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-ac_config_files="$ac_config_files Makefile art/Makefile art/g-i/Makefile art/kde/Makefile art/kdm-theme/Makefile art/ldm/Makefile art/splash/Makefile art/splashy/Makefile art/usplash/Makefile"
+ac_config_files="$ac_config_files Makefile art/Makefile art/g-i/Makefile art/kde/Makefile art/kdm-theme/Makefile art/ldm/Makefile art/splash/Makefile art/splashy/Makefile art/usplash/Makefile art/media-cover/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3977,6 +3977,7 @@
"art/splash/Makefile") CONFIG_FILES="$CONFIG_FILES art/splash/Makefile" ;;
"art/splashy/Makefile") CONFIG_FILES="$CONFIG_FILES art/splashy/Makefile" ;;
"art/usplash/Makefile") CONFIG_FILES="$CONFIG_FILES art/usplash/Makefile" ;;
+ "art/media-cover/Makefile") CONFIG_FILES="$CONFIG_FILES art/media-cover/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff -ur debian-edu-artwork-0.0.18.0.edu.etch.3/configure.in debian-edu-artwork-0.0.21.0.edu.etch.2/configure.in
--- debian-edu-artwork-0.0.18.0.edu.etch.3/configure.in 2006-10-24 12:16:07.000000000 +0200
+++ debian-edu-artwork-0.0.21.0.edu.etch.2/configure.in 2007-07-21 18:14:11.000000000 +0200
@@ -3,7 +3,7 @@
MAJOR_VERSION=0
MINOR_VERSION=0
-MICRO_VERSION=14
+MICRO_VERSION=20
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
AM_INIT_AUTOMAKE(debian-edu-artwork, $VERSION)
@@ -31,6 +31,7 @@
art/splash/Makefile
art/splashy/Makefile
art/usplash/Makefile
+art/media-cover/Makefile
])
echo "
Reply to: