Merge lp:~noskcaj/ubuntu/trusty/juman/ftbfs into lp:ubuntu/trusty/juman

[Jackson Doak]

Might fix the ftbfs. I couldn't reproduce the ftbfs locally, but this is the fix recommended in the debian RC bug. Builds fine locally and in ppa.

[Dmitry Shachnev (mitya57)]

+Package: libjuman-perl
+Architecture: all
+Depends: ${perl:Depends}, juman
+Description: Perl binding of JUMAN
+ This package provides Perl binding of Juman, that is a Japanese
+ morphological analysis system.

I think we should not add new binary packages after feature freeze. Is there any real need for that?

[Jackson Doak (noskcaj)]

I don't know if it's good to add this later, but it's been in proposed for some time

[Iain Lane (laney)]

You can reproduce the ftbfs by building an arch-only build (not indep packages). Building on i386 and nowhere else is a hint to that.

review: Approve

Unmerged revisions

9. By Jackson Doak on 2014-02-26

update maintainer

8. By Jackson Doak on 2014-02-26

Replace cp commands in d/rules with d/juman-doc.insall

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2004-04-03 23:47:16 +0000
+++ debian/README.Debian	2014-02-26 08:35:23 +0000
@@ -7,7 +7,9 @@
 information (pronunciation, semantic information, etc).
 
 Note: Juman can not process strings encoded in other coding systems
-than EUC-JP, and also its outputs are encoded in EUC-JP.
+than UTF-8, and also its outputs are encoded in UTF-8.  This is a big
+difference between the current version of Juman and the older
+versions.
 
 If you want to use Juman server, try these steps.
 
@@ -16,4 +18,4 @@
     update-rc.d juman-server defaults 99 1
     /etc/init.t/juman-server start
 
- -- TSUCHIYA Masatoshi <[e-mail]>, Fri Feb 20 14:24:18 2004
+ -- TSUCHIYA Masatoshi <[e-mail]>, Wed, 25 Jan 2012 21:05:33 +0900
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-10-07 17:05:06 +0000
+++ debian/changelog	2014-02-26 08:35:23 +0000
@@ -1,12 +1,21 @@
-juman (7.0-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-
-  [ Konstantinos Margaritis ]
-  * Create usr/share/doc/juman link in binary-arch build
-    This should fix the FTBFS reported for non i386 arches. Closes: #657688
-
- -- Christian Perrier <[e-mail]>  Sun, 07 Oct 2012 17:05:06 +0200
+juman (7.0-3ubuntu1) trusty; urgency=medium
+
+  * Replace cp commands in d/rules with d/juman-doc.insall
+
+ -- Jackson Doak <[e-mail]>  Wed, 26 Feb 2014 19:18:25 +1100
+
+juman (7.0-3) unstable; urgency=low
+
+  * Call dh with "--with autotools_dev" option (closes: #727909).
+  * Build depends to autotools-dev.
+
+ -- TSUCHIYA Masatoshi <[e-mail]>  Wed, 30 Oct 2013 22:28:48 +0900
+
+juman (7.0-2) unstable; urgency=low
+
+  * Add libjuman-perl.
+
+ -- TSUCHIYA Masatoshi <[e-mail]>  Mon, 23 Jan 2012 22:23:49 +0900
 
 juman (7.0-1) unstable; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2012-01-20 12:13:19 +0000
+++ debian/control	2014-02-26 08:35:23 +0000
@@ -1,8 +1,9 @@
 Source: juman
 Section: misc
 Priority: optional
-Maintainer: TSUCHIYA Masatoshi <[e-mail]>
-Build-Depends: debhelper (>= 7), quilt
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: TSUCHIYA Masatoshi <[e-mail]>
+Build-Depends: debhelper (>= 7), quilt, autotools-dev
 Standards-Version: 3.9.2
 
 Package: juman
@@ -40,3 +41,10 @@
 Description: Library of JUMAN
  This package provides runtime libraries of Juman, that is a Japanese
  morphological analysis system.
+
+Package: libjuman-perl
+Architecture: all
+Depends: ${perl:Depends}, juman
+Description: Perl binding of JUMAN
+ This package provides Perl binding of Juman, that is a Japanese
+ morphological analysis system.
 
=== added file 'debian/juman-dic.install'
--- debian/juman-dic.install	1970-01-01 00:00:00 +0000
+++ debian/juman-dic.install	2014-02-26 08:35:23 +0000
@@ -0,0 +1,3 @@
+dic/*.dic usr/share/juman/dic
+autodic/*.dic usr/share/juman/autodic
+wikipediadic/*.dic usr/share/juman/wikipediadic
 \ No newline at end of file
 
=== modified file 'debian/juman-server'
--- debian/juman-server	2012-01-20 12:13:19 +0000
+++ debian/juman-server	2014-02-26 08:35:23 +0000
@@ -4,6 +4,18 @@
 # and call update-rc.d to install the links of the copied script.
 #
 
+### BEGIN INIT INFO
+# Provides:          juman
+# Required-Start:    $local_fs $network $syslog
+# Required-Stop:     $local_fs $network $syslog
+# Should-Start:
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Juman init script
+# Description:       Init script for Juman server
+### END INIT INFO
+
 NAME=juman
 DAEMON="/usr/bin/$NAME"
 DESC="Juman server"
 
=== modified file 'debian/rules'
--- debian/rules	2012-10-07 17:05:06 +0000
+++ debian/rules	2014-02-26 08:35:23 +0000
@@ -4,22 +4,30 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+PERL_OPTIMIZE = -O2 -Wall
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+PERL_OPTIMIZE += -g
+endif
+
 %:
-	dh $@ --with quilt
+	dh $@ --with quilt --with autotools_dev
 
 override_dh_auto_configure:
 	dh_auto_configure -- --libexecdir=/usr/lib --datadir=/usr/lib
-
-override_dh_auto_install-arch:
+	cd perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
+
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C perl OPTIMIZE="$(PERL_OPTIMIZE)" DICDIR=`pwd`/dic
+
+dicprefix=debian/juman-dic/usr/share/juman
+override_dh_auto_install:
 	dh_auto_install
-
-dicprefix=debian/juman-dic/usr/share/juman
-override_dh_auto_install-indep:
 	rm -rf debian/tmp/usr/lib/juman/doc
 	dh_link -pjuman usr/share/doc/juman usr/lib/juman/doc
-	cp -p dic/*.dic $(dicprefix)/dic
-	cp -p autodic/*.dic $(dicprefix)/autodic
-	cp -p wikipediadic/*.dic $(dicprefix)/wikipediadic
 	for d in dic autodic wikipediadic ; do \
 	  for f in $(dicprefix)/$${d}/* ; do \
 	    dh_link -pjuman-dic \
@@ -27,10 +35,12 @@
 		`echo $$f|sed s,debian/juman-dic/usr/share/,usr/lib/,` ;\
 	  done ;\
 	done
+	$(MAKE) -C perl install PREFIX=`pwd`/debian/libjuman-perl/usr DICDIR=`pwd`/dic
 
 override_dh_auto_clean:
 	dh_auto_clean
-	-rm -f dic/*.int dic/jumandic.*
+	-$(MAKE) -C perl realclean
+	-rm -f dic/*.int dic/jumandic.* dic/JUMAN.connect
 	-rm -f autodic/*.int autodic/jumandic.*
 	-rm -f wikipediadic/*.int wikipediadic/jumandic.*