[med-svn] r3387 - in trunk/packages/melting/trunk/debian: . patches

Charles Plessy plessy at alioth.debian.org
Sun May 17 15:02:51 UTC 2009


Author: plessy
Date: 2009-05-17 15:02:50 +0000 (Sun, 17 May 2009)
New Revision: 3387

Added:
   trunk/packages/melting/trunk/debian/reference
Removed:
   trunk/packages/melting/trunk/debian/patches/makefile-clean.patch
   trunk/packages/melting/trunk/debian/patches/makefile.patch
   trunk/packages/melting/trunk/debian/patches/melting.1_escape.patch
   trunk/packages/melting/trunk/debian/patches/melting.c_silent.patch
Modified:
   trunk/packages/melting/trunk/debian/changelog
   trunk/packages/melting/trunk/debian/compat
   trunk/packages/melting/trunk/debian/control
   trunk/packages/melting/trunk/debian/copyright
   trunk/packages/melting/trunk/debian/patches/series
   trunk/packages/melting/trunk/debian/patches/tkmelting.patch
   trunk/packages/melting/trunk/debian/rules
   trunk/packages/melting/trunk/debian/tkmelting.1
   trunk/packages/melting/trunk/debian/tkmelting.1.xml
   trunk/packages/melting/trunk/debian/watch
