[Pkg-voip-commits] r9069 - in /asterisk/trunk/debian: README.Debian asterisk-doc.doc-base changelog copyright rules

Fri Jul 1 08:52:09 UTC 2011

Author: tzafrir
Date: Fri Jul  1 08:52:09 2011
New Revision: 9069

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9069
Log:
* Clearly the NC-ND license for AST.{pdf,txt} is here to stay. Strip it.
  - And while we're at at, strip out sound files and some generated files.

Removed:
    asterisk/trunk/debian/asterisk-doc.doc-base
Modified:
    asterisk/trunk/debian/README.Debian
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/copyright
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/README.Debian?rev=9069&op=diff
==============================================================================

--- asterisk/trunk/debian/README.Debian (original)
+++ asterisk/trunk/debian/README.Debian Fri Jul  1 08:52:09 2011
@@ -241,6 +241,14 @@
 /usr/share/doc/asterisk/menuselect.makeopts .
 
 
+Missing Documentation
+=====================
+AST.pdf and AST.txt cannot be included due to incompatible license.
+You can get their content from http://wiki.asterisk.org . The standard
+reference is included, as always in the "sample" configuration files and
+in the help from the Asterisk command-line prompt.
+
+
 DAHDI PtMP NT
 =============
 Short version: it doesn't work.

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=9069&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Jul  1 08:52:09 2011
@@ -1,9 +1,11 @@
-asterisk (1:1.8.4.4-1) unstable; urgency=high
+asterisk (1:1.8.4.4~dfsg-1) unstable; urgency=high
 
   * New upstream point release, fixes:
     - AST-2011-011, CVE-2011-2536 (Closes: #632029)
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 29 Jun 2011 11:46:34 +0300
+  * Clearly the NC-ND license for AST.{pdf,txt} is here to stay. Strip it.
+    - And while we're at at, strip out sound files and some generated files.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 01 Jul 2011 11:51:45 +0300
 
 asterisk (1:1.8.4.3-1) unstable; urgency=high
 

Modified: asterisk/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/copyright?rev=9069&op=diff
==============================================================================
--- asterisk/trunk/debian/copyright (original)
+++ asterisk/trunk/debian/copyright Fri Jul  1 08:52:09 2011
@@ -7,6 +7,16 @@
 Asterisk was downloaded from http://downloads.asterisk.org/pub/asterisk/
 
 Upstream Authors: Asterisk: Digium, Inc.
+
+DFSG Compliance
+===============
+Upstream tarball contains AST.txt and AST.pdf which are licensed under
+the terms of of CC-BY-NC-ND, and has thus been removed from the tarball.
+
+A number of other files were removed due to practical considerations
+(mostly large sound files that we already include in separate source
+package and are not really part of the source in the version control,
+thus reducing the size of the source tarball from 27MB to 10MB).
 
 Copyright
 =========

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=9069&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Fri Jul  1 08:52:09 2011
@@ -100,15 +100,17 @@
 	dh_testdir
 	touch $@
 
+SND_FILE=asterisk-core-sounds-en-gsm-1.4.20.tar.gz
 clean:
 	dh_testdir
 	dh_testroot
 	
 	# The clean target seems to be run before patches are applied.
 	# A brute-force fix to keep the tarball from getting deleted:
-	mv sounds/asterisk-core-sounds-en-gsm-1.4.20.tar.gz debian/
+	# (if it has not been stripped from upstream tarball)
+	if [ -r sounds/$(SND_FILE) ]; then mv sounds/$($SND_FILE) debian/; fi
 	GREP=grep AWK=awk $(MAKE) distclean
-	mv debian/asterisk-core-sounds-en-gsm-1.4.20.tar.gz sounds/
+	if [ -r debian/$(SND_FILE) ]; then mv debian/$(SND_FILE) sounds/; fi
 	-$(RM) -rf debian/build
 
 	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi
@@ -225,10 +227,32 @@
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
 
+TMP_TARBALL_TOP=../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)
 get-orig-source:
 	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+	#@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	#@@echo Downloading $(FILENAME) from $(URL) ...
+	#@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+	@echo Downloading $(UPFILENAME) from $(URL) ...
+	@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@echo Repacking as DFSG-free...
+	@mkdir -p ../tarballs/asterisk-$(UPVERSION).tmp/
+	@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
+		tar xfz ../$(UPFILENAME)
+	# in case the tarball is not clean:
+	@rm -rf $(TMP_TARBALL_TOP)/AST.txt
+	@rm -rf $(TMP_TARBALL_TOP)/AST.pdf
+	# While we're at it: remove some generated files that will become
+	# invalid:
+	@rm -rf $(TMP_TARBALL_TOP)/*/.makeopts
+	@rm -rf $(TMP_TARBALL_TOP)/*/.*.makeopts
+	@rm -rf $(TMP_TARBALL_TOP)/*/.moduleinfo
+	@rm -rf $(TMP_TARBALL_TOP)/*/.*.moduleinfo
+	# And some large sound files we already ship in a different package:
+	@rm -rf $(TMP_TARBALL_TOP)/sounds/*.tar.gz
+	@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
+	 	tar cf - * | gzip -9 >../$(FILENAME)
+	@echo Cleaning up...
+	@$(RM) -rf ../tarballs/asterisk-$(UPVERSION).tmp/
 
 .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install clean


