Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
* Make cannakill a symlink to catdic, fixing the file conflict
between canna-dbgsym and canna-utils-dbgsym. (Closes: #868541)
diff -Nru canna-3.7p3/debian/canna.install canna-3.7p3/debian/canna.install
--- canna-3.7p3/debian/canna.install 2012-01-25 07:57:21.000000000 +0200
+++ canna-3.7p3/debian/canna.install 2017-07-16 16:59:14.000000000 +0300
@@ -33,7 +33,6 @@
var/lib/canna/dic/canna/software.ctd
var/lib/canna/dic/canna/suffix.ctd
usr/bin/canlisp
-usr/bin/cannakill
usr/bin/crfreq
usr/bin/crxdic
usr/bin/crxgram
diff -Nru canna-3.7p3/debian/changelog canna-3.7p3/debian/changelog
--- canna-3.7p3/debian/changelog 2015-10-05 12:19:37.000000000 +0300
+++ canna-3.7p3/debian/changelog 2018-03-12 21:07:48.000000000 +0200
@@ -1,3 +1,19 @@
+canna (3.7p3-14~deb9u1) unstable; urgency=medium
+
+ * QA upload.
+ * Rebuild for stretch.
+
+ -- Adrian Bunk <b...@debian.org> Mon, 12 Mar 2018 21:07:48 +0200
+
+canna (3.7p3-14) unstable; urgency=medium
+
+ * QA upload.
+ * Make cannakill a symlink to catdic, fixing the file conflict
+ between canna-dbgsym and canna-utils-dbgsym. (Closes: #868541)
+ * Add the missing lsb-base dependency to canna.
+
+ -- Adrian Bunk <b...@debian.org> Sun, 16 Jul 2017 16:59:14 +0300
+
canna (3.7p3-13.1) unstable; urgency=medium
* Non-maintainer upload to fix FTBFS.
diff -Nru canna-3.7p3/debian/control canna-3.7p3/debian/control
--- canna-3.7p3/debian/control 2015-10-05 12:11:44.000000000 +0300
+++ canna-3.7p3/debian/control 2017-07-16 16:59:14.000000000 +0300
@@ -12,7 +12,7 @@
Package: canna
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser (>= 3.34), canna-utils
+Depends: lsb-base, ${misc:Depends}, ${shlibs:Depends}, adduser (>= 3.34),
canna-utils
Suggests: canna-shion
Description: input system for Japanese - server and dictionary
Canna provides a unified user interface for Japanese input. It is based
diff -Nru canna-3.7p3/debian/links canna-3.7p3/debian/links
--- canna-3.7p3/debian/links 2012-11-25 15:01:57.000000000 +0200
+++ canna-3.7p3/debian/links 2017-07-16 16:59:14.000000000 +0300
@@ -1 +1,2 @@
-usr/bin/cannakill usr/bin/syncdic
+usr/bin/catdic usr/bin/syncdic
+usr/bin/catdic usr/bin/cannakill
diff -Nru canna-3.7p3/debian/rules canna-3.7p3/debian/rules
--- canna-3.7p3/debian/rules 2013-06-08 22:15:37.000000000 +0300
+++ canna-3.7p3/debian/rules 2017-07-16 16:59:14.000000000 +0300
@@ -59,8 +59,6 @@
(cd $(CURDIR)/debian/tmp/usr/bin/ && \
rm -f cpdic lsdic mkdic mvdic rmdic syncdic \
addwords delwords cannakill)
- cp $(CURDIR)/debian/tmp/usr/bin/catdic \
- $(CURDIR)/debian/tmp/usr/bin/cannakill
install -d -m 755 $(CURDIR)/debian/tmp/etc/canna/dics.dir.d
install -m 644 $(CURDIR)/debian/tmp/var/lib/canna/dic/canna/dics.dir \
$(CURDIR)/debian/tmp/etc/canna/dics.dir.d/00canna.dics.dir