Log:
New upstream release, but not ready for upload as the manual's source dissapeared.

  * New upstream release, with new options for Tris, potassium and magnesium
    concentrations, as well as support for inosine bases.
  * debian/control:
    - Moved bibliographic reference from the long description to a BibTeX file
      (debian/reference, installed in /usr/share/doc/melting/reference).
    - Incremented Standards-Version to reflect conformance with Policy 3.8.1
      (no changes needed).
    - Improved the description of melting-gui (Closes: #528999).
    - Dropped versionned build-dependency on quilt (satisfied even in
      oldstable).
    - Build-Depend on dephelper 7 (debian/compat set to 7).
  * debian/rules
    - NNDIR=/usr/share/melting/NNFILES passed as a make argument instead of
      through a patch (debian/patches/makefile.patch deleted).
    - clean target rewritten so that debian/patches/makefile-clean.patch could
      be deleted.
    - Use ?\226?\128?\152dh?\226?\128?\153 in binary-arch and binary-indep targets.
  * Deleted debian/patches/melting.c_silent.patch and
    debian/patches/melting.1_escape.patch cosmetic deviations from Upstream.
  * debian/copyright updated and converted to latest version of the
    machine-readable format.


Modified: trunk/packages/melting/trunk/debian/changelog
===================================================================
--- trunk/packages/melting/trunk/debian/changelog	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/changelog	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,3 +1,32 @@
+melting (4.3-1) UNRELEASED; urgency=low
+
+  The LaTeX source of the documentation disappeared. The package can not be
+  uploaded as is.
+
+  * New upstream release, with new options for Tris, potassium and magnesium
+    concentrations, as well as support for inosine bases.
+  * debian/control:
+    - Moved bibliographic reference from the long description to a BibTeX file
+      (debian/reference, installed in /usr/share/doc/melting/reference).
+    - Incremented Standards-Version to reflect conformance with Policy 3.8.1
+      (no changes needed).
+    - Improved the description of melting-gui (Closes: #528999).
+    - Dropped versionned build-dependency on quilt (satisfied even in
+      oldstable).
+    - Build-Depend on dephelper 7 (debian/compat set to 7).
+  * debian/rules
+    - NNDIR=/usr/share/melting/NNFILES passed as a make argument instead of
+      through a patch (debian/patches/makefile.patch deleted).
+    - clean target rewritten so that debian/patches/makefile-clean.patch could
+      be deleted.
+    - Use ‘dh’ in binary-arch and binary-indep targets.
+  * Deleted debian/patches/melting.c_silent.patch and
+    debian/patches/melting.1_escape.patch cosmetic deviations from Upstream.
+  * debian/copyright updated and converted to latest version of the
+    machine-readable format.
+
+ -- Charles Plessy <plessy at debian.org>  Sun, 17 May 2009 18:29:37 +0900
+
 melting (4.2h-3) unstable; urgency=low
 
   * Changed the doc-base section according to the new policy.
@@ -31,7 +60,7 @@
 
 melting (4.2h-1) unstable; urgency=low
 
-  * New upstream version: swich to UTF-8 encoding.
+  * New upstream version: switch to UTF-8 encoding.
   * Corrects a typo in package description (Closes: #422983).
   * Debian Menu transition: Apps/Science becomes Applications/Science/Biology.
 

Modified: trunk/packages/melting/trunk/debian/compat
===================================================================
--- trunk/packages/melting/trunk/debian/compat	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/compat	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1 +1 @@
-5
+7

Modified: trunk/packages/melting/trunk/debian/control
===================================================================
--- trunk/packages/melting/trunk/debian/control	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/control	2009-05-17 15:02:50 UTC (rev 3387)
@@ -6,17 +6,17 @@
 Uploaders: Charles Plessy <plessy at debian.org>,
  David Paleino <d.paleino at gmail.com>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), quilt
+Standards-Version: 3.8.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/melting/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/melting/trunk/
-Homepage: http://www.ebi.ac.uk/~lenov/meltinghome.html
+Homepage: http://www.ebi.ac.uk/compneur-srv/melting/
 
 Package: melting
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: melting-gui
-Description: computing the melting temperature of nucleic acid duplex
+Description: compute the melting temperature of nucleic acid duplex
  This program computes, for a nucleic acid duplex, the enthalpy, the
  entropy and the melting temperature of the helix-coil
  transitions. Three types of hybridisation are possible: DNA/DNA,
@@ -24,12 +24,12 @@
  enthalpy and entropy from the elementary parameters of each Crick's
  pair by the nearest-neighbor method. Then the melting temperature is
  computed. The set of thermodynamic parameters can be easily changed,
- for instance following an experimental breakthrough. Melting was
- published in Le Novère N. (2001), Bioinformatics, 17: 1226-1227.
+ for instance following an experimental breakthrough.
 
 Package: melting-gui
 Architecture: all
-Depends: perl-tk, melting
-Description: Graphical user interface for melting
- This package provides a graphical user interface to the "melting"
- program.
+Depends: perl-tk, melting, ${misc:Depends}
+Description: compute the melting temperature of nucleic acid duplex
+ This package provides a graphical user interface for the “melting”
+ program, which computes for a nucleic acid duplex the enthalpy, the entropy
+ and the melting temperature of the helix-coil transitions.

Modified: trunk/packages/melting/trunk/debian/copyright
===================================================================
--- trunk/packages/melting/trunk/debian/copyright	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/copyright	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,31 +1,33 @@
-This package was debianized by Charles Plessy
-<charles-debian-nospam at plessy.org> on Wed, 11 Apr 2007 21:19:19 +0900.
+Format: Machine-readable license summary, see ‘http://dep.debian.net/deps/dep5/’.
 
-Melting was downloaded from http://www.ebi.ac.uk/~lenov/meltinghome.html
+Name: Melting
+Contact: Nicolas Le Novère   <lenov at ebi.ac.uk>
+         Marine Dumousseau  <marine at ebi.ac.uk>
+Source: http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/m/me/melting/melting4_3.tar.gz
 
-Upstream Author: Nicolas Le Novère <lenov at ebi.ac.uk>
+Copyright: 1997–2009, Nicolas Le Novère   <lenov at ebi.ac.uk>
+           1997–2009, Marine Dumousseau  <marine at ebi.ac.uk>
+License: GPL-2+
+ Melting is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ Melting is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Comment: On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Copyright: 1997-2004 Nicolas Le Novère
-
+Files: debian/*
+Copyright: 2007–2009  Charles Plessy   <plessy at debian.org>
+             2008     Andreas Tille     <tille at debian.org>
+             2008     David Paleino  <d.paleino at gmail.com>
 License:
-
-   Melting is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   Melting is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2007, Charles Plessy
-<charles-debian-nospam at plessy.org>. You can use, redistribute, modify
-the packaging work as if it were in the public domain.
+ You can use, redistribute, modify
+ the packaging work as if it were in the public domain.

Deleted: trunk/packages/melting/trunk/debian/patches/makefile-clean.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/makefile-clean.patch	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/patches/makefile-clean.patch	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,11 +0,0 @@
---- ./makefile.unices.old	2007-08-20 23:51:40.000000000 +0900
-+++ ./makefile.unices	2007-08-20 23:52:42.000000000 +0900
-@@ -69,7 +69,7 @@
- 
- .PHONY : clean
- clean :
--	rm $(OBJECTS) melting
-+	rm -f $(OBJECTS) melting
- 
- 
- 

Deleted: trunk/packages/melting/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/makefile.patch	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/patches/makefile.patch	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,11 +0,0 @@
---- ./makefile.unices	2007-04-12 17:40:22.000000000 +0900
-+++ ./makefile.unices.debian	2007-04-12 18:37:59.000000000 +0900
-@@ -37,7 +37,7 @@
- 
- # where to find the files containing the sets of nearest_neighbor parameters. 
- # This one is to initialise the default value of melting. 
--NNDIR = $(prefix)/share/MELTING/NNFILES
-+NNDIR = /usr/share/melting/NNFILES
- 
- #INSTALL = /usr/bin/install -c
- VPATH = $(srcdir)

Deleted: trunk/packages/melting/trunk/debian/patches/melting.1_escape.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/melting.1_escape.patch	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/patches/melting.1_escape.patch	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,37 +0,0 @@
---- ./DOC/melting.1	2007-04-12 09:51:08.000000000 +0900
-+++ ./DOC/melting.1.debian	2007-04-13 09:32:14.000000000 +0900
-@@ -1,6 +1,6 @@
- .\" MAN PAGE COMMENTS to
- .\"
--.\"     Nicolas Le Novère
-+.\"     Nicolas Le Nov\(`ere
- .\"     EMBL-EBI, Wellcome-Trust Genome Campus
- .\"     Hinxton Cambridge, CB10 1SD, UK
- .\"     lenov at ebi.ac.uk
-@@ -402,7 +402,7 @@
- .I Nucleic Acids Res
- 28: 1929-1934
- 
--Breslauer K.J., Frank R., Bl�ker H., Marky L.A. (1986).
-+Breslauer K.J., Frank R., Bloecker H., Marky L.A. (1986).
- Predicting DNA duplex stability from the base sequence. 
- .I Proc Natl Acad Sci USA 
- 83: 3746-3750
-@@ -501,7 +501,7 @@
- backslash could actually be a mistyped base).
- 
- .SH COPYRIGHT
--Melting is copyright (C) 1997, 2006 by Nicolas Le Novère
-+Melting is copyright (C) 1997, 2006 by Nicolas Le Nov\(`ere
- 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -526,7 +526,7 @@
- Chuche.
- 
- .SH AUTHOR
--Nicolas Le Novère,
-+Nicolas Le Nov\(`ere,
- EMBL-EBI, Wellcome-Trust Genome Campus
- Hinxton Cambridge, CB10 1SD, UK
- lenov at ebi.ac.uk

Deleted: trunk/packages/melting/trunk/debian/patches/melting.c_silent.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/melting.c_silent.patch	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/patches/melting.c_silent.patch	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,17 +0,0 @@
---- ./SRC/melting.c	2007-04-12 17:40:21.000000000 +0900
-+++ ./SRC/melting.c.debian	2007-04-12 19:55:06.000000000 +0900
-@@ -134,9 +134,11 @@
- 
-     /* read the environment variable specifying the repository directory */
-     if ( (ps_getenv = getenv("NN_PATH")) == NULL){ 
--	fprintf(ERROR," The environment variable NN_PATH is not defined. I will\n"
--		" therefore use the default value defined during the compilation\n"
--		" to look for the file containing the regular parameters.\n");
-+/* Be silent please  */
-+/*	fprintf(ERROR," The environment variable NN_PATH is not defined. I will\n"
-+ *		" therefore use the default value defined during the compilation\n"
-+ *		" to look for the file containing the regular parameters.\n");
-+ */
- 	ps_getenv = NN_BASE;
-     }
- 

Modified: trunk/packages/melting/trunk/debian/patches/series
===================================================================
--- trunk/packages/melting/trunk/debian/patches/series	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/patches/series	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,5 +1 @@
-makefile.patch
 tkmelting.patch
-melting.c_silent.patch
-melting.1_escape.patch
-makefile-clean.patch

Modified: trunk/packages/melting/trunk/debian/patches/tkmelting.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/tkmelting.patch	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/patches/tkmelting.patch	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,7 +1,12 @@
-Index: trunk/BIN/tkmelting.pl
+Author: Charles Plessy
+Description: Find perl in /usr/bin, and use a different hardcoded path to the help.
+Forwarded: not yet.
+License: same as Melting itself.
+
+Index: melting4_3/BIN/tkmelting.pl
 ===================================================================
---- trunk.orig/BIN/tkmelting.pl	2007-04-12 10:31:19.000000000 +0900
-+++ trunk/BIN/tkmelting.pl	2007-04-22 11:45:40.000000000 +0900
+--- melting4_3.orig/BIN/tkmelting.pl
++++ melting4_3/BIN/tkmelting.pl
 @@ -1,4 +1,5 @@
 -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+ "$@"}' && eval 'exec perl -S $0 $argv:q' if 0;
 +#!/usr/bin/perl
@@ -9,7 +14,7 @@
  
  ##############################################################################
  #                                   MELTING                                  #
-@@ -398,7 +399,7 @@
+@@ -449,7 +450,7 @@
  					     )->pack(-expand => 1,
  						     -fill   => 'both'
  						   );

