Hi,

please find attached the patch for my just-uploaded NMU.

Mraw,
KiBi.
diff -u kakasi-2.3.4/debian/watch kakasi-2.3.4/debian/watch
--- kakasi-2.3.4/debian/watch
+++ kakasi-2.3.4/debian/watch
@@ -1,2 +1,2 @@
-# Site			Directory		Pattern			Version	Script
-kakasi.namazu.org	/pub/kakasi/stable	kakasi-(.*)\.tar\.gz	debian	uupdate
+version=3
+http://kakasi.namazu.org/stable/kakasi-(.*)\.tar\.gz
diff -u kakasi-2.3.4/debian/changelog kakasi-2.3.4/debian/changelog
--- kakasi-2.3.4/debian/changelog
+++ kakasi-2.3.4/debian/changelog
@@ -1,3 +1,22 @@
+kakasi (2.3.4-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS on avr32 (Closes: #535748) and ppc64 (Closes: #327131):
+     - Copy config.{guess,sub} before ./configure.
+     - Add autotools-dev to Build-Depends accordingly.
+  * Fix FTBFS on GNU/kFreeBSD (Closes: #306935):
+     - Call “autoreconf -vfi” before ./configure.
+     - Add autoconf, automake, libtool to Build-Depends accordingly.
+  * Fix watch file (Closes: #449790, #529120):
+     - Thanks to Yan Morin for the patch.
+  * Fix a few lintian warnings:
+     - Use debian/compat rather than DH_COMPAT.
+     - Add ${misc:Depends} to Build-Depends.
+     - Use ${binary:Version} in Build-Depends.
+     - Move dh_installdeb after dh_shlibdeps.
+
+ -- Cyril Brulebois <k...@debian.org>  Fri, 04 Dec 2009 22:33:14 +0100
+
 kakasi (2.3.4-3.1) unstable; urgency=low
 
   * Non-maintainer upload to fix almost empty copyright file.
diff -u kakasi-2.3.4/debian/rules kakasi-2.3.4/debian/rules
--- kakasi-2.3.4/debian/rules
+++ kakasi-2.3.4/debian/rules
@@ -9,9 +9,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -19,6 +16,11 @@
 build-stamp:
 	dh_testdir
 
+	# Update build environment:
+	cp /usr/share/misc/config.guess .
+	cp /usr/share/misc/config.sub   .
+	autoreconf -vfi
+
 	./configure --prefix=/usr
 	# Add here commands to compile the package.
 	#$(MAKE)
@@ -99,10 +101,10 @@
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_installdeb
 	dh_makeshlibs
 #	dh_perl
 	dh_shlibdeps
+	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff -u kakasi-2.3.4/debian/control kakasi-2.3.4/debian/control
--- kakasi-2.3.4/debian/control
+++ kakasi-2.3.4/debian/control
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Keita Maehara <maeh...@debian.org>
 Standards-Version: 3.5.5
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>> 3.0.0), autoconf, automake, libtool, autotools-dev
 
 Package: kakasi
 Architecture: any
-Depends: ${shlibs:Depends}, kakasi-dic
+Depends: ${shlibs:Depends}, ${misc:Depends}, kakasi-dic
 Description: KAnji KAna Simple Inverter
  KAKASI is the language processing filter to convert Kanji characters
  to Hiragana, Katakana or Romaji(1) and may be helpful to read
@@ -24,6 +24,7 @@
 
 Package: kakasi-dic
 Architecture: all
+Depends: ${misc:Depends}
 Conflicts: kakasi (<= 2.2.5-5)
 Description: KAKASI dictionary files
  This package provides KAKASI dictionary files. You have to install
@@ -38,7 +39,7 @@
 Package: libkakasi2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, kakasi-dic
+Depends: ${shlibs:Depends}, ${misc:Depends}, kakasi-dic
 Description: Library version of KAKASI
  This package provides the function of KAKASI as a shared library.
  .
@@ -51,7 +52,7 @@
 Package: libkakasi2-dev
 Section: devel
 Architecture: any
-Depends: libkakasi2 (= ${Source-Version}), libc6-dev
+Depends: libkakasi2 (= ${binary:Version}), ${misc:Depends}, libc6-dev
 Provides: kakasi-dev
 Conflicts: kakasi-dev
 Description: Header files and static libraries for library version of KAKASI
only in patch2:
unchanged:
--- kakasi-2.3.4.orig/debian/compat
+++ kakasi-2.3.4/debian/compat
@@ -0,0 +1 @@
+1

Attachment: signature.asc
Description: Digital signature

Reply via email to