[debian-edu-commits] debian-edu/ 361/437: * Drop art/logo (whoich wasn't used in the binary package) and moved it to git://git.debian.org/git/debian-edu/debian-edu-logo.git. * Update README and debian/README.source. * Make binary package description slightly more verbose.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:52 UTC 2014
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 7b79267cf015a36e216f7596d63ee26df37fc1fb
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Jun 15 11:21:17 2013 +0000
* Drop art/logo (whoich wasn't used in the binary package) and moved it to
git://git.debian.org/git/debian-edu/debian-edu-logo.git.
* Update README and debian/README.source.
* Make binary package description slightly more verbose.
(Also re-add INSTALL as autoreconf needs it.)
---
INSTALL | 1 +
README | 26 ++++++++++----------------
art/kde/Makefile.in | 2 +-
art/logo/Skolelinux-New-Logo-with-Layers.info | 12 ------------
art/logo/Skolelinux-New-Logo-with-Layers.xcf | Bin 1460829 -> 0 bytes
art/logo/skolelinux-logo-greek.png | Bin 60713 -> 0 bytes
art/logo/skolelinux-logo-japanese.png | Bin 73116 -> 0 bytes
art/logo/skolelogo-arabisch.gif | Bin 14661 -> 0 bytes
debian/README.source | 10 ++++++++++
debian/changelog | 7 +++++--
debian/control | 4 ++--
11 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..3bec6e7
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+# can be empty but needs to exist for running "autoreconf"
diff --git a/README b/README
index 877742c..d0ae2c1 100644
--- a/README
+++ b/README
@@ -2,19 +2,21 @@ Debian Edu artwork
==================
Collection of images, themes, wallpapers and splash screens for use
-with the Debian Edu custom Debian distribution.
+with the Debian Edu distribution.
-Contact debian-edu at lists.debian.org if you have comments and
-suggestions.
-
-The source is available from
-http://svn.debian.org/wsvn/debian-edu/trunk/src/debian-edu-artwork/
+Contact debian-edu at lists.debian.org if you have comments and suggestions.
Resources for artists
---------------------
- - vector logo, <URL:http://developer.skolelinux.no/~vb/logo/>
- - vector mascot, <URL:http://www.skolelinux.no/mascot/>
+ - svn://svn.debian.org/svn/debian-edu/branches/wheezy/debian-edu-artwork
+ and in there, art/playground/(wheezy|squeeze|lenny+earlier)
+ (there is svn trunk too, but that wasn't updated since squeeze. After the
+ wheezy release we will move to git.)
+ - git://git.debian.org/git/debian-edu/debian-edu-logo.git
+ - in art/media-cover is a "skolelinux 3.0 terra" CD artwork.
+ http://wiki.debian.org/DebianArt/Themes/Joy?action=AttachFile&do=view&target=Joy_Archive_22-10-2012.zip
+ contains Debian wheezy CD artwork which someone could adopt to Debian-Edu.
License
-------
@@ -24,11 +26,3 @@ later. Only images with GPL compatible license should be added to
this package. For images, the original file format (used when drawing
the image) should be included as well.
-Building from svn
------------------
-
-To build from svn, a few files need to be generated. Use this command
-to bootstrap the source
-
- automake -c -a
- autoreconf
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 73a06bb..1180152 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -195,7 +195,7 @@ KDEIMG = debian-edu-wallpaper01_1600x1200.png \
debian-edu-wallpaper02_1920x1080.svg \
debian-edu-wallpaper02_1920x1200.svg
-kdeimgdir = $(datadir)/wallpapers
+kdeimgdir = $(datadir)/wallpapers/
kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
Xsessiondir = /etc/X11/Xsession.d/
Xsession_DATA = 25debian-edu-artwork
diff --git a/art/logo/Skolelinux-New-Logo-with-Layers.info b/art/logo/Skolelinux-New-Logo-with-Layers.info
deleted file mode 100644
index 6428c87..0000000
--- a/art/logo/Skolelinux-New-Logo-with-Layers.info
+++ /dev/null
@@ -1,12 +0,0 @@
-This package provides the logo for Debian-Edu/Skolelinux in
-different versions and languages. Based on the design done by
-*** FIXME: who did the design of the orignial logo? ***
-Skolelinux-New-Logo-with-Layers.xcf was re-created by Ralf
-Gesellensetter using The GIMP. This file includes several
-layers to easy further editing. One aim was to provide
-translations for Greek, Arabic, and Japanese (cf.
-corresponding exports). Please note, that these translated
-versions are rather gimmicks than official logos of
-Debian-Edu/Skolelinus. All files are licensed under
-the GNU General Public License.
-
diff --git a/art/logo/Skolelinux-New-Logo-with-Layers.xcf b/art/logo/Skolelinux-New-Logo-with-Layers.xcf
deleted file mode 100644
index 56197b3..0000000
Binary files a/art/logo/Skolelinux-New-Logo-with-Layers.xcf and /dev/null differ
diff --git a/art/logo/skolelinux-logo-greek.png b/art/logo/skolelinux-logo-greek.png
deleted file mode 100644
index 6dfc2ce..0000000
Binary files a/art/logo/skolelinux-logo-greek.png and /dev/null differ
diff --git a/art/logo/skolelinux-logo-japanese.png b/art/logo/skolelinux-logo-japanese.png
deleted file mode 100644
index 1ba54ec..0000000
Binary files a/art/logo/skolelinux-logo-japanese.png and /dev/null differ
diff --git a/art/logo/skolelogo-arabisch.gif b/art/logo/skolelogo-arabisch.gif
deleted file mode 100644
index b6796e2..0000000
Binary files a/art/logo/skolelogo-arabisch.gif and /dev/null differ
diff --git a/debian/README.source b/debian/README.source
index cfa9d7c..29cc4b4 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -19,3 +19,13 @@ debian mirror and copy the debian dir from svn into it:
cd debian-edu-artwork-VERSION
debuild -us -uc -S
pbuilder --build ../debian-edu-artwork_VERSION.dsc
+
+Building from svn
+-----------------
+
+To build from svn, a few files need to be generated. Use this command
+to bootstrap the source
+
+ automake -c -a
+ autoreconf
+
diff --git a/debian/changelog b/debian/changelog
index 9e34fdf..2309021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-artwork (0.0.35-2) UNRELEASED; urgency=low
+debian-edu-artwork (0.0.36-1) UNRELEASED; urgency=low
[ Wolfgang Schweer ]
* /usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg
@@ -7,9 +7,12 @@ debian-edu-artwork (0.0.35-2) UNRELEASED; urgency=low
[ Holger Levsen ]
* Drop useless debian/watch file.
* Drop ancient and useless Suggests: and Conflicts:.
- * Drop useless, empty INSTALL file.
* Add myself to AUTHORS.
* Bump Standards-Version to 3.9.4, no changes needed.
+ * Drop art/logo (whoich wasn't used in the binary package) and moved it to
+ git://git.debian.org/git/debian-edu/debian-edu-logo.git.
+ * Update README and debian/README.source.
+ * Make binary package description slightly more verbose.
-- Wolfgang Schweer <wschweer at arcor.de> Fri, 14 Jun 2013 18:03:42 +0200
diff --git a/debian/control b/debian/control
index a3763b9..458e797 100644
--- a/debian/control
+++ b/debian/control
@@ -12,5 +12,5 @@ Package: debian-edu-artwork
Architecture: all
Depends: ${misc:Depends}, libconfig-inifiles-perl, desktop-base
Description: Debian Edu themes and artwork
- This package contains Debian Edu themes and artwork.
-
+ This package contains a collection of images, themes, wallpapers and splash
+ screens for use with Debian Edu.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list