[Demudi-commits] r1591 - csound/trunk/debian

[fsateler-guest at alioth.debian.org]

Author: fsateler-guest
Date: 2007-09-09 02:00:00 +0000 (Sun, 09 Sep 2007)
New Revision: 1591

Removed:
   csound/trunk/debian/dfsg-repack
Modified:
   csound/trunk/debian/rules
Log:
Merge dfsg-repack into debian/rules. Now we have a get-orig-source target 
which gets the original source and repacks it.


Deleted: csound/trunk/debian/dfsg-repack
===================================================================
--- csound/trunk/debian/dfsg-repack	2007-09-09 00:42:41 UTC (rev 1590)
+++ csound/trunk/debian/dfsg-repack	2007-09-09 02:00:00 UTC (rev 1591)
@@ -1,26 +0,0 @@
-#!/bin/bash -e
-# dfsg-repack: remove non-free stuff from the original CSound tarball
-# What it does: delete grain4 and scansyn opcodes, and the debian/ subdir
-# The debian subdir is not non-free, but since we are repacking anyways, 
-# we delete it to avoid clutter.
-#
-# Run this command from inside the csound sources:
-# $ tar -xzf Csound-*.tar.gz
-# $ cd Csound*
-# $ /path/to/dfsg-repack
-# and now the source is dfsg-clean
-
-# delete non-free opcodes
-
-rm Opcodes/grain4.{c,h}
-
-rm Opcodes/{scansyn.c,scansyn.h,scansynx.c}
-
-# don't build the deleted opcodes
-
-sed -i -e '/grain4/d' SConstruct
-sed -i -e '/scansyn/d' SConstruct
-
-# While we're at it, delete the original debian/ subdir
-
-rm -r debian/

Modified: csound/trunk/debian/rules
===================================================================
--- csound/trunk/debian/rules	2007-09-09 00:42:41 UTC (rev 1590)
+++ csound/trunk/debian/rules	2007-09-09 02:00:00 UTC (rev 1591)
@@ -136,5 +136,26 @@
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
 
+ORIGTARBALL=http://downloads.sourceforge.net/csound/Csound5.06.0.tar.gz
+NAME=Csound5.06.0.tar.gz
 
+$(NAME):
+	wget "$(ORIGTARBALL)" -O $@
+
+get-orig-source: $(NAME)
+	tar -xzf $(NAME)
+	mv Csound5.06.0 csound-5.06.0.dfsg
+# Delete non-free opcodes
+	cd csound-5.06.0.dfsg/Opcodes && rm grain4.h grain4.c
+	cd csound-5.06.0.dfsg/Opcodes && rm scansyn.c scansyn.h scansynx.c
+# And avoid building them
+	sed -i -e '/grain4/d' csound-5.06.0.dfsg/SConstruct
+	sed -i -e '/scansyn/d' csound-5.06.0.dfsg/SConstruct
+# Since we are already repacking, bonus track and delete debian/
+	rm -r csound-5.06.0.dfsg/debian
+	tar -cf csound-5.06.0.dfsg.orig.tar csound-5.06.0.dfsg
+	gzip -9 csound-5.06.0.dfsg.orig.tar
+# Now clean up
+	rm -r $(NAME) csound-5.06.0.dfsg
+
 include /usr/share/dpatch/dpatch.make