diff -Nru skktools-1.3.2/debian/changelog skktools-1.3.2/debian/changelog --- skktools-1.3.2/debian/changelog 2011-04-17 14:34:32.000000000 +0000 +++ skktools-1.3.2/debian/changelog 2012-02-12 04:26:59.000000000 +0000 @@ -1,3 +1,12 @@ +skktools (1.3.2-2) unstable; urgency=low + + * debian/patches/010_makedbmdic5.patch: Transition to Perl 5.16 for + makedbmdic5. (closes: #659427) + * debian/rules: New targets build-arch and build-indep. + * debian/copyright: Updated. + + -- Tatsuya Kinoshita Sun, 12 Feb 2012 13:26:38 +0900 + skktools (1.3.2-1) unstable; urgency=low * New upstream release. diff -Nru skktools-1.3.2/debian/copyright skktools-1.3.2/debian/copyright --- skktools-1.3.2/debian/copyright 2011-04-17 14:45:02.000000000 +0000 +++ skktools-1.3.2/debian/copyright 2012-02-12 03:44:04.000000000 +0000 @@ -76,7 +76,7 @@ gives unlimited permission to copy, distribute and modify it. Files: debian/* -Copyright: 2006-2011, Tatsuya Kinoshita +Copyright: 2006-2012, Tatsuya Kinoshita 2006, Matej Vela 2000-2003, Takao KAWAMURA License: diff -Nru skktools-1.3.2/debian/patches/010_makedbmdic5.patch skktools-1.3.2/debian/patches/010_makedbmdic5.patch --- skktools-1.3.2/debian/patches/010_makedbmdic5.patch 1970-01-01 00:00:00.000000000 +0000 +++ skktools-1.3.2/debian/patches/010_makedbmdic5.patch 2012-02-12 04:25:22.000000000 +0000 @@ -0,0 +1,24 @@ +Author: Tatsuya Kinoshita +Description: Transition to Perl 5.16 for makedbmdic5 +Bug-Debian: http://bugs.debian.org/659427 + +--- skktools-1.3.2.orig/dbm/makedbmdic5 2011-04-11 04:42:08.000000000 +0900 ++++ skktools-1.3.2/dbm/makedbmdic5 2012-02-12 13:11:39.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/jperl5 ++#!/usr/bin/perl + ######################################################### + # makedbmdic(perl5) version 5.0 1995.10.17 + # +@@ -17,8 +17,9 @@ + # Keywords: jisyo, dbm, gdbm, perl + # Last Modified: $Date: 2000/03/12 12:17:49 $ + +-require "getopts.pl"; +-&Getopts(BG); ++use Getopt::Std; ++getopts('BG'); ++our($opt_B, $opt_G); + + if (defined $opt_B){ + use DB_File; diff -Nru skktools-1.3.2/debian/patches/series skktools-1.3.2/debian/patches/series --- skktools-1.3.2/debian/patches/series 2011-04-14 09:58:23.000000000 +0000 +++ skktools-1.3.2/debian/patches/series 2012-02-12 04:13:56.000000000 +0000 @@ -1 +1,2 @@ +010_makedbmdic5.patch 020_skk2cdb-py.patch diff -Nru skktools-1.3.2/debian/rules skktools-1.3.2/debian/rules --- skktools-1.3.2/debian/rules 2011-04-10 15:21:35.000000000 +0000 +++ skktools-1.3.2/debian/rules 2012-02-12 03:41:37.000000000 +0000 @@ -1,6 +1,5 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 export CFLAGS = -Wall -g @@ -10,26 +9,28 @@ CFLAGS += -O2 endif -build: build-stamp -build-stamp: - dh_testdir +build-indep: +build-arch: build-arch-stamp +build-arch-stamp: + dh_testdir ./configure --prefix=/usr $(MAKE) + touch $@ - touch build-stamp +build: build-indep build-arch clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build*-stamp [ ! -f Makefile ] || $(MAKE) distclean rm -f libtool stamp-* dh_clean -install: build +install: build-arch dh_testdir dh_testroot dh_prep @@ -68,11 +69,9 @@ cp convert2skk/README debian/skktools/usr/share/doc/skktools/README.convert2skk cp READMEs/read.me debian/skktools/usr/share/doc/skktools/README.jperl -# Build architecture-independent files here. -binary-indep: build install +binary-indep: -# Build architecture-dependent files here. -binary-arch: build install +binary-arch: install dh_testdir dh_testroot dh_installchangelogs ChangeLog @@ -89,4 +88,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install