[debian-edu-commits] debian-edu/ 135/437: * Include media cover images. Storing them in /usr/share/pixmaps/ for now. First one is for the DVD made by James Herrington.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit 066800b5d89fa8b8214733a0018d0063ab980d27
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Jul 21 13:24:38 2007 +0000

      * Include media cover images.  Storing them in /usr/share/pixmaps/
        for now.  First one is for the DVD made by James Herrington.
---
 art/Makefile.am                           |   2 +-
 art/Makefile.in                           |   2 +-
 art/media-cover/Makefile.am               |   9 +++++++++
 art/media-cover/README                    |   3 +++
 art/media-cover/debian-edu-dvd-cover.jpeg | Bin 0 -> 2710231 bytes
 configure                                 |   5 +++--
 configure.in                              |   3 ++-
 debian/changelog                          |   2 ++
 8 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/art/Makefile.am b/art/Makefile.am
index c2ec4b5..98431ed 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -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 --git a/art/Makefile.in b/art/Makefile.in
index 82e8cfe..cd8c84c 100644
--- a/art/Makefile.in
+++ b/art/Makefile.in
@@ -134,7 +134,7 @@ sbindir = @sbindir@
 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:
diff --git a/art/media-cover/Makefile.am b/art/media-cover/Makefile.am
new file mode 100644
index 0000000..98b5c67
--- /dev/null
+++ b/art/media-cover/Makefile.am
@@ -0,0 +1,9 @@
+coverdir = $(datadir)/pixmaps
+
+cover_DATA = \
+	debian-edu-dvd-cover.jpeg
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(coverdir)
+
+EXTRA_DIST = README $(cover_DATA)
diff --git a/art/media-cover/README b/art/media-cover/README
new file mode 100644
index 0000000..7eb91ab
--- /dev/null
+++ b/art/media-cover/README
@@ -0,0 +1,3 @@
+Cover images for CDs and DVDs.
+
+The DVD image is made by James Herrington.
diff --git a/art/media-cover/debian-edu-dvd-cover.jpeg b/art/media-cover/debian-edu-dvd-cover.jpeg
new file mode 100644
index 0000000..d04fe90
Binary files /dev/null and b/art/media-cover/debian-edu-dvd-cover.jpeg differ
diff --git a/configure b/configure
index a254bff..f60652d 100755
--- a/configure
+++ b/configure
@@ -1681,7 +1681,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 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_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 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 @@ do
     "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 --git a/configure.in b/configure.in
index b5968d6..0e58081 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 
 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/ldm/Makefile
 art/splash/Makefile
 art/splashy/Makefile
 art/usplash/Makefile
+art/media-cover/Makefile
 ])
 
 echo "
diff --git a/debian/changelog b/debian/changelog
index 9927c94..29aa099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debian-edu-artwork (0.0.20) unstable; urgency=low
   * UNRELEASED.
   * 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.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 18 Jul 2007 13:51:05 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git