[debian-edu-commits] debian-edu/ 185/437: - include uncorrupted wallpapers - only build debian-edu-artwork-usplash on i386, amd64, powerpc, sparc

[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 a629827f48d45f3bcf202249b0ead57511cb50d3
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Apr 7 20:48:16 2008 +0000

    - include uncorrupted wallpapers
    - only build debian-edu-artwork-usplash on i386, amd64, powerpc, sparc
    
    someone please review the Makefile.in - it works, but doesnt feel optimal
    
    Also the package still FTBFS on alpha, but I dont think the error is due to my change to Makefile.in as debian/tmp/etc cannot be found and this should include other stuff as well. It builds fine on i386.
---
 art/Makefile.in                           |  21 ++++++++++++++++++++-
 art/wallpapers/skoletux-wallpaper.xcf.gz  | Bin 292864 -> 347511 bytes
 art/wallpapers/skoletux-wallpaper3.xcf.gz | Bin 294912 -> 751118 bytes
 debian/changelog                          |  11 +++++++++++
 debian/control                            |   4 ++--
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/art/Makefile.in b/art/Makefile.in
index 2033db4..67d6ddf 100644
--- a/art/Makefile.in
+++ b/art/Makefile.in
@@ -137,7 +137,26 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
+#set ARCH
+ARCH = $(GS_ARCH)
+ifeq ($(strip $(ARCH)),)
+   # find ARCH using dpkg
+   ARCH = $(shell dpkg --print-installation-architecture)
+endif
+SUBDIRS = g-i kde kdm-theme ldm splash splashy media-cover
+ifeq ($(ARCH), i386)
+	SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
+endif
+ifeq ($(ARCH), amd64)
+	SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
+endif
+ifeq ($(ARCH), powerpc)
+	SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
+endif
+ifeq ($(ARCH), sparc)
+	SUBDIRS = g-i kde kdm-theme ldm splash splashy usplash media-cover
+endif
+
 all: all-recursive
 
 .SUFFIXES:
diff --git a/art/wallpapers/skoletux-wallpaper.xcf.gz b/art/wallpapers/skoletux-wallpaper.xcf.gz
index 32aca8a..6e722e2 100644
Binary files a/art/wallpapers/skoletux-wallpaper.xcf.gz and b/art/wallpapers/skoletux-wallpaper.xcf.gz differ
diff --git a/art/wallpapers/skoletux-wallpaper3.xcf.gz b/art/wallpapers/skoletux-wallpaper3.xcf.gz
index 86c7cbe..38e1edf 100644
Binary files a/art/wallpapers/skoletux-wallpaper3.xcf.gz and b/art/wallpapers/skoletux-wallpaper3.xcf.gz differ
diff --git a/debian/changelog b/debian/changelog
index 504d222..00cad4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debian-edu-artwork (0.0.27) unstable; urgency=low
+
+  * include non corrupted files skoletux-wallpaper3.xcf.gz and
+    skoletux-wallpaper.xcf.gz (Closes: 447255)
+  * only build debian-edu-artwork-usplash on i386, amd64, powerpc and sparc,
+    as usplash is only available on these archs. 
+  * NOT yet ready to be uploaded, FTBFS on at least alpha, ./debian/tmp/etc is
+    not there when install tries to put it in...
+
+ -- Holger Levsen <holger at debian.org>  Sat,  5 Apr 2008 19:20:23 +0200
+
 debian-edu-artwork (0.0.26) unstable; urgency=low
 
   * Rewrite usplash theme build rules based on the usplash-theme-debian
diff --git a/debian/control b/debian/control
index fae6392..2394dac 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Debian Edu developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>, Morten Werner Forsbring <werner at debian.org>
-Build-Depends: debhelper (>= 4), cdbs, libbogl-dev, imagemagick,  libusplash-dev, librsvg2-bin
+Build-Depends: debhelper (>= 4), cdbs, libbogl-dev, imagemagick,  libusplash-dev [i386 amd64 powerpc sparc], librsvg2-bin
 Standards-Version: 3.7.3
 
 Package: debian-edu-artwork
@@ -14,7 +14,7 @@ Description: Debian Edu themes and artwork
  This package contains Debian Edu themes and artwork.
 
 Package: debian-edu-artwork-usplash
-Architecture: any
+Architecture: i386 amd64 powerpc sparc
 Depends: ${shlibs:Depends}
 Recommends: usplash
 Provides: usplash-theme

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