[med-svn] r3616 - in trunk/packages/mummer/trunk/debian: . patches

Mon Jul 13 00:47:02 UTC 2009

Author: plessy
Date: 2009-07-13 00:47:02 +0000 (Mon, 13 Jul 2009)
New Revision: 3616

Added:
   trunk/packages/mummer/trunk/debian/README.source
Removed:
   trunk/packages/mummer/trunk/debian/get-orig-source
Modified:
   trunk/packages/mummer/trunk/debian/changelog
   trunk/packages/mummer/trunk/debian/copyright
   trunk/packages/mummer/trunk/debian/patches/01sm_src_tigr.diff
   trunk/packages/mummer/trunk/debian/patches/series
   trunk/packages/mummer/trunk/debian/rules
Log:
Deactivated patch, wrote debian/README.source and moved get-orig-source to debian/rules.

  * Ignore for the moment the patch ?\226?\128?\15201sm_src_tigr.diff?\226?\128?\153 that allows to use
    MUMmer on computers with less that 512 Mo of memory, because it is not
    accepted upstream.
  * Documented the PDF deletion and the patching in ?\226?\128?\152debian/README.source?\226?\128?\153.
  * Turned the get-orig-source shell script into a debian/rule target.


Added: trunk/packages/mummer/trunk/debian/README.source
===================================================================

--- trunk/packages/mummer/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/mummer/trunk/debian/README.source	2009-07-13 00:47:02 UTC (rev 3616)
@@ -0,0 +1,25 @@
+Modifications of the MUMmer sources in Debian.
+
+We removed the following files before redistributing MUMmer in Debian:
+
+ ./docs/web/MUMmer.pdf
+ ./docs/web/XFiles.pdf
+ ./docs/web/MUMmer2.pdf
+ ./docs/web/MUMmer3.pdf
+
+These documents are published scientific articles whose license does not comply
+with our social contract, ‘http://www.debian.org/social_contract’.
+
+We provide an automated way to download the upstream archive and remove these
+files via the command ‘debian/rules get-orig-source’.
+
+In addition to this, the MUMmer documentation is patched to accomodate with
+this deletion, using the Quilt patch system. You can find instructions of use
+in ‘/usr/share/doc/quilt/README.source’.
+
+Since our modification keeps the functionality of the documentation intact, by
+replacing a link to a local version of the PDF articles by a remote link, I
+think that it is acceptable to not rename the documentation files (MUMmer is
+released under the Artistic license version 1).
+
+ -- Charles Plessy <plessy at debian.org> Mon, 13 Jul 2009 08:28:17 +0900

Modified: trunk/packages/mummer/trunk/debian/changelog
===================================================================
--- trunk/packages/mummer/trunk/debian/changelog	2009-07-11 15:38:50 UTC (rev 3615)
+++ trunk/packages/mummer/trunk/debian/changelog	2009-07-13 00:47:02 UTC (rev 3616)
@@ -1,14 +1,6 @@
 mummer (3.21~dfsg-1) UNRELEASED; urgency=low
 
-  OTHER TODO: 
-        convert debian/copyright to machine-readable format
-        document that the following files are removed, and indicate the licence they
-        would have had (some are freely redistributable, if not all.)
-          ./docs/web/MUMmer.pdf
-          ./docs/web/XFiles.pdf
-          ./docs/web/MUMmer2.pdf
-          ./docs/web/MUMmer3.pdf
-        forward other material such as the .desktop file.
+  TODO: restore the renaming, and make debian/copyright compliant with Policy.
 
   * New upstream release (GCC compatibility fix.)
   * debian/get-orig-source: rename mutilated upstream tarball.
@@ -23,14 +15,17 @@
     - replaces some Makefile patches by environment variables in debian/rules.
     - replaced 02at_scripts.diff by separate files in sh-replacement-scripts.
     - added a series file to use Quilt.
+    - Ignore for the moment the patch ‘01sm_src_tigr.diff’ that allows to use
+      MUMmer on computers with less that 512 Mo of memory, because it is not
+      accepted upstream.
   * debian/rules converted to debhelper (the build system is too odd to be
     handled gently by CDBS without patches).
   * Mangled ‘~dfsg’ from the Debian version number in debian/watch.
-  * Converted debian/copyright to a machine-readable format, and added
-    a proeminent notice that MUMmer has been patched, to comply with the
-    Artistic license.
+  * Converted debian/copyright to a machine-readable format.
+  * Documented the PDF deletion and the patching in ‘debian/README.source’.
+  * Turned the get-orig-source shell script into a debian/rule target.
 
- -- Charles Plessy <plessy at debian.org>  Thu, 02 Jul 2009 13:17:06 +0900
+ -- Charles Plessy <plessy at debian.org>  Mon, 13 Jul 2009 08:30:24 +0900
 
 mummer (3.20-3) unstable; urgency=low
 

Modified: trunk/packages/mummer/trunk/debian/copyright
===================================================================
--- trunk/packages/mummer/trunk/debian/copyright	2009-07-11 15:38:50 UTC (rev 3615)
+++ trunk/packages/mummer/trunk/debian/copyright	2009-07-13 00:47:02 UTC (rev 3616)
@@ -1,10 +1,10 @@
 Machine-readable license summary for MUMmer, see ‘http://dep.debian.net/deps/dep5/’.
 
-Name: MUMmer
-Contact: mummer-help at lists.sourceforge.net
-Source: http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/m/mu/mummer/MUMmer3.21.tar.gz 
+Name    :  MUMmer
+Contact :  mummer-help at lists.sourceforge.net
+Source  :  http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/m/mu/mummer/MUMmer3.21.tar.gz 
 
-License: Artistic
+License :  Artistic
     
     This program is free software; you can redistribute it and/or modify it
     under the terms of the "Artistic License" which comes with Debian.
@@ -13,15 +13,6 @@
     WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES 
     OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-╔═══════════════════════════════════════════════════════════════════════════╗
-║                                                                           ║
-║ This version of MUMmer has been patched. You can find the patch with an   ║
-║ explanation of what they do in the debian/patches directory of the Debian ║
-║ source package, or consult them on our unofficial patch tracking system,  ║
-║ ‘http://patch-tracking.debian.net/package/mummer’.                        ║
-║                                                                           ║
-╚═══════════════════════════════════════════════════════════════════════════╝
-
 On Debian systems, the complete text of the Artistic License 
 can be found in ‘/usr/share/common-licenses/Artistic’.
 

Deleted: trunk/packages/mummer/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/mummer/trunk/debian/get-orig-source	2009-07-11 15:38:50 UTC (rev 3615)
+++ trunk/packages/mummer/trunk/debian/get-orig-source	2009-07-13 00:47:02 UTC (rev 3616)
@@ -1,13 +0,0 @@
-VERSION=3.21
-NAME=mummer
-
-TARBALL=MUMmer${VERSION}.tar.gz
-wget http://downloads.sourceforge.net/${NAME}/${TARBALL}
-rm -rf tmp
-mkdir tmp
-cd tmp
-tar -xzf ../${TARBALL}
-rm -vf `find . -maxdepth 4 -name [MX]*.pdf`
-GZIP=-9 tar -czf ../${NAME}_${VERSION}~dfsg.orig.tar.gz *
-cd ..
-rm -rf tmp

Modified: trunk/packages/mummer/trunk/debian/patches/01sm_src_tigr.diff
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/01sm_src_tigr.diff	2009-07-11 15:38:50 UTC (rev 3615)
+++ trunk/packages/mummer/trunk/debian/patches/01sm_src_tigr.diff	2009-07-13 00:47:02 UTC (rev 3616)
@@ -1,6 +1,6 @@
 Description: Dynamically allocates space for the strings, instead allocating a predefined size.
- I am checking with Upstream if the patch is acceptable or not
- (they closed the bug, but did not document why). -- Charles
+ This is not applied as its implementation appears to be buggy.
+ See ‘http://lists.debian.org/msgid-search/200907061138.56896.bss@iguanasuicide.net’.
 Origin: vendor : Debian
 Bug: https://sourceforge.net/tracker/?func=detail&aid=1215086&group_id=133157&atid=726404
 diff -urbN src/tigr.orig/annotate.cc src/tigr/annotate.cc

Modified: trunk/packages/mummer/trunk/debian/patches/series
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/series	2009-07-11 15:38:50 UTC (rev 3615)
+++ trunk/packages/mummer/trunk/debian/patches/series	2009-07-13 00:47:02 UTC (rev 3616)
@@ -1,2 +1,2 @@
-01sm_src_tigr.diff
+#01sm_src_tigr.diff
 02at_docs_web.diff

Modified: trunk/packages/mummer/trunk/debian/rules
===================================================================
--- trunk/packages/mummer/trunk/debian/rules	2009-07-11 15:38:50 UTC (rev 3615)
+++ trunk/packages/mummer/trunk/debian/rules	2009-07-13 00:47:02 UTC (rev 3616)
@@ -77,5 +77,19 @@
 override_dh_compress:
 	dh_compress -Xpdf
 
+NAME    = $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+VERSION = $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed 's/~dfsg.*//')
+TARBALL = MUMmer$(VERSION).tar.gz
+
+get-orig-source:
+	wget http://downloads.sourceforge.net/sourceforge/$(NAME)/$(TARBALL)
+	rm -rf tmp
+	mkdir tmp
+	cd tmp ;\
+	tar -xzf ../$(TARBALL) ;\
+	rm -vf `find . -maxdepth 4 -name [MX]*.pdf` ;\
+	GZIP=-9 tar -czf ../$(NAME)_$(VERSION)~dfsg.orig.tar.gz *
+	rm -rf tmp
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install


