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

[Charles Plessy]

Author: plessy
Date: 2009-10-06 09:51:06 +0000 (Tue, 06 Oct 2009)
New Revision: 4162

Added:
   trunk/packages/melting/trunk/debian/patches/tkmelting_call_melting.patch
Modified:
   trunk/packages/melting/trunk/debian/changelog
   trunk/packages/melting/trunk/debian/copyright
   trunk/packages/melting/trunk/debian/melting.install
   trunk/packages/melting/trunk/debian/patches/series
   trunk/packages/melting/trunk/debian/rules
Log:
This commit contains changes that solve the bug 549881, but anyway
tkmelting does not work so well.


Modified: trunk/packages/melting/trunk/debian/changelog
===================================================================
--- trunk/packages/melting/trunk/debian/changelog	2009-10-05 19:30:42 UTC (rev 4161)
+++ trunk/packages/melting/trunk/debian/changelog	2009-10-06 09:51:06 UTC (rev 4162)
@@ -1,3 +1,14 @@
+melting (4.3b-2) UNRELEASED; urgency=low
+
+  * debian/patches/tkmelting_call_melting.patch:
+    calls melting from the PATH with its base name (Closes: #549881).
+  * debian/melting/install:
+      multi.pl and profil.pl available in /usr/share/melting.
+  * debian/copyright refreshed to latest experimentations on the format.
+  * Target generating tkmelting manpage removed from debian/rules.
+
+ -- Charles Plessy <plessy at debian.org>  Tue, 06 Oct 2009 18:36:01 +0900
+
 melting (4.3b-1) unstable; urgency=low
 
   Tkmelting did not work in my tests.

Modified: trunk/packages/melting/trunk/debian/copyright
===================================================================
--- trunk/packages/melting/trunk/debian/copyright	2009-10-05 19:30:42 UTC (rev 4161)
+++ trunk/packages/melting/trunk/debian/copyright	2009-10-06 09:51:06 UTC (rev 4162)
@@ -8,22 +8,24 @@
 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'.
+	
+	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 version
+2 can be found in ‘/usr/share/common-licenses/GPL-2’.
+
 Files: debian/*
 Copyright: 2007–2009  Charles Plessy   <plessy at debian.org>
              2008     Andreas Tille     <tille at debian.org>

Modified: trunk/packages/melting/trunk/debian/melting.install
===================================================================
--- trunk/packages/melting/trunk/debian/melting.install	2009-10-05 19:30:42 UTC (rev 4161)
+++ trunk/packages/melting/trunk/debian/melting.install	2009-10-06 09:51:06 UTC (rev 4162)
@@ -1,2 +1,4 @@
 melting	usr/bin
 NNFILES	usr/share/melting
+BIN/multi.pl	usr/share/melting
+BIN/profil.pl	usr/share/melting

Modified: trunk/packages/melting/trunk/debian/patches/series
===================================================================
--- trunk/packages/melting/trunk/debian/patches/series	2009-10-05 19:30:42 UTC (rev 4161)
+++ trunk/packages/melting/trunk/debian/patches/series	2009-10-06 09:51:06 UTC (rev 4162)
@@ -1,2 +1,3 @@
 tkmelting.patch
 20_fix_manpage.patch
+tkmelting_call_melting.patch

Added: trunk/packages/melting/trunk/debian/patches/tkmelting_call_melting.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/tkmelting_call_melting.patch	                        (rev 0)
+++ trunk/packages/melting/trunk/debian/patches/tkmelting_call_melting.patch	2009-10-06 09:51:06 UTC (rev 4162)
@@ -0,0 +1,15 @@
+Description: calls melting from the PATH.
+Author: Charles Plessy <plessy at debian.org>
+Forwarded: no
+ Not yet forwarded, but will be.
+--- a/BIN/tkmelting.pl
++++ b/BIN/tkmelting.pl
+@@ -537,7 +537,7 @@ sub compute {
+ # C'est parti
+ #-------------
+     
+-    @results=`./melting4_4-linuxi386 $options -v -q 2>&1`;
++    @results=`melting $options -v -q 2>&1`;
+     print "@results";
+ 
+ #------------------------

Modified: trunk/packages/melting/trunk/debian/rules
===================================================================
--- trunk/packages/melting/trunk/debian/rules	2009-10-05 19:30:42 UTC (rev 4161)
+++ trunk/packages/melting/trunk/debian/rules	2009-10-06 09:51:06 UTC (rev 4162)
@@ -15,16 +15,6 @@
 
 include /usr/share/quilt/quilt.make
 
-XP=xsltproc \
-	-''-nonet \
-	-''-param man.charmap.use.subset "0" \
-	-''-param make.year.ranges "1" \
-	-''-param make.single.year.ranges "1" \
-	-o debian/
-
-tkmelting.1: debian/tkmelting.1.xml
-	$(XP) $<
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir