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

Bug#670800: [PATCH] latex-cjk-japanese-wadalab: Helping to update to Copyright format 1.0



Package: latex-cjk-japanese-wadalab
Severity: wishlist
Tags: patch

Hi,

I had some free time; see attached patch to migrate to new Copyright
Format <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>.

Notes:

    I also completed previous Debian release's migration away from dpatch
    by canoncalizing the files in debian/patches directory: use DEP-3, use
    *.patch extension etc.

Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.

Thanks,
Jari

>From 1a1623d1e9202e5688eed9625ea44d19f925345f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 29 Apr 2012 08:28:14 +0300
Subject: [PATCH] format-1.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 debian/changelog                                   |   16 ++++
 debian/compat                                      |    2 +-
 debian/control                                     |    2 +-
 debian/copyright                                   |   98 +++++++++++++-------
 .../{01_fix_wftodm.dpatch => 01-fix-wftodm.patch}  |   21 ++---
 ..._makefont.dpatch => 02-automate-makefont.patch} |    5 +-
 ...te_fixwada.dpatch => 03-automate-fixwada.patch} |    5 +-
 debian/patches/series                              |    6 +-
 debian/rules                                       |    2 +-
 9 files changed, 96 insertions(+), 61 deletions(-)
 rename debian/patches/{01_fix_wftodm.dpatch => 01-fix-wftodm.patch} (66%)
 mode change 100755 => 100644
 rename debian/patches/{02_automate_makefont.dpatch => 02-automate-makefont.patch} (87%)
 rename debian/patches/{03_automate_fixwada.dpatch => 03-automate-fixwada.patch} (80%)

