[SCM] Packaging for scorched3d branch, master, updated. upstream/43.1c.dfsg-58-g65c4cca

[Bruno Kleinert]

The following commit has been merged in the master branch:
commit 39e9edf62c8b105aba8409a73a2f81fcb9a492a9
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Wed Jul 28 20:43:43 2010 -0400

    Add script to update PNG icons from SVG sources
    
    We cannot have inkscape automatically do this job for us, since it's called
    with the fakeroot libarary preloaded. Inkscape wants to create /root/.config but
    does not have the rights to so during build time.
    
    As a workaround we ship a script to regenerate the PNG icons from the SVG
    source images.

diff --git a/debian/avatars-free/animal.png b/debian/avatars-free/animal.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/animal.png and /dev/null differ
diff --git a/debian/avatars-free/baby.png b/debian/avatars-free/baby.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/baby.png and /dev/null differ
diff --git a/debian/avatars-free/bavia.png b/debian/avatars-free/bavia.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/bavia.png and /dev/null differ
diff --git a/debian/avatars-free/computer.png b/debian/avatars-free/computer.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/computer.png and /dev/null differ
diff --git a/debian/avatars-free/daisy.png b/debian/avatars-free/daisy.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/daisy.png and /dev/null differ
diff --git a/debian/avatars-free/fish.png b/debian/avatars-free/fish.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/fish.png and /dev/null differ
diff --git a/debian/avatars-free/flower.png b/debian/avatars-free/flower.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/flower.png and /dev/null differ
diff --git a/debian/avatars-free/floyd.png b/debian/avatars-free/floyd.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/floyd.png and /dev/null differ
diff --git a/debian/avatars-free/heart.png b/debian/avatars-free/heart.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/heart.png and /dev/null differ
diff --git a/debian/avatars-free/lips.png b/debian/avatars-free/lips.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/lips.png and /dev/null differ
diff --git a/debian/avatars-free/mxpx.png b/debian/avatars-free/mxpx.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/mxpx.png and /dev/null differ
diff --git a/debian/avatars-free/pint.png b/debian/avatars-free/pint.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/pint.png and /dev/null differ
diff --git a/debian/avatars-free/player.png b/debian/avatars-free/player.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/player.png and /dev/null differ
diff --git a/debian/avatars-free/prot.png b/debian/avatars-free/prot.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/prot.png and /dev/null differ
diff --git a/debian/avatars-free/termin.png b/debian/avatars-free/termin.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/termin.png and /dev/null differ
diff --git a/debian/avatars-free/vader.png b/debian/avatars-free/vader.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/vader.png and /dev/null differ
diff --git a/debian/avatars-free/web.png b/debian/avatars-free/web.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/web.png and /dev/null differ
diff --git a/debian/avatars-free/yoda.png b/debian/avatars-free/yoda.png
deleted file mode 100644
index 167c75d..0000000
Binary files a/debian/avatars-free/yoda.png and /dev/null differ
diff --git a/debian/avatars/animal.png b/debian/avatars/animal.png
new file mode 100644
index 0000000..b1fdd9b
Binary files /dev/null and b/debian/avatars/animal.png differ
diff --git a/debian/avatars/baby.png b/debian/avatars/baby.png
new file mode 100644
index 0000000..19a8f11
Binary files /dev/null and b/debian/avatars/baby.png differ
diff --git a/debian/avatars/bavia.png b/debian/avatars/bavia.png
new file mode 100644
index 0000000..ccefb9a
Binary files /dev/null and b/debian/avatars/bavia.png differ
diff --git a/debian/avatars/computer.png b/debian/avatars/computer.png
new file mode 100644
index 0000000..aec572b
Binary files /dev/null and b/debian/avatars/computer.png differ
diff --git a/debian/avatars/daisy.png b/debian/avatars/daisy.png
new file mode 100644
index 0000000..9149176
Binary files /dev/null and b/debian/avatars/daisy.png differ
diff --git a/debian/avatars/fish.png b/debian/avatars/fish.png
new file mode 100644
index 0000000..ef6ba98
Binary files /dev/null and b/debian/avatars/fish.png differ
diff --git a/debian/avatars/flower.png b/debian/avatars/flower.png
new file mode 100644
index 0000000..7f62bcb
Binary files /dev/null and b/debian/avatars/flower.png differ
diff --git a/debian/avatars/floyd.png b/debian/avatars/floyd.png
new file mode 100644
index 0000000..3750027
Binary files /dev/null and b/debian/avatars/floyd.png differ
diff --git a/debian/avatars/heart.png b/debian/avatars/heart.png
new file mode 100644
index 0000000..8bb4562
Binary files /dev/null and b/debian/avatars/heart.png differ
diff --git a/debian/avatars/lips.png b/debian/avatars/lips.png
new file mode 100644
index 0000000..2d06b46
Binary files /dev/null and b/debian/avatars/lips.png differ
diff --git a/debian/avatars/mxpx.png b/debian/avatars/mxpx.png
new file mode 100644
index 0000000..fe4e7d0
Binary files /dev/null and b/debian/avatars/mxpx.png differ
diff --git a/debian/avatars/pint.png b/debian/avatars/pint.png
new file mode 100644
index 0000000..7980aba
Binary files /dev/null and b/debian/avatars/pint.png differ
diff --git a/debian/avatars/player.png b/debian/avatars/player.png
new file mode 100644
index 0000000..bacfc89
Binary files /dev/null and b/debian/avatars/player.png differ
diff --git a/debian/avatars/prot.png b/debian/avatars/prot.png
new file mode 100644
index 0000000..eb9bb50
Binary files /dev/null and b/debian/avatars/prot.png differ
diff --git a/debian/avatars/termin.png b/debian/avatars/termin.png
new file mode 100644
index 0000000..d8503ec
Binary files /dev/null and b/debian/avatars/termin.png differ
diff --git a/debian/avatars/vader.png b/debian/avatars/vader.png
new file mode 100644
index 0000000..cd8e3ae
Binary files /dev/null and b/debian/avatars/vader.png differ
diff --git a/debian/avatars/web.png b/debian/avatars/web.png
new file mode 100644
index 0000000..c8ca0e2
Binary files /dev/null and b/debian/avatars/web.png differ
diff --git a/debian/avatars/yoda.png b/debian/avatars/yoda.png
new file mode 100644
index 0000000..d36612f
Binary files /dev/null and b/debian/avatars/yoda.png differ
diff --git a/debian/rules b/debian/rules
index 68071c8..4640cba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,9 @@ endif
 
 config.status:
 	dh_testdir
-	cp -r debian/avatars-free data/avatars
+	# Upstream ships non-DFSG icons, so we replace them
+	mkdir -p data/avatars
+	mv debian/avatars data
 	sh ./autogen.sh $(confflags)
 
 build: build-stamp 
@@ -54,7 +56,7 @@ clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f data/fonts/test.ttf
 	rm -f config.log config.status
-	rm -rf data/avatars
+	rm -rf data/avatars debian/avatars-svg/*.png
 	dh_clean 
 
 install: build
diff --git a/debian/update-avatar-cons-from-svg.sh b/debian/update-avatar-cons-from-svg.sh
new file mode 100755
index 0000000..d1c43f3
--- /dev/null
+++ b/debian/update-avatar-cons-from-svg.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -x
+set -e
+
+for i in avatars-svg/*.svg ; do \
+	inkscape --export-png=`echo $i | sed -e 's/\.svg$/.png/g'` \
+	--export-area-page --export-width=32 --export-height=32 \
+	$i ; done
+mkdir -p avatars
+mv avatars-svg/*.png avatars/

-- 
Packaging for scorched3d