[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#678872: nmu diff



Hi,

attached is the diff between libticonv_1.1.0-1.dsc libticonv_1.1.0-1.1.dsc.

(I didn't upload 1.1.3-1 due to the freeze.)


cheers,
	Holger
diff -u libticonv-1.1.0/debian/copyright libticonv-1.1.0/debian/copyright
--- libticonv-1.1.0/debian/copyright
+++ libticonv-1.1.0/debian/copyright
@@ -1,16 +1,75 @@
-This package was created by Romain LIEVIN <roms@tilp.info> on
-Sun, 14 Jul 2002 11:58:51 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libticonv
+Upstream-Contact: Romain Lievin <roms@tilp.info>
+Source: http://sourceforge.net/project/showfiles.php?group_id=18378
 
-It was downloaded from
-    http://sourceforge.net/project/showfiles.php?group_id=18378
+Files: *
+Copyright: 1999-2006 TiLP team <tilp-users@lists.sf.net>
+License: GPL-2
+ 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 the Free Software Foundation in
+ version 2 of the license.
+ .
+ This program 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 full text of the GNU General Public
+ License version 2 can be found in the file
+ '/usr/share/common-licenses/GPL-2'.
 
-Upstream Author: Romain LIEVIN <roms@tilp.info>
+Files: src/charset.c src/filename.c src/tokens.c src/ticonv.c
+Copyright: 2006 Romain Lievin and Kevin Kofler
+License: GPL-2+
 
-Copyright:
+Files: src/charset.h
+Copyright: 2006 Kevin Kofler
+License: GPL-2+
 
-This software is copyright (c) 2007 by Romain LIEVIN.
+Files: src/export4.h
+Copyright: 1999-2005 Romain Lievin
+License: GPL-2+
+
+Files: src/stdints4.h
+Copyright: 1999-2005  Romain Lievin
+           2006 Tyler Cassidy
+License: GPL-2+
+
+Files: src/ticonv.h
+Copyright: 1999-2006 Romain Lievin and Kevin Kofler
+License: GPL-2+
+
+Files: debian/*
+Copyright: Copyright 2009 Krzysztof Burghardt <krzysztof@burghardt.pl>
+License: GPL-2+
+
+License: GPL-2+
+ 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 the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program 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 full text of the GNU General Public
+ License version 2 can be found in the file
+ '/usr/share/common-licenses/GPL-2'.
 
-You are free to distribute this software under the terms of the GNU Lesser
-General Public License.
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in /usr/share/common-licenses/LGPL file.
diff -u libticonv-1.1.0/debian/changelog libticonv-1.1.0/debian/changelog
--- libticonv-1.1.0/debian/changelog
+++ libticonv-1.1.0/debian/changelog
@@ -1,3 +1,12 @@
+libticonv (1.1.0-1.1) unstable; urgency=low
+
+  [ Holger Levsen ]
+  * Non-maintainer upload.
+  * Fix debian/copyright and update it to dep5 (Closes: #686635), thanks to
+    Tobias Bengfort for most of work.
+
+ -- Holger Levsen <holger@debian.org>  Sat, 15 Sep 2012 16:23:41 +0000
+
 libticonv (1.1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #503103)

Reply to: