[Pkg-jed-commit] r514 - jed/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-01-20 13:04:43 +0100 (Sat, 20 Jan 2007)
New Revision: 514

Modified:
   jed/trunk/debian/changelog
   jed/trunk/debian/rules
Log:
Debian release jed_0.99.18.dfsg.1-1

Modified: jed/trunk/debian/changelog
===================================================================
--- jed/trunk/debian/changelog	2007-01-20 10:00:30 UTC (rev 513)
+++ jed/trunk/debian/changelog	2007-01-20 12:04:43 UTC (rev 514)
@@ -1,11 +1,18 @@
-jed (0.99.18-10) unstable; urgency=low
+jed (0.99.18.dfsg.1-1) experimental; urgency=low
 
-  NOT YET RELEASED!
+  * Exclude the info/ directory from the upstream, since the files there
+    were outdated, no longer maintained, and without proper licensing
+    conditions.  Also, the texinfo sources were lacking, making these
+    files improper to be distributed by Debian, according to the DFSG.
+    For this reason, the upstream version number contains now ".dfsg.".
+  * debian/rules: Changed according to the above.  Info files are not
+    installed anymore.  In the get-orig-source rule, the info/ directory
+    is removed before building the tarball. [RL]
 
   * debian/control: Exclude gpm suggestion for the hurd-i386,
     kfreebsd-i386, and kfreebsd-amd64 architectures [RL]
 
- --
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 20 Jan 2007 11:59:40 +0100
 
 jed (0.99.18-9) experimental; urgency=low
 

Modified: jed/trunk/debian/rules
===================================================================
--- jed/trunk/debian/rules	2007-01-20 10:00:30 UTC (rev 513)
+++ jed/trunk/debian/rules	2007-01-20 12:04:43 UTC (rev 514)
@@ -23,6 +23,7 @@
 # UPSTREAM_VERSION = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < \
 #                       $(dir $(firstword $(MAKEFILE_LIST)))/changelog)
 UPSTREAM_VERSION=0.99-18
+DEBIAN_UPSTREAM_VERSION=$(subst -,.,$(UPSTREAM_VERSION)).dfsg.1
 
 clean: unpatch
 	dh_testdir
@@ -96,11 +97,6 @@
 	dh_install -pjed-common debian/defaults.sl usr/share/jed/lib/
 	rm $(jed-common)/usr/share/jed/lib/jed.rc # it's moved to examples above
 
-	# install info files
-	mv $(jed-common)/usr/share/jed/info $(jed-common)/usr/share
-	rm $(jed-common)/usr/share/info/dir.info \
-	    $(jed-common)/usr/share/info/info.info
-
 	# install compile script to build *.slc files after installation
 	dh_install -pjed-common debian/compile usr/share/jed/compile
 	mv $(jed-common)/usr/share/jed/compile/compile \
@@ -163,6 +159,9 @@
 
 get-orig-source:
 	wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-$(UPSTREAM_VERSION).tar.gz
-	mv jed-$(UPSTREAM_VERSION).tar.gz jed_$(UPSTREAM_VERSION).orig.tar.gz
+	tar xfz jed-$(UPSTREAM_VERSION).tar.gz
+	rm -rf jed-$(UPSTREAM_VERSION)/info
+	tar cfz jed_$(DEBIAN_UPSTREAM_VERSION).orig.tar.gz jed-$(UPSTREAM_VERSION)
+	rm -rf jed-$(UPSTREAM_VERSION)
 
 .PHONY: build clean binary binary-arch binary-indep get-orig-source