diff --git a/debian/changelog b/debian/changelog
index 16c6d4b..f6dab43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+latex-cjk-japanese-wadalab (0.20050817-16.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to debhelper to 9.
+  * debian/compat
+    - Update to 9.
+  * debian/copyright
+    - Migrate to Copyright Format 1.0.
+  * debian/patches:
+    - Add DEP-3 headers.
+    - Change to standard *.patch suffix and (-) in file names.
+  * debian/rules:
+    - Replace deprecated dh_prep and use dh_prep.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sun, 29 Apr 2012 08:24:44 +0300
+
 latex-cjk-japanese-wadalab (0.20050817-16) unstable; urgency=low
 
   * debian/control: add Danai and myself to uploaders
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 126fe64..0e4de14 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: tex
 Priority: optional
 Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Danai SAE-HAN (韓達耐) <danai@debian.org>, Norbert Preining <preining@debian.org>
-Build-Depends: debhelper (>= 8.1.0~), tex-common (>= 3)
+Build-Depends: debhelper (>= 9), tex-common (>= 3)
 Build-Depends-Indep: t1utils, texlive-font-utils, perl-base (>= 5.8.0)
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/latex-cjk-japanese-wadalab/trunk
diff --git a/debian/copyright b/debian/copyright
index 8645195..782d7a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,40 +1,70 @@
-This package was debianized by Danai Sae-Han (韓達耐) <danai.sae-han@edpnet.be> on
-Sun, 14 Aug 2005 15:42:30 +0200.
-
-It was downloaded from <ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/>
-The debian/ package is released under the GNU General Public
-License version 2 or higher.
-
-Upstream Author: Tetsuro TANAKA <ktanaka@tanaka.ecc.u-tokyo.ac.jp>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: latex-cjk-japanese-wadalab
+Upstream-Contact: Tetsuro TANAKA <ktanaka@tanaka.ecc.u-tokyo.ac.jp>
+Source: None
+X-Upstream-Comment:
+  2012-04-29 Upstream URL no longer exists at
+  ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/
 
+Files: *
 Copyright:
+  1994 Tetsuro TANAKA <ktanaka@tanaka.ecc.u-tokyo.ac.jp>
+License: Custom
 
-  Copyright (1994) Tetsuro TANAKA <ktanaka@tanaka.ecc.u-tokyo.ac.jp>
-
-(copied from Taketoshi Sano <sano@debian.org>'s gsfonts-wadalab-mincho
-Debian package)
-
- (official text is written in Japanese. This is a rough
-  translation by me. For detail evaluation, please read
-  <ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/README.nihongo>.
-  I've contacted the upstream maintainer and he replied that
-  the License in Japanese is applicable world-wide.)
-
- ---
-
-You can use/modify/distribute this font as long as:
-
-  1) add a note which explains that the distributed fonts
-     are derived from wadalab fonts which is distributed
-     at ftp.ipl.t.u-tokyo.ac.jp
+Files: build/*.pl
+Copyright:
+  1994-2008  Werner Lemberg <wl@gnu.org>
+License: GPL-2+
 
-  2) if the redistribution is the modified one from the original
-     font archives, then provide some documentations which explain
-     the changes/modifications from the original font archives.
+Files: debian/*
+Copyright:
+  2012 Norbert Preining <preining@debian.org>
+  2012 Jari Aalto <jari.aalto@cante.net>
+  2005-2009 Danai Sae-Han (韓達耐) <danai@debian.org>
+License: GPL-2+
 
-These conditions are to inform users about where they
-can get the most updated font from, because we plan
-to update it.
+License: GPL-2+
+ This package 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 package 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 program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
 
-If you find the badly designed glyphs, or wrong kanji
-characters, please contact at tanaka@ipl.t.u-tokyo.ac.jp
+License: Custom
+  [copied from Taketoshi Sano <sano@debian.org>'s gsfonts-wadalab-minchoa
+  Debian package]
+  .
+   (official text is written in Japanese. This is a rough
+    translation by Danai Sae-Han. For detail evaluation, please read
+    <ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/README.nihongo>.
+    I've contacted the upstream maintainer and he replied that
+    the License in Japanese is applicable world-wide.)
+  .
+   ---
+  .
+  You can use/modify/distribute this font as long as:
+  .
+    1) add a note which explains that the distributed fonts
+       are derived from wadalab fonts which is distributed
+       at ftp.ipl.t.u-tokyo.ac.jp
+  .
+    2) if the redistribution is the modified one from the original
+       font archives, then provide some documentations which explain
+       the changes/modifications from the original font archives.
+  .
+  These conditions are to inform users about where they
+  can get the most updated font from, because we plan
+  to update it.
+  .
+  If you find the badly designed glyphs, or wrong kanji
+  characters, please contact at tanaka@ipl.t.u-tokyo.ac.jp
diff --git a/debian/patches/01_fix_wftodm.dpatch b/debian/patches/01-fix-wftodm.patch
old mode 100755
new mode 100644
similarity index 66%
rename from debian/patches/01_fix_wftodm.dpatch
rename to debian/patches/01-fix-wftodm.patch
index 39adc0d..37cccc1
--- a/debian/patches/01_fix_wftodm.dpatch
+++ b/debian/patches/01-fix-wftodm.patch
@@ -1,19 +1,10 @@
-01_fix_wftodm.dpatch by <danai.sae-han@edpnet.be>
+From: Werner Lemberg (author of the CJK macro for LaTeX)
+Subject: enable partial font downloading
+  - It also contains a fix to set just one directory as argument instead
+    of two, without exiting with a 0300 code.
+  - And last but not least it fixes a segfault on Debian AMD64:
+    it needs <time.h> instead of <sys/time.h>.
 
-This fix is from Werner Lemberg (author of the CJK macro for LaTeX).
-It modifies wftodm to enable partial font downloading.
-It also contains a fix to set just one directory as argument instead
-of two, without exiting with a 0300 code.
-And last but not least it fixes a segfault on Debian AMD64:
-it needs <time.h> instead of <sys/time.h>.
-
-
----
- wftodm.c |   14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-Index: latex-cjk-japanese-wadalab-0.20050817/wftodm.c
-===================================================================
 --- latex-cjk-japanese-wadalab-0.20050817.orig/wftodm.c	2005-08-14 22:33:23.000000000 +0900
 +++ latex-cjk-japanese-wadalab-0.20050817/wftodm.c	2012-03-23 18:21:26.000000000 +0900
 @@ -1,6 +1,8 @@
diff --git a/debian/patches/02_automate_makefont.dpatch b/debian/patches/02-automate-makefont.patch
similarity index 87%
rename from debian/patches/02_automate_makefont.dpatch
rename to debian/patches/02-automate-makefont.patch
index a05f603..4fdc037 100644
--- a/debian/patches/02_automate_makefont.dpatch
+++ b/debian/patches/02-automate-makefont.patch
@@ -1,6 +1,5 @@
-02_automate_makefont.dpatch by <danai.sae-han@edpnet.be>
-
-Add -f to the mv and rm commands.
+From: <danai.sae-han@edpnet.be>
+Subject: Add -f to the mv and rm commands
 
 --- ./debian/makefont.orig	2005-08-14 23:49:34.000000000 +0200
 +++ ./debian/makefont	2005-08-14 23:50:23.000000000 +0200
diff --git a/debian/patches/03_automate_fixwada.dpatch b/debian/patches/03-automate-fixwada.patch
similarity index 80%
rename from debian/patches/03_automate_fixwada.dpatch
rename to debian/patches/03-automate-fixwada.patch
index fe7390d..6ca5274 100644
--- a/debian/patches/03_automate_fixwada.dpatch
+++ b/debian/patches/03-automate-fixwada.patch
@@ -1,6 +1,5 @@
-03_automate_fixwada.dpatch by <danai.sae-han@edpnet.be>
-
-Add -f to rm and mv.
+From: <danai.sae-han@edpnet.be>
+Subject: Add -f to rm and mv
 
 --- ./debian/fixwada.orig	2005-08-14 23:57:29.000000000 +0200
 +++ ./debian/fixwada	2005-08-14 23:57:43.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
index d2dd829..0d85742 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01_fix_wftodm.dpatch
-#02_automate_makefont.dpatch
-#03_automate_fixwada.dpatch
+01-fix-wftodm.patch
+#02-automate-makefont.patch
+#03-automate-fixwada.patch
diff --git a/debian/rules b/debian/rules
index 0034d9c..df97e93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ clean:
 install:
 	dh_testdir
 	dh_testroot
-#	dh_clean -k 
+#	dh_prep
 	dh_installdirs
 
 
-- 
1.7.10


Reply to: