[med-svn] r1521 - in trunk/packages/clustalw/trunk/debian: . overrides

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2008-03-06 05:24:38 +0000 (Thu, 06 Mar 2008)
New Revision: 1521

Added:
   trunk/packages/clustalw/trunk/debian/overrides/
   trunk/packages/clustalw/trunk/debian/overrides/clustalw
Modified:
   trunk/packages/clustalw/trunk/debian/changelog
   trunk/packages/clustalw/trunk/debian/clustalw.install
   trunk/packages/clustalw/trunk/debian/copyright
   trunk/packages/clustalw/trunk/debian/rules
Log:
ready for upload

Modified: trunk/packages/clustalw/trunk/debian/changelog
===================================================================
--- trunk/packages/clustalw/trunk/debian/changelog	2008-03-05 13:52:33 UTC (rev 1520)
+++ trunk/packages/clustalw/trunk/debian/changelog	2008-03-06 05:24:38 UTC (rev 1521)
@@ -15,7 +15,12 @@
   [ Charles Plessy ]
   * debian/copyright made machine-readable.
   * Clustal X is now built in a separate source package.
+    (Closes: #469442, #469443)
   * Switched to CDBS.
+  * Added lintian override for the presence of /usr/share/doc/clustalw/LICENSE.
+  * debian/control:
+    - Allowed upload by Debian maintainers.
+    - Checked conformance with Policy 3.7.3 (no changes needed).
 
   [ David Paleino ]
   * debian/control:

Modified: trunk/packages/clustalw/trunk/debian/clustalw.install
===================================================================
--- trunk/packages/clustalw/trunk/debian/clustalw.install	2008-03-05 13:52:33 UTC (rev 1520)
+++ trunk/packages/clustalw/trunk/debian/clustalw.install	2008-03-06 05:24:38 UTC (rev 1521)
@@ -1 +1,2 @@
-clustalw_help usr/share/clustalw
+clustalw_help			usr/share/clustalw
+debian/overrides/clustalw	usr/share/lintian/overrides

Modified: trunk/packages/clustalw/trunk/debian/copyright
===================================================================
--- trunk/packages/clustalw/trunk/debian/copyright	2008-03-05 13:52:33 UTC (rev 1520)
+++ trunk/packages/clustalw/trunk/debian/copyright	2008-03-06 05:24:38 UTC (rev 1521)
@@ -9,10 +9,11 @@
            © 2001 Dr. Guenter Bechly <gbechly at debian.org>
            © 2001 Adrian Bunk <bunk at fs.tum.de>
 	   © 2001-2002 Andreas Tille <tille at debian.org>
-	   © 2003-2007 Steffen Möller <moeller at debian.org>
 	   © 2006 Kai Hendry <hendry at iki.fi>
 	   © 2007 Nelson A. de Oliveira <naoliv at debian.org>
+	   © 2003-2008 Steffen Möller <moeller at debian.org>
 	   © 2007-2008 Charles Plessy <charles-debian-nospam at plessy.org>
+	   © 2008 David Paleino <d.paleino at gmail.com>
 Licence: Unclear
  The licence of the earlier works was never stated. Some works have been
  obsoleted by release of version 2.0 — the lesstif migration for instance —
@@ -73,3 +74,12 @@
  Ideally you should send us a copy of your source code changes as well as a
  binary. We will include it in our contributed binaries section on our FTP site
  along with an acknowledgement of your contribution.
+
+X-Comment: Modifications in the Debian package.
+ I have received the following message from Des Higgins. -- Charles Plessy
+ .
+   "We are happy to give the Debian team permission to modify
+   ClustalW 2 and ClustalX 2 code and redistribute the binaries as long as
+   those modifications do not alter the algorithmic core, i.e. only affect
+   installation routines, bug fixes etc. Please include the original
+   LICENSE file into your package."

Added: trunk/packages/clustalw/trunk/debian/overrides/clustalw
===================================================================
--- trunk/packages/clustalw/trunk/debian/overrides/clustalw	                        (rev 0)
+++ trunk/packages/clustalw/trunk/debian/overrides/clustalw	2008-03-06 05:24:38 UTC (rev 1521)
@@ -0,0 +1,4 @@
+# This file is included by upstream's request.
+# (See the last comment in /usr/share/doc/clustalw/copyright.)
+#
+clustalw: extra-license-file usr/share/doc/clustalw/LICENSE

Modified: trunk/packages/clustalw/trunk/debian/rules
===================================================================
--- trunk/packages/clustalw/trunk/debian/rules	2008-03-05 13:52:33 UTC (rev 1520)
+++ trunk/packages/clustalw/trunk/debian/rules	2008-03-06 05:24:38 UTC (rev 1521)
@@ -4,5 +4,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 install/clustalw::
-	# could anyone fix this and send this to upstream, please?
+	# We have to ask upstream if it is importnat for them that the binary is named clustalw2
 	mv $(CURDIR)/debian/clustalw/usr/bin/clustalw2 $(CURDIR)/debian/clustalw/usr/bin/clustalw
+
+	# That is a bit ugly and should be better investigated.
+	rmdir $(CURDIR)/debian/clustalw/usr/share/aclocal/