Added: trunk/packages/melting/trunk/debian/reference
===================================================================
--- trunk/packages/melting/trunk/debian/reference	                        (rev 0)
+++ trunk/packages/melting/trunk/debian/reference	2009-05-17 15:02:50 UTC (rev 3387)
@@ -0,0 +1,12 @@
+ at article{NicolasLe    Novere12012001,
+author = {Le    Novere, Nicolas},
+title = {{MELTING, computing the melting temperature of nucleic acid  duplex}},
+journal = {Bioinformatics},
+volume = {17},
+number = {12},
+pages = {1226-1227},
+doi = {10.1093/bioinformatics/17.12.1226},
+year = {2001},
+URL = {http://bioinformatics.oxfordjournals.org/cgi/content/abstract/17/12/1226},
+eprint = {http://bioinformatics.oxfordjournals.org/cgi/reprint/17/12/1226.pdf}
+}

Modified: trunk/packages/melting/trunk/debian/rules
===================================================================
--- trunk/packages/melting/trunk/debian/rules	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/rules	2009-05-17 15:02:50 UTC (rev 3387)
@@ -31,29 +31,22 @@
 	cp makefile.unices Makefile
 	touch $@
 
-build: build-arch build-indep
-
-build-arch: patch build-arch-stamp
-build-arch-stamp: configure-stamp 
-	$(MAKE) 
+build: patch configure build-stamp
+build-stamp:
+	$(MAKE) NNDIR=/usr/share/melting/NNFILES 
 	touch $@
 
-build-indep: patch build-indep-stamp
-build-indep-stamp:
-	touch $@
-
-clean: patch clean-patched unpatch
-clean-patched: configure
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean build-arch-stamp build-indep-stamp configure-stamp Makefile 
+	$(RM) melting.o decode.o calcul.o melting
+	dh_clean build-arch-stamp build-indep-stamp configure-stamp Makefile
 
 install: install-indep install-arch
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i 
+	dh_prep -i 
 	dh_installdirs -i
 	dh_install -i
 	install -D BIN/tkmelting.pl $(CURDIR)/debian/melting-gui/usr/bin/tkmelting
@@ -63,40 +56,17 @@
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s 
+	dh_prep -s 
 	dh_installdirs -s
 #	install melting $(CURDIR)/debian/melting/usr/bin
 	dh_install -s
 
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_desktop
-	dh_installman
-#	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-#	dh_perl
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary: binary-arch binary-indep
+binary-indep: build install
+	dh binary-indep
+binary-arch: build install-arch
+	dh binary-arch
 
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
 # This is useful to download the orig.gz sources before running svn-buildpackage
 tarballs:
 	[ -d ../tarballs ] || mkdir ../tarballs

Modified: trunk/packages/melting/trunk/debian/tkmelting.1
===================================================================
--- trunk/packages/melting/trunk/debian/tkmelting.1	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/tkmelting.1	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,50 +1,55 @@
 .\"     Title: TKMELTING
-.\"    Author: Nicolas Le Nov\(`ere <lenov at ebi.ac.uk>
+.\"    Author: Nicolas Le Novère <lenov at ebi.ac.uk>
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 2007-04-12
+.\"      Date: 05/17/2009
 .\"    Manual: Melting Manual
-.\"    Source: tkmelting 0.004
+.\"    Source: tkmelting 0.005
 .\"
-.TH "TKMELTING" "1" "2007\-04\-12" "tkmelting 0.004" "Melting Manual"
+.TH "TKMELTING" "1" "05/17/2009" "tkmelting 0.005" "Melting Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-tkmelting - Tk interface to MELTING
+tkmelting \- Tk interface to MELTING
 .SH "SYNOPSIS"
 .HP 10
 \fBtkmelting\fR
 .SH "DESCRIPTION"
 .PP
 \fBtkmelting\fR
-starts a graphical user interface to MELTING, a program to calculate for a DNA/DNA, DNA/RNA, and RNA/RNA duplex, the enthalpy, the entropy of the helix\-coil transition, and then its melting temperature\.
+starts a graphical user interface to MELTING, a program to calculate for a DNA/DNA, DNA/RNA, and RNA/RNA duplex, the enthalpy, the entropy of the helix\-coil transition, and then its melting temperature\&.
 .SH "SEE ALSO"
 .PP
 \fBmelting\fR(1)
 .SH "AUTHORS"
 .PP
-\fBNicolas Le Nov\(`ere\fR <\&lenov at ebi\.ac\.uk\&>
+\fBNicolas Le Novère\fR <\&lenov at ebi\&.ac\&.uk\&>
 .sp -1n
 .IP "" 4
-tkmelting
+Wrote tkmelting
 .PP
-\fBCharles Plessy\fR <\&charles\-debian\-nospam at plessy\.org\&>
+\fBMarine Dumousseau\fR <\&(marine at ebi\&.ac\&.uk\&>
 .sp -1n
 .IP "" 4
-Wrote and this manpage in DocBook XML for the Debian distribution\.
+Wrote tkmelting
+.PP
+\fBCharles Plessy\fR <\&plessy at debian\&.org\&>
+.sp -1n
+.IP "" 4
+Wrote and this manpage in DocBook XML for the Debian distribution\&.
 .SH "COPYRIGHT"
-Copyright \(co 1996-2006 Nicolas le Nov\(`ere
+Copyright \(co 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Nicolas le Novère, Marine Dumousseau
 .br
-Copyright \(co 2007 Charles Plessy
+Copyright \(co 2007, 2009 Charles Plessy
 .br
 .PP
-Tkmelting is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version\.
+Tkmelting is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version\&.
 .PP
-Tkmelting is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. See the GNU General Public License for more details\.
+Tkmelting is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU General Public License for more details\&.
 .PP
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc\., 59 Temple Place, Suite 330, Boston, MA 02111\-1307 USA
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc\&., 59 Temple Place, Suite 330, Boston, MA 02111\-1307 USA
 .PP
-On Debian systems, you can find a copy of the GNU General Public License in
-\fI/usr/share/common\-licences/GPL\fR\. The manpage of tkmelting can be used under the same terms as tkmelting itself\.
+On Debian systems, you can find a copy of the GNU General Public License version 2 in
+\fI/usr/share/common\-licences/GPL\-2\fR\&. The manpage of tkmelting can be used under the same terms as tkmelting itself\&.
 .sp

Modified: trunk/packages/melting/trunk/debian/tkmelting.1.xml
===================================================================
--- trunk/packages/melting/trunk/debian/tkmelting.1.xml	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/tkmelting.1.xml	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?xml-stylesheet type="text/xsl"
 	href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!-- Process this file with an XSLT processor, e.g. xsltproc:    -->
 <!-- `xsltproc \
@@ -14,11 +14,9 @@
 
   <!ENTITY dhfirstname "Charles">
   <!ENTITY dhsurname   "Plessy">
-  <!ENTITY dhemail     "charles-debian-nospam at plessy.org">
+  <!ENTITY dhemail     "plessy at debian.org">
   <!ENTITY dhusername  "&dhfirstname; &dhsurname;">
-  <!ENTITY dhrelease   "0.004">
-  <!-- Please adjust the date whenever revising the manpage.     -->
-  <!ENTITY dhdate      "2007-04-12">
+  <!ENTITY dhrelease   "0.005">
   <!ENTITY dhtitle     "Melting Manual">
   <!ENTITY dhucpackage "TKMELTING">
   <!ENTITY dhpackage   "tkmelting">
@@ -32,12 +30,11 @@
 		<title>&dhtitle;</title>
 		<productname>&dhpackage;</productname>
 		<releaseinfo role="version">&dhrelease;</releaseinfo>
-		<date>&dhdate;</date>
 		<authorgroup>
 			<author>
 				<firstname>Nicolas</firstname>
 				<surname>Le Novère</surname>
-				<contrib>tkmelting</contrib>
+				<contrib>Wrote tkmelting</contrib>
         <address>
           <affiliation>
             <orgname>EMBL-EBI</orgname>
@@ -49,7 +46,24 @@
 					<email>lenov at ebi.ac.uk</email>
 				</address>
 			</author>
+			
 			<author>
+				<firstname>Marine</firstname>
+				<surname>Dumousseau</surname>
+				<contrib>Wrote tkmelting</contrib>
+				<address>
+					<affiliation>
+					<orgname>EMBL-EBI</orgname>
+					</affiliation>
+					<street>Wellcome-Trust Genome Campus Hinxton</street>
+					<city>Cambridge</city>
+					<postcode>CB10 1SD</postcode>
+					<country>UK</country>
+					<email>(marine at ebi.ac.uk</email>
+				</address>
+			</author>
+			
+			<author>
 				<firstname>&dhfirstname;</firstname>
 				<surname>&dhsurname;</surname>
 				<contrib>Wrote and this manpage in DocBook XML for the Debian distribution.</contrib>
@@ -70,10 +84,15 @@
       <year>2004</year>
 			<year>2005</year>
 			<year>2006</year>
+			<year>2007</year>
+			<year>2008</year>
+			<year>2009</year>
 			<holder>Nicolas le Novère</holder>
+			<holder>Marine Dumousseau</holder>
 		</copyright>
 		<copyright>
 			<year>2007</year>
+			<year>2009</year>
 			<holder>&dhusername;</holder>
 		</copyright>
 		<legalnotice>
@@ -90,7 +109,7 @@
       </para>
       
       <para>
-        On Debian systems, you can find a copy of the GNU General Public License in <filename>/usr/share/common-licences/GPL</filename>. The manpage of tkmelting can be used under the same terms as tkmelting itself.
+        On Debian systems, you can find a copy of the GNU General Public License version 2 in <filename>/usr/share/common-licences/GPL-2</filename>. The manpage of tkmelting can be used under the same terms as tkmelting itself.
       </para>
 		</legalnotice>
 	</refentryinfo>

Modified: trunk/packages/melting/trunk/debian/watch
===================================================================
--- trunk/packages/melting/trunk/debian/watch	2009-05-17 10:52:08 UTC (rev 3386)
+++ trunk/packages/melting/trunk/debian/watch	2009-05-17 15:02:50 UTC (rev 3387)
@@ -1,5 +1,2 @@
 version=3
-http://www.ebi.ac.uk/~lenov/SOFTWARES/ melting(.*?)_(.*?)\.tar\.gz
-
-
-
+http://sf.net/melting/melting(.*?)_(.*?)\.tar\.gz




More information about the debian-med-commit mailing list