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

Bug#727380: Debdiff for a QA upload



tags 724058 patch
tags 727380 patch
thanks

Hi there,

please find attached a debdiff for a QA upload that fixes these issues:

freewnn (1.1.1~a021+cvs20130302-4) unstable; urgency=low

  * QA upload.
  * debian/patches/fix-parallel-build.patch: (Closes: #724058)
    - Add patch from upstream to fix:
      "mv: cannot stat 'std.fzk': No such file or directory"
      during parallel build.
  * debian/control, debian/rules:
    - Use autotools-dev and it's dh addon to update config.guess/sub
      (Closes: #727380)
  * Run wrap-and-sort to make files in the debian-directory more readable

 -- Andreas Moog <amoog@ubuntu.com>  Mon, 18 Nov 2013 23:36:27 +0100

I will need the package sponsored as I don't have upload rights.

Thanks for considering the patch.

-- 
Andreas Moog, Berliner Str. 29, 36205 Sontra/Germany
Ubuntu Developer
PGP-encrypted mails preferred (Key-ID: 74DE6624)
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/changelog freewnn-1.1.1~a021+cvs20130302/debian/changelog
--- freewnn-1.1.1~a021+cvs20130302/debian/changelog	2013-07-30 16:41:42.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/changelog	2013-11-18 23:47:35.000000000 +0100
@@ -1,3 +1,17 @@
+freewnn (1.1.1~a021+cvs20130302-4) unstable; urgency=low
+
+  * QA upload.
+  * debian/patches/fix-parallel-build.patch: (Closes: #724058)
+    - Add patch from upstream to fix:
+      "mv: cannot stat 'std.fzk': No such file or directory"
+      during parallel build.
+  * debian/control, debian/rules:
+    - Use autotools-dev and it's dh addon to update config.guess/sub
+      (Closes: #727380)
+  * Run wrap-and-sort to make files in the debian-directory more readable
+
+ -- Andreas Moog <amoog@ubuntu.com>  Mon, 18 Nov 2013 23:36:27 +0100
+
 freewnn (1.1.1~a021+cvs20130302-3) unstable; urgency=low
 
   * QA upload.
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/control freewnn-1.1.1~a021+cvs20130302/debian/control
--- freewnn-1.1.1~a021+cvs20130302/debian/control	2013-07-30 04:31:28.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/control	2013-11-18 23:47:47.000000000 +0100
@@ -2,14 +2,19 @@
 Section: utils
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 9), libncurses5-dev, autoconf, automake, libtool
+Build-Depends: autoconf,
+               automake,
+               autotools-dev,
+               debhelper (>= 9),
+               libncurses5-dev,
+               libtool
 Standards-Version: 3.9.4
 Homepage: http://sourceforge.jp/projects/freewnn/
 
 Package: freewnn-common
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: wnn-common, freewnn-jserver (<< 1.1.0+1.1.1-a017-4)
+Conflicts: freewnn-jserver (<< 1.1.0+1.1.1-a017-4), wnn-common
 Replaces: wnn-common
 Description: Files shared among the FreeWnn packages
  FreeWnn is a network-extensible Japanese/Chinese/Korean input
@@ -23,7 +28,7 @@
 
 Package: freewnn-jserver
 Architecture: any
-Depends: freewnn-common, adduser (>= 3.34), ${shlibs:Depends}, ${misc:Depends}
+Depends: adduser (>= 3.34), freewnn-common, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: wnn
 Replaces: wnn
 Description: Japanese input system
@@ -35,7 +40,7 @@
 
 Package: freewnn-cserver
 Architecture: any
-Depends: freewnn-common, adduser (>= 3.34), ${shlibs:Depends}, ${misc:Depends}
+Depends: adduser (>= 3.34), freewnn-common, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: cwnn
 Replaces: cwnn
 Description: Chinese input system
@@ -48,7 +53,7 @@
 
 Package: freewnn-kserver
 Architecture: any
-Depends: freewnn-common, adduser (>= 3.34), ${shlibs:Depends}, ${misc:Depends}
+Depends: adduser (>= 3.34), freewnn-common, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: kwnn
 Replaces: kwnn
 Description: Korean input system
@@ -61,7 +66,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: FreeWnn library for Wnn (FreeWnn jserver)
  FreeWnn jserver (Wnn) is a network-extensible Kana-to-Kanji
  conversion system.  It was jointly developed and released by the
@@ -76,7 +81,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: FreeWnn library for cWnn (FreeWnn cserver)
  FreeWnn cserver (cWnn) is an integrated Chinese input system running
  on Unix workstation. It supports a wide range of input methods,
@@ -92,7 +97,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: FreeWnn library for kWnn (FreeWnn kserver)
  FreeWnn kserver (kWnn) is an integrated Korean input system running
  on Unix workstation. It supports a wide range of input methods,
@@ -105,8 +110,8 @@
 Architecture: any
 Multi-Arch: same
 Depends: libwnn0 (= ${binary:Version}), ${misc:Depends}
-Conflicts: wnn6-dev, wnn-dev, freewnn-jserver-dev
-Replaces: wnn-dev, freewnn-jserver-dev
+Conflicts: freewnn-jserver-dev, wnn-dev, wnn6-dev
+Replaces: freewnn-jserver-dev, wnn-dev
 Description: Header files and static libraries for Wnn (FreeWnn jserver)
  FreeWnn jserver (Wnn) is a network-extensible Kana-to-Kanji
  conversion system.  It was jointly developed and released by the
@@ -142,8 +147,8 @@
 Architecture: any
 Multi-Arch: same
 Depends: libkwnn0 (= ${binary:Version}), ${misc:Depends}
-Conflicts: kwnn-dev, freewnn-kserver-dev
-Replaces: kwnn-dev, freewnn-kserver-dev
+Conflicts: freewnn-kserver-dev, kwnn-dev
+Replaces: freewnn-kserver-dev, kwnn-dev
 Description: Header files and static library for kWnn (FreeWnn kserver)
  FreeWnn kserver (kWnn) is an integrated Korean input system running
  on Unix workstation. It supports a wide range of input methods,
@@ -152,14 +157,3 @@
  This package contains the header files and the static library for
  kWnn. Install this package if you wish to develop your own kWnn
  client programs.
-
-#Package: uum
-#Section: utils
-#Architecture: any
-#Depends: ${shlibs:Depends}
-#Conflicts: freewnn-jserver (<< 1.1.0+1.1.1-a019-1)
-#Description: Kana-To-Kanji conversion front-end processor for FreeWnn jserver
-# Uum is a command line utility which provides Japanese input/output
-# environment on the terminal. Uum is able to connect with FreeWnn
-# jserver of other machine via the internet.
-
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/copyright freewnn-1.1.1~a021+cvs20130302/debian/copyright
--- freewnn-1.1.1~a021+cvs20130302/debian/copyright	2010-03-25 02:06:30.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/copyright	2013-11-18 23:40:02.000000000 +0100
@@ -5,7 +5,7 @@
 
 Upstream Authors:
 
-Copyright Kyoto University Research Institute for Mathematical Sciences 
+Copyright Kyoto University Research Institute for Mathematical Sciences
 1987, 1988, 1989, 1990, 1991, 1992
 Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
 Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
@@ -14,4 +14,3 @@
 Copyright:
 
 GPL (/usr/share/common-licenses/GPL)
-
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/freewnn-common.install freewnn-1.1.1~a021+cvs20130302/debian/freewnn-common.install
--- freewnn-1.1.1~a021+cvs20130302/debian/freewnn-common.install	2013-07-30 05:05:11.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/freewnn-common.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,3 +1,3 @@
 usr/share/wnn/cvt_key_*
-usr/share/wnn/serverdefs
 usr/share/wnn/lt_LN
+usr/share/wnn/serverdefs
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/freewnn-cserver.install freewnn-1.1.1~a021+cvs20130302/debian/freewnn-cserver.install
--- freewnn-1.1.1~a021+cvs20130302/debian/freewnn-cserver.install	2013-07-30 19:27:46.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/freewnn-cserver.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,7 +1,7 @@
-usr/sbin/c*
+
 usr/bin/c*
+usr/sbin/c*
 usr/share/wnn/zh_CN	usr/share/wnn/
 usr/share/wnn/zh_TW	usr/share/wnn/
 var/lib/wnn/zh_CN	var/lib/wnn/
 var/lib/wnn/zh_TW	var/lib/wnn/
-
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/freewnn-jserver.install freewnn-1.1.1~a021+cvs20130302/debian/freewnn-jserver.install
--- freewnn-1.1.1~a021+cvs20130302/debian/freewnn-jserver.install	2013-07-30 19:28:41.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/freewnn-jserver.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,10 +1,10 @@
-usr/sbin/jserver
-usr/sbin/wnnkill
-usr/sbin/wnnstat
 usr/bin/oldatonewa
 usr/bin/uum
-usr/bin/wddel	
+usr/bin/wddel
 usr/bin/wdreg
 usr/bin/wnntouch
+usr/sbin/jserver
+usr/sbin/wnnkill
+usr/sbin/wnnstat
 usr/share/wnn/ja_JP	usr/share/wnn/
 var/lib/wnn/ja_JP	var/lib/wnn/
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/freewnn-kserver.install freewnn-1.1.1~a021+cvs20130302/debian/freewnn-kserver.install
--- freewnn-1.1.1~a021+cvs20130302/debian/freewnn-kserver.install	2013-07-30 19:28:06.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/freewnn-kserver.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,4 +1,4 @@
-usr/sbin/k*
 usr/bin/k*
+usr/sbin/k*
 usr/share/wnn/ko_KR	usr/share/wnn/
 var/lib/wnn/ko_KR	var/lib/wnn/
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/libcwnn-dev.install freewnn-1.1.1~a021+cvs20130302/debian/libcwnn-dev.install
--- freewnn-1.1.1~a021+cvs20130302/debian/libcwnn-dev.install	2012-05-27 01:11:39.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/libcwnn-dev.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,4 +1,4 @@
+
 usr/include/cwnn
 usr/lib/*/libcwnn.a
 usr/lib/*/libcwnn.so
-
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/libkwnn-dev.install freewnn-1.1.1~a021+cvs20130302/debian/libkwnn-dev.install
--- freewnn-1.1.1~a021+cvs20130302/debian/libkwnn-dev.install	2012-05-27 01:11:26.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/libkwnn-dev.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,4 +1,4 @@
+
 usr/include/kwnn
 usr/lib/*/libkwnn.a
 usr/lib/*/libkwnn.so
-
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/libwnn0.install freewnn-1.1.1~a021+cvs20130302/debian/libwnn0.install
--- freewnn-1.1.1~a021+cvs20130302/debian/libwnn0.install	2012-05-27 01:10:50.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/libwnn0.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,3 +1,3 @@
+
 usr/lib/*/libjd.so.0*
 usr/lib/*/libwnn.so.0*
-
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/patches/fix-parallel-build.patch freewnn-1.1.1~a021+cvs20130302/debian/patches/fix-parallel-build.patch
--- freewnn-1.1.1~a021+cvs20130302/debian/patches/fix-parallel-build.patch	1970-01-01 01:00:00.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/patches/fix-parallel-build.patch	2013-11-18 23:42:11.000000000 +0100
@@ -0,0 +1,318 @@
+Description: Fix potential race condition when building in parallel mode
+Origin: upstream, http://cvs.sourceforge.jp/cvs/view/freewnn/FreeWnn/Wnn/pubdicplus/Makefile.in?r1=1.7&r2=1.8&view=patch
+Bug-Debian: http://bugs.debian.org/724058
+
+--- a/Wnn/pubdicplus/Makefile.in	2010/02/22 17:06:54	1.7
++++ b/Wnn/pubdicplus/Makefile.in	2013/11/08 18:54:44	1.8
+@@ -1,5 +1,5 @@
+ #
+-#   $Id: Makefile.in,v 1.7 2010/02/22 17:06:54 aonoto Exp $
++#   $Id: Makefile.in,v 1.8 2013/11/08 18:54:44 aonoto Exp $
+ #
+ 
+ #
+@@ -10,7 +10,7 @@
+ #                 1987, 1988, 1989, 1990, 1991, 1992
+ # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+ # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
+-# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010
++# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010, 2013
+ # 
+ # Maintainer:  FreeWnn Project
+ # 
+@@ -42,13 +42,12 @@
+            ATOF = $(WNNJUTILOBJ)/atof
+        WNNTOUCH = $(WNNJUTILOBJ)/wnntouch
+           HINSI = @HINSI_DATA@
+-       FZK_FLAG =
+ 
+ LINKS = Version bio.hd chimei.hd computer.hd fzk.attr fzk.con fzk.fzkattr fzk.jirattr  fzk.jircon fzk.master fzk.shuutan jinmei.hd kihon.hd koyuu.hd setsuji.hd special.hd special.u symbol.hd tankan.hd
+ 
+ WNNDICS = bio.u chimei.u computer.u jinmei.u kihon.u koyuu.u setsuji.u symbol.u tankan.u
+ 
+-FZK_SRC=          fzk.master          fzk.attr          fzk.jirattr          fzk.fzkattr          fzk.jircon          fzk.con          fzk.shuutan
++FZK_SRC=          fzk.master-.c          fzk.attr          fzk.jirattr          fzk.fzkattr          fzk.jircon          fzk.con          fzk.shuutan
+ 
+ DIC= 	bio.dic 	chimei.dic 	computer.dic 	jinmei.dic 	kihon.dic 	koyuu.dic 	setsuji.dic 	special.dic 	symbol.dic 	tankan.dic
+ 
+@@ -68,24 +67,14 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: Version
+-
+ depend:: Version
+ 
+-clean::
+-	$(RM) Version
+-
+ bio.hd:  $(PUBDICPLUSSRC)/bio.hd
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: bio.hd
+-
+ depend:: bio.hd
+ 
+-clean::
+-	$(RM) bio.hd
+-
+ # bio.u:  $(PUBDICPLUSSRC)/bio.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -101,13 +90,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: chimei.hd
+-
+ depend:: chimei.hd
+ 
+-clean::
+-	$(RM) chimei.hd
+-
+ # chimei.u:  $(PUBDICPLUSSRC)/chimei.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -123,13 +107,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: computer.hd
+-
+ depend:: computer.hd
+ 
+-clean::
+-	$(RM) computer.hd
+-
+ # computer.u:  $(PUBDICPLUSSRC)/computer.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -145,90 +124,50 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.attr
+-
+ depend:: fzk.attr
+ 
+-clean::
+-	$(RM) fzk.attr
+-
+ fzk.con:  $(PUBDICPLUSSRC)/fzk.con
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.con
+-
+ depend:: fzk.con
+ 
+-clean::
+-	$(RM) fzk.con
+-
+ fzk.fzkattr:  $(PUBDICPLUSSRC)/fzk.fzkattr
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.fzkattr
+-
+ depend:: fzk.fzkattr
+ 
+-clean::
+-	$(RM) fzk.fzkattr
+-
+ fzk.jirattr:  $(PUBDICPLUSSRC)/fzk.jirattr
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.jirattr
+-
+ depend:: fzk.jirattr
+ 
+-clean::
+-	$(RM) fzk.jirattr
+-
+ fzk.jircon:  $(PUBDICPLUSSRC)/fzk.jircon
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.jircon
+-
+ depend:: fzk.jircon
+ 
+-clean::
+-	$(RM) fzk.jircon
+-
+ fzk.master:  $(PUBDICPLUSSRC)/fzk.master
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.master
+-
+ depend:: fzk.master
+ 
+-clean::
+-	$(RM) fzk.master
+-
+ fzk.shuutan:  $(PUBDICPLUSSRC)/fzk.shuutan
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.shuutan
+-
+ depend:: fzk.shuutan
+ 
+-clean::
+-	$(RM) fzk.shuutan
+-
+ jinmei.hd:  $(PUBDICPLUSSRC)/jinmei.hd
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: jinmei.hd
+-
+ depend:: jinmei.hd
+ 
+-clean::
+-	$(RM) jinmei.hd
+-
+ # jinmei.u:  $(PUBDICPLUSSRC)/jinmei.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -244,13 +183,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: kihon.hd
+-
+ depend:: kihon.hd
+ 
+-clean::
+-	$(RM) kihon.hd
+-
+ # kihon.u:  $(PUBDICPLUSSRC)/kihon.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -266,13 +200,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: koyuu.hd
+-
+ depend:: koyuu.hd
+ 
+-clean::
+-	$(RM) koyuu.hd
+-
+ # koyuu.u:  $(PUBDICPLUSSRC)/koyuu.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -288,13 +217,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: setsuji.hd
+-
+ depend:: setsuji.hd
+ 
+-clean::
+-	$(RM) setsuji.hd
+-
+ # setsuji.u:  $(PUBDICPLUSSRC)/setsuji.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -310,35 +234,20 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: special.hd
+-
+ depend:: special.hd
+ 
+-clean::
+-	$(RM) special.hd
+-
+ special.u:  $(PUBDICPLUSSRC)/special.u
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: special.u
+-
+ depend:: special.u
+ 
+-clean::
+-	$(RM) special.u
+-
+ symbol.hd:  $(PUBDICPLUSSRC)/symbol.hd
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: symbol.hd
+-
+ depend:: symbol.hd
+ 
+-clean::
+-	$(RM) symbol.hd
+-
+ # symbol.u:  $(PUBDICPLUSSRC)/symbol.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -354,13 +263,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: tankan.hd
+-
+ depend:: tankan.hd
+ 
+-clean::
+-	$(RM) tankan.hd
+-
+ # tankan.u:  $(PUBDICPLUSSRC)/tankan.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -421,16 +325,14 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-std.fzk: fzk.master-.c $(FZK_SRC)
+-	$(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++std.fsrc: $(FZK_SRC)
++	$(FZK_PP) fzk.master-.c > $@
++
++full.fsrc: $(FZK_SRC)
++	$(FZK_PP) -DKANSAI fzk.master-.c > $@
+ 
+-full.fzk: $(FZK_SRC)
+-	$(MAKE) FZK_FLAG=-DKANSAI std.fzk
+-	$(MV) std.fzk $@
+-
+-kougo.fzk: $(FZK_SRC)
+-	$(MAKE) FZK_FLAG=-DKOUGO std.fzk
+-	$(MV) std.fzk $@
++kougo.fsrc: $(FZK_SRC)
++	$(FZK_PP) -DKOUGO fzk.master-.c > $@
+ 
+ # additional rule from PubdicPlus/Makefile.in : by aono
+ pod.o: $(PUBDICPLUSSRC)/pod.c
+@@ -442,7 +344,7 @@
+ $(WNNDICS): pod $(PUBDICPLUSSRC)/pubdic.p
+ 	./pod $(PUBDICPLUSSRC)/pubdic.p -w -1 -k `basename $@ .u` > $@
+ 
+-.SUFFIXES: .hd .u .dic .more
++.SUFFIXES: .hd .u .dic .more .fsrc .fzk
+ 
+ .u.dic:
+ 	cat $*.hd $< | $(ATOD) -p $(VERSION) -P $(VERSION) -h $(HINSI) $@
+@@ -450,7 +352,10 @@
+ .hd.more:
+ 	$(ATOD) -h $(HINSI) $@ < $<
+ 
++.fsrc.fzk:
++	egrep -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@
++
+ $(DIC): $(HINSI)
+ 
+ clean::
+-	$(RM) -f *.fzk *.dic *.more fzk.master-.c pod $(LINKS)
++	$(RM) -f *.fsrc *.dic *.more fzk.master-.c pod $(LINKS) $(FZKDATA)
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/patches/series freewnn-1.1.1~a021+cvs20130302/debian/patches/series
--- freewnn-1.1.1~a021+cvs20130302/debian/patches/series	2013-01-28 13:00:53.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/patches/series	2013-11-18 23:34:57.000000000 +0100
@@ -3,3 +3,4 @@
 man
 hardening-flags
 hurd_support.patch
+fix-parallel-build.patch
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/rules freewnn-1.1.1~a021+cvs20130302/debian/rules
--- freewnn-1.1.1~a021+cvs20130302/debian/rules	2013-07-30 16:27:17.000000000 +0200
+++ freewnn-1.1.1~a021+cvs20130302/debian/rules	2013-11-18 23:39:35.000000000 +0100
@@ -10,7 +10,7 @@
 install_dir= DESTDIR=$(CURDIR)/debian/tmp
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autotools_dev
 
 override_dh_auto_configure:
 	autoreconf -i
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/_uum.install freewnn-1.1.1~a021+cvs20130302/debian/_uum.install
--- freewnn-1.1.1~a021+cvs20130302/debian/_uum.install	2010-03-25 02:06:30.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/_uum.install	2013-11-18 23:40:02.000000000 +0100
@@ -1,5 +1,5 @@
+
 usr/bin/Wnn4/uum
 usr/share/man/man1/uum.1
 usr/share/man/man4/uumkey.4
 usr/share/man/man4/uumrc.4
-

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: