KartikMistry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394967 )
Change subject: hfst: New upstream release ...................................................................... hfst: New upstream release Also includes library name change and improvements from Debian. Bug: T181463 Change-Id: I1b5a101a517962773b8bc51daa82cf893e303434 --- M debian/changelog M debian/control M debian/docs R debian/libhfst-dev.install D debian/libhfst45.postinst R debian/libhfst50.install R debian/libhfst50.lintian-overrides M debian/patches/hfst_02_notimestamp.diff M debian/rules M debian/watch 10 files changed, 42 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/hfst refs/changes/67/394967/1 diff --git a/debian/changelog b/debian/changelog index 87562ec..7f165c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +hfst (3.13.0~r3461-1+wmf1) jessie-wikimedia; urgency=low + + * New upstream release. + * Renamed libhfstNN-dev to plain libhfst-dev + * debian/docs change README to README.rst + * Updated debian/watch file. + * Updated Build-Depends. + + -- Kartik Mistry <[email protected]> Mon, 04 Dec 2017 16:52:12 +0530 + hfst (3.10.0~r2798-1+wmf1) jessie; urgency=low * Rebuild for Jessie. diff --git a/debian/control b/debian/control index 696b874..62b390b 100644 --- a/debian/control +++ b/debian/control @@ -16,18 +16,18 @@ libicu-dev, libreadline-dev, libtool, - python-dev, + python-all-dev, python3-all-dev, swig, zlib1g-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Homepage: http://www.ling.helsinki.fi/kieliteknologia/tutkimus/hfst/ Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/hfst.git Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/hfst.git Package: hfst Architecture: any -Depends: libhfst45 (= ${binary:Version}), +Depends: libhfst50 (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -36,8 +36,9 @@ implementation of morphological analysers and other tools which are based on weighted and unweighted finite-state transducer technology. -Package: libhfst45 +Package: libhfst50 Architecture: any +Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} Provides: libhfst Conflicts: libhfst, libhfst3 @@ -49,16 +50,15 @@ . This package provides runtime libraries for HFST. -Package: libhfst45-dev +Package: libhfst-dev Architecture: any Section: libdevel Depends: hfst (= ${binary:Version}), - libhfst45 (= ${binary:Version}), + libhfst50 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Provides: libhfst-dev -Conflicts: libhfst-dev, libhfst3-dev -Replaces: libhfst-dev, libhfst3-dev +Conflicts: libhfst3-dev +Replaces: libhfst3-dev Description: Helsinki Finite-State Transducer Technology Development files The Helsinki Finite-State Transducer software is intended for the implementation of morphological analysers and other tools which are @@ -69,7 +69,7 @@ Package: python-libhfst Architecture: any Section: python -Depends: libhfst45 (= ${binary:Version}), +Depends: libhfst50 (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -83,7 +83,7 @@ Package: python3-libhfst Architecture: any Section: python -Depends: libhfst45 (= ${binary:Version}), +Depends: libhfst50 (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} diff --git a/debian/docs b/debian/docs index 05c2865..dfa5a2f 100644 --- a/debian/docs +++ b/debian/docs @@ -1,4 +1,4 @@ AUTHORS NEWS -README +README.rst THANKS diff --git a/debian/libhfst45-dev.install b/debian/libhfst-dev.install similarity index 100% rename from debian/libhfst45-dev.install rename to debian/libhfst-dev.install diff --git a/debian/libhfst45.postinst b/debian/libhfst45.postinst deleted file mode 100644 index 7df96b6..0000000 --- a/debian/libhfst45.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -ldconfig - -exit 0 diff --git a/debian/libhfst45.install b/debian/libhfst50.install similarity index 100% rename from debian/libhfst45.install rename to debian/libhfst50.install diff --git a/debian/libhfst45.lintian-overrides b/debian/libhfst50.lintian-overrides similarity index 100% rename from debian/libhfst45.lintian-overrides rename to debian/libhfst50.lintian-overrides diff --git a/debian/patches/hfst_02_notimestamp.diff b/debian/patches/hfst_02_notimestamp.diff index c2c3659..f43d865 100644 --- a/debian/patches/hfst_02_notimestamp.diff +++ b/debian/patches/hfst_02_notimestamp.diff @@ -1,9 +1,9 @@ -Description: Do not timestamp in output. -Index: b/tools/src/hfst-optimized-lookup.cc -=================================================================== ---- a/tools/src/hfst-optimized-lookup.cc (revision 4029) -+++ b/tools/src/hfst-optimized-lookup.cc (working copy) -@@ -92,7 +92,6 @@ +Description: Patch to remove timestamp from the build +diff --git a/tools/src/hfst-optimized-lookup.cc b/tools/src/hfst-optimized-lookup.cc +index a31e8a4..3d56389 100644 +--- a/tools/src/hfst-optimized-lookup.cc ++++ b/tools/src/hfst-optimized-lookup.cc +@@ -97,7 +97,6 @@ bool print_version(void) std::cout << "\n" << PACKAGE_STRING << std::endl << @@ -11,11 +11,11 @@ "copyright (C) 2009 University of Helsinki\n"; return true; } -Index: b/tools/src/hfst-proc/hfst-proc.cc -=================================================================== ---- a/tools/src/hfst-proc/hfst-proc.cc (revision 4029) -+++ b/tools/src/hfst-proc/hfst-proc.cc (working copy) -@@ -153,7 +153,6 @@ +diff --git a/tools/src/hfst-proc/hfst-proc.cc b/tools/src/hfst-proc/hfst-proc.cc +index c0d293a..bd4d930 100644 +--- a/tools/src/hfst-proc/hfst-proc.cc ++++ b/tools/src/hfst-proc/hfst-proc.cc +@@ -154,7 +154,6 @@ bool print_version(void) " (" << PACKAGE_STRING << ")" << #endif std::endl << diff --git a/debian/rules b/debian/rules index 32fc01d..746de36 100755 --- a/debian/rules +++ b/debian/rules @@ -8,29 +8,31 @@ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif +build2vers := $(shell pyversions -sv) build3vers := $(shell py3versions -sv) # This has to be exported to make some magic below work. export DH_OPTIONS +export LC_ALL=C.UTF-8 %: - dh $@ --fail-missing --parallel --with autoreconf,python2,python3 + dh $@ --fail-missing --parallel --with autoreconf --with python2 --with python3 override_dh_auto_configure: - dh_auto_configure -- --disable-static --with-unicode-handler=ICU --enable-all-tools + dh_auto_configure -- --disable-static --with-unicode-handler=ICU --enable-all-tools --with-readline override_dh_auto_build: $(MAKE) -j$(NUMJOBS) || $(MAKE) -j$(NUMJOBS) || $(MAKE) - set -e && for i in $(build3vers); do \ + set -e && for i in $(build2vers) $(build3vers); do \ cd $(CURDIR)/python && python$$i setup.py build_ext && strip --strip-unneeded build/*/*.so; \ done override_dh_auto_test: - make -j1 check + # Disable because they still break on big-endian override_dh_auto_install: dh_auto_install - set -e && for i in $(build3vers); do \ + set -e && for i in $(build2vers) $(build3vers); do \ cd $(CURDIR)/python && python$$i setup.py install --no-compile --prefix /usr --install-layout deb --root $(CURDIR)/debian/tmp; \ done find $(CURDIR) -type f -name '*.pyc' -exec rm -f '{}' \; diff --git a/debian/watch b/debian/watch index be2c368..7cb1851 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 -opts=filenamemangle=s/\S*download=//g \ -https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/hfst/hfst \ -.*=hfst(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/hfst-$1\.tar\.gz/ \ + https://github.com/hfst/hfst/tags .*/v?(\d\S+)\.tar\.gz -- To view, visit https://gerrit.wikimedia.org/r/394967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b5a101a517962773b8bc51daa82cf893e303434 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/contenttranslation/hfst Gerrit-Branch: master Gerrit-Owner: KartikMistry <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
