[debian-edu-commits] debian-edu/ 371/437: * debian/rules: simplify new-upstream-version target.

[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 1eb31647097ee31bcb92fc353b951d792f6c72c8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jun 15 16:11:46 2013 +0000

    * debian/rules: simplify new-upstream-version target.
---
 debian/README.source | 36 ++++++++++++++++++++++--------------
 debian/changelog     | 10 ++++++----
 debian/rules         |  3 +--
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 29cc4b4..270fea7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,31 +1,39 @@
-newer versions are released as a non-native package. if making changes outside
-of the "debian" dir in the source, you need to release a new upstream version.
-to do so, commit your changes to svn and use the new-upstream-version target in
+Releasing new upstream versions
+-------------------------------
+IMPORTANT: This needs to be done whenever the "upstream version" is
+incremented in debian/changelog!
+
+debian-edu-artwork is a non-native package, that means whenever files outside
+the debian director are changed or if the upstream version is incremented,
+one needs to release a new upstream version, which includes building a proper
+orig.tar.gz.
+
+To do so, commit your changes to svn and use the new-upstream-version target in
 debian/rules:
 
   debian/rules new-upstream-version
 
-this will create an upstream source tarball and a .dsc file, which can then be
-built in a clean chroot environment such as pbuilder:
+This will create an upstream source tarball in the parent directory. After that,
+build as usual:
 
+  debuild -uc -us -S
   pbuilder --build debian-edu-artwork_VERSION.dsc
 
-if only making changes to the "debian" dir, download the previous .dsc from a
-debian mirror and copy the debian dir from svn into it:
 
-  dget -x http://ftp.us.debian.org/debian/pool/main/d/debian-edu-artwork/debian-edu-artwork_VERSION.dsc
-  rm -rf debian-edu-artwork-VERSION/debian
-  svn export debian debian-edu-artwork-VERSION/debian
-  cd debian-edu-artwork-VERSION
-  debuild -us -uc -S
-  pbuilder --build ../debian-edu-artwork_VERSION.dsc
+Getting existing orig.tar.gz:
+-----------------------------
+If you don't have the orig.tar.gz file which was used to build the package
+previously, use "apt-get source debian-edu-artwork" to get it.
+
 
 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
 
+(This is actually not true anymore, someone committed all autogenerated files
+ to svn. But this nicely documents whats needed to do when Makefile.am and 
+ friends are changed.)
diff --git a/debian/changelog b/debian/changelog
index f3744c9..5bdea1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ debian-edu-artwork (0.0.36-1) UNRELEASED; urgency=low
 
   [ Holger Levsen ]
   * 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.
+    git://git.debian.org/git/debian-edu/debian-edu-logo.git
   * Cleanup art/playground some more.
   * Update README and debian/README.source. 
   * Add myself to AUTHORS.
@@ -16,9 +16,11 @@ debian-edu-artwork (0.0.36-1) UNRELEASED; urgency=low
     - Add Enhances: field. 
     - Bump Standards-Version to 3.9.4, no changes needed.
     - Drop ancient and useless Suggests: and Conflicts:. 
-  * debian/rules: Automatically replace duplicates with symlinks during
-    buildtime to decrease installed package size. Thanks to Helmut Grohne
-    and http://wiki.debian.org/dedup.debian.net.
+  * debian/rules: 
+    - Automatically replace duplicates with symlinks during buildtime to
+      decrease installed package size. Thanks to Helmut Grohne and 
+      http://wiki.debian.org/dedup.debian.net
+    - simplify new-upstream-version target.
   * Drop useless debian/watch file.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 14 Jun 2013 18:03:42 +0200
diff --git a/debian/rules b/debian/rules
index 12932d1..9f7de80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,5 @@ binary-install/debian-edu-artwork::
 
 new-upstream-version:
 	svn export . $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	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)
+	GZIP=--best tar czf ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz --exclude=debian $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 	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