[debian-edu-commits] debian-edu/ 303/437: * Remove the art/playground/ directory from the 'upstream'-source (*.orig.tar.gz). * Use new artwork for PXE boot screen. Remove outdated paragraph from art/splash/README. * Minor kdm/gdm-theme design modifications. * Use Debian default path for kdm-theme. * Fix path in art/kdm-theme/kdm-default (which seems to be ignored). * Improve contrast to background. * Update desktop-background's picture_filename in GConf defaults (closes: #638541). * debian/changelog: Merge four svn versions (which where uploaded to Debian Edu) into this one, before uploading to unstable. * debian/rules: don't remove art/playground when creating orig.tar.gz.

Mike Gabriel sunweaver at debian.org
Sun Mar 2 23:49:45 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 c4953f823fc774e3c45b442fc3c2396ca420f05d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Sep 11 12:53:27 2011 +0000

    * Remove the art/playground/ directory from the 'upstream'-source
      (*.orig.tar.gz).
    * Use new artwork for PXE boot screen.  Remove outdated paragraph from
      art/splash/README.
    * Minor kdm/gdm-theme design modifications.
    * Use Debian default path for kdm-theme.
    * Fix path in art/kdm-theme/kdm-default (which seems to be ignored).
    * Improve contrast to background.
    * Update desktop-background's picture_filename in GConf defaults
      (closes: #638541).
    * debian/changelog: Merge four svn versions (which where uploaded to Debian
      Edu) into this one, before uploading to unstable.
    * debian/rules: don't remove art/playground when creating orig.tar.gz.
---
 debian/changelog | 54 +++++++++++++++++++++++-------------------------------
 debian/rules     |  1 -
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67e7553..8c0e6db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,33 +1,4 @@
-debian-edu-artwork (0.0.33~svn73812) UNRELEASED; urgency=low
-
-  [ Andreas B. Mundt ]
-  * Continue development. Nothing yet.
-
-  [ Mike Gabriel ]
-  * Update desktop-background's picture_filename in GConf defaults
-    (closes: #638541).
-
- -- Andreas B. Mundt <andi.mundt at web.de>  Fri, 24 Jun 2011 08:35:33 +0200
-
-debian-edu-artwork (0.0.33~svn73811) squeeze-test; urgency=low
-
-  * Improve contrast to background.
-
- -- Andreas B. Mundt <andi.mundt at web.de>  Thu, 23 Jun 2011 23:48:58 +0200
-
-debian-edu-artwork (0.0.33~svn73766) squeeze-test; urgency=low
-
-  * Remove the art/playground/ directory from the 'upstream'-source
-    (*.orig.tar.gz).
-  * Use new artwork for PXE boot screen.  Remove outdated paragraph from
-    art/splash/README.
-  * Minor kdm/gdm-theme design modifications.
-  * Use Debian default path for kdm-theme.
-  * Fix path in art/kdm-theme/kdm-default (which seems to be ignored).
-
- -- Andreas B. Mundt <andi.mundt at web.de>  Sun, 19 Jun 2011 13:00:25 +0200
-
-debian-edu-artwork (0.0.33~svn73752) squeeze-test; urgency=low
+debian-edu-artwork (0.0.33-1) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
   * Add the image used by isolinux on the Installation CD and DVD.
@@ -56,7 +27,28 @@ debian-edu-artwork (0.0.33~svn73752) squeeze-test; urgency=low
     GRUB had problems with the original file.
   * Bump Standards-Version to 3.9.2, no changes needed.
 
- -- Andreas B. Mundt <andi.mundt at web.de>  Sun, 19 Jun 2011 12:11:13 +0200
+  [ Andreas B. Mundt ]
+  * Remove the art/playground/ directory from the 'upstream'-source
+    (*.orig.tar.gz).
+  * Use new artwork for PXE boot screen.  Remove outdated paragraph from
+    art/splash/README.
+  * Minor kdm/gdm-theme design modifications.
+  * Use Debian default path for kdm-theme.
+  * Fix path in art/kdm-theme/kdm-default (which seems to be ignored).
+
+  [ Andreas B. Mundt ]
+  * Improve contrast to background.
+
+  [ Mike Gabriel ]
+  * Update desktop-background's picture_filename in GConf defaults
+    (closes: #638541).
+
+  [ Holger Levsen ]
+  * debian/changelog: Merge four svn versions (which where uploaded to Debian
+    Edu) into this one, before uploading to unstable.
+  * debian/rules: don't remove art/playground when creating orig.tar.gz. 
+
+ -- Holger Levsen <holger at debian.org>  Sun, 11 Sep 2011 14:51:34 +0200
 
 debian-edu-artwork (0.0.32-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 1933df2..ecab049 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ binary-install/debian-edu-artwork::
 
 new-upstream-version:
 	svn export . $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	rm -rv $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/art/playground/
 	GZIP=--best tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz --exclude=debian $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 	(cd $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) ; debuild -us -uc -S)
 	rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)

-- 
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