Skip to content

Commit c7f6e3e

Browse files
committed
Update Debian packaging to latest standards.
Incorporate all changes from the official Debian packages, plus a number of desirable adjustments that they haven’t gotten around to yet. (The intention is to send these back to them after a little more testing.)
1 parent 5c7a240 commit c7f6e3e

File tree

7 files changed

+54
-26
lines changed

7 files changed

+54
-26
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ __pycache__/
1515
.pybuild/
1616
build/
1717
dist/
18+
debian/.debhelper
19+
debian/debhelper-build-stamp
1820
debian/files
1921
debian/python-mecab.*
2022
debian/python-mecab/

debian/changelog

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,45 @@
1-
python-mecab (1:0.8.0-0local1) unstable; urgency=low
2-
3-
* Build from upstream SWIG sources rather than shipping generated
4-
code.
1+
python-mecab (1:0.8.3-1) unstable; urgency=medium
2+
3+
[ Zack Weinberg ]
4+
* Switch upstream to “mecab-python3” PyPI package, which runs SWIG
5+
at build time rather than embedding SWIG-generated code, and (therefore)
6+
supports Python 3. This package is versioned independently from
7+
MeCab itself, which requires an epoch.
8+
* Build using pybuild.
59
* Add python3 binary packages.
6-
* Bump debhelper compat level to 9.
7-
* Bump Standards-Version to 3.9.6.
10+
* Remove obsolete Provides: lines.
11+
* Demote mecab-jumandic|mecab-ipadic to Recommends, as there are
12+
several other packages that also provide a dictionary MeCab can use.
13+
* Bump to debhelper compat level 11; declare debhelper compat level via
14+
Build-Depends (no other changes required).
15+
* Standards-Version 4.2.1 (no changes required).
16+
* Add Rules-Requires-Root: no to debian/control.
17+
* Enable hardening.
18+
19+
-- TANIGUCHI Takaki <[email protected]> Sun, 04 Nov 2018 11:25:43 -0500
20+
21+
python-mecab (0.99.6-3) UNRELEASED; urgency=medium
22+
23+
* d/control: Set Vcs-* to salsa.debian.org
24+
* d/copyright: Use https protocol in Format field
25+
* d/changelog: Remove trailing whitespaces
26+
* Remove debian/pycompat, it's not used by any modern Python helper
27+
* Convert git repository from git-dpm to gbp layout
28+
29+
-- Ondřej Nový <[email protected]> Tue, 13 Feb 2018 10:05:50 +0100
30+
31+
python-mecab (0.99.6-2) UNRELEASED; urgency=medium
32+
33+
[ Ondřej Nový ]
34+
* Fixed VCS URL (https)
35+
36+
[ TANIGUCHI Takaki ]
37+
* Bump Standards-Version to 4.0.0 (without changes)
38+
* debian/compat: Bump to 10
39+
* Update Homepage info.
40+
* debian/watch: Removed.
841

9-
-- Zack Weinberg <[email protected]> Thu, 15 Oct 2015 16:57:30 -0400
42+
-- TANIGUCHI Takaki <[email protected]> Mon, 17 Jul 2017 12:45:27 +0900
1043

1144
python-mecab (0.99.6-1) unstable; urgency=low
1245

debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/control

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ Section: python
33
Priority: optional
44
Maintainer: Debian Python Modules Team <[email protected]>
55
Uploaders: TANIGUCHI Takaki <[email protected]>
6-
Build-Depends: debhelper (>= 9~), dh-python,
6+
Build-Depends: debhelper-compat (= 11), dh-python,
77
python-all-dev, python3-all-dev,
88
python-setuptools, python3-setuptools,
99
libmecab-dev (>= 0.99.3), swig
10-
Standards-Version: 3.9.6
11-
X-Python-Version: >= 2.6
12-
X-Python3-Version: >= 3.2
13-
Homepage: http://sourceforge.net/projects/mecab/
14-
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-mecab/trunk/
15-
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-mecab/trunk/
10+
Standards-Version: 4.2.1
11+
Rules-Requires-Root: no
12+
Homepage: https://github.com/taku910/mecab
13+
Vcs-Git: https://salsa.debian.org/python-team/modules/python-mecab.git
14+
Vcs-Browser: https://salsa.debian.org/python-team/modules/python-mecab
1615

1716
Package: python-mecab
1817
Architecture: any
19-
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
20-
mecab-jumandic | mecab-ipadic
21-
Provides: ${python:Provides}
18+
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
19+
Recommends: mecab-jumandic | mecab-ipadic
2220
Description: mecab bindings for Python 2
2321
Mecab is a morphological analysis system. It reads Japanese
2422
sentences from the standard input, segments them into morpheme
@@ -31,8 +29,7 @@ Description: mecab bindings for Python 2
3129
Package: python3-mecab
3230
Architecture: any
3331
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
34-
mecab-jumandic | mecab-ipadic
35-
Provides: ${python3:Provides}
32+
Recommends: mecab-jumandic | mecab-ipadic
3633
Description: mecab bindings for Python 3
3734
Mecab is a morphological analysis system. It reads Japanese
3835
sentences from the standard input, segments them into morpheme

debian/copyright

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1+
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Upstream-Name: MeCab
33
Upstream-Contact: Taku Kudo <[email protected]>
4-
Source: http://sf.net/projects/mecab/
4+
Source: https://github.com/taku910/mecab
55

66
Files: *
77
Copyright: Taku Kudo <[email protected]>

debian/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/make -f
22

33
export PYBUILD_NAME = mecab
4+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
45

56
%:
67
dh $@ --with python2,python3 --buildsystem=pybuild

debian/watch

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)