[hfst] 01/01: Imported Debian patch 3.8.2~r4145-2

Mon Jun 1 16:11:33 UTC 2015

This is an automated email from the git hooks/post-receive script.

tinodidriksen-guest pushed a commit to branch master
in repository hfst.

commit cbd705d85f1dfad0b2cc8d303c780a45074bf5a1
Author: Tino Didriksen <mail at tinodidriksen.com>
Date:   Mon Jun 1 18:08:08 2015 +0200

    Imported Debian patch 3.8.2~r4145-2
---
 debian/changelog               |  7 +++++++
 debian/control                 | 32 +++++++++++++++++++++++++++-----
 debian/libhfst40-dev.install   |  6 +++---
 debian/libhfst40.install       |  3 +--
 debian/python-libhfst.install  |  1 +
 debian/python3-libhfst.install |  1 +
 debian/rules                   | 29 ++++++++++-------------------
 7 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e72637..3aabd33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hfst (3.8.2~r4145-2) experimental; urgency=low
+
+  * Add Python and Python3 modules
+  * Fix some Lintian errors
+
+ -- Tino Didriksen <mail at tinodidriksen.com>  Mon, 01 Jun 2015 18:08:08 +0200
+
 hfst (3.8.2~r4145-1) experimental; urgency=low
 
   [ Tino Didriksen ]
diff --git a/debian/control b/debian/control
index 3a0dc77..590dc2c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,9 @@ Build-Depends: autoconf,
                libtool,
                python,
                python-dev,
+               python3,
+               python3-dev,
+               swig,
                zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: http://www.ling.helsinki.fi/kieliteknologia/tutkimus/hfst/
@@ -25,7 +28,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/hfst.git
 
 Package: hfst
 Architecture: any
-Provides: hfst
 Depends: libhfst40 (= ${binary:Version}),
          python,
          ${misc:Depends},
@@ -38,8 +40,9 @@ Description: Helsinki Finite-State Transducer Technology
 Package: libhfst40
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: libhfst3
-Conflicts: libhfst3
+Provides: libhfst
+Conflicts: libhfst, libhfst3
+Replaces: libhfst, libhfst3
 Description: Helsinki Finite-State Transducer Technology Libraries
  Runtime libraries for HFST
 
@@ -47,7 +50,26 @@ Package: libhfst40-dev
 Architecture: any
 Section: libdevel
 Depends: libhfst40 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Provides: libhfst3-dev
-Conflicts: libhfst3-dev
+Provides: libhfst-dev
+Conflicts: libhfst-dev, libhfst3-dev
+Replaces: libhfst-dev, libhfst3-dev
 Description: Helsinki Finite-State Transducer Technology Development files
  Development headers and libraries for HFST
+
+Package: python-libhfst
+Architecture: any
+Depends: libhfst40 (= ${binary:Version}),
+         python,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Helsinki Finite-State Transducer Technology
+ Python module for libhfst
+
+Package: python3-libhfst
+Architecture: any
+Depends: libhfst40 (= ${binary:Version}),
+         python3,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Helsinki Finite-State Transducer Technology
+ Python3 module for libhfst
diff --git a/debian/libhfst40-dev.install b/debian/libhfst40-dev.install
index 992badc..33bf625 100644
--- a/debian/libhfst40-dev.install
+++ b/debian/libhfst40-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/hfst
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/pkgconfig
diff --git a/debian/libhfst40.install b/debian/libhfst40.install
index 307c522..9503874 100644
--- a/debian/libhfst40.install
+++ b/debian/libhfst40.install
@@ -1,2 +1 @@
-debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/lib/python*/*/*.py
+debian/tmp/usr/lib/*/*.so.*
diff --git a/debian/python-libhfst.install b/debian/python-libhfst.install
new file mode 100644
index 0000000..1dfa2b3
--- /dev/null
+++ b/debian/python-libhfst.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python2*/*/*
diff --git a/debian/python3-libhfst.install b/debian/python3-libhfst.install
new file mode 100644
index 0000000..cb1dbbc
--- /dev/null
+++ b/debian/python3-libhfst.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python3*/*/*
diff --git a/debian/rules b/debian/rules
index 4c66cf3..46409c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+#export DH_VERBOSE=1
 
 NUMJOBS = 1
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -31,11 +15,18 @@ export DH_OPTIONS
 	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
-	./configure --without-foma --with-unicode-handler=ICU --enable-all-tools --prefix=/usr
+	dh_auto_configure -- --without-foma --with-unicode-handler=ICU --enable-all-tools
 
 override_dh_auto_build:
 	./scripts/generate-cc-files.sh
-	make -j$(NUMJOBS) || make -j$(NUMJOBS) || make
+	$(MAKE) -j$(NUMJOBS) || $(MAKE) -j$(NUMJOBS) || $(MAKE)
+	cd $(CURDIR)/swig && python setup.py build_ext && python3 setup.py build_ext && strip --strip-unneeded build/*/*.so
 
 override_dh_auto_test:
 	# Skip, as it breaks in various unpredictable ways
+
+override_dh_auto_install:
+	dh_auto_install
+	cd $(CURDIR)/swig && python setup.py install --no-compile --prefix /usr --install-layout deb --root $(CURDIR)/debian/tmp && python3 setup.py install --no-compile --prefix /usr --install-layout deb --root $(CURDIR)/debian/tmp
+	find $(CURDIR) -type f -name '*.pyc' -exec rm -f '{}' \;
+	find $(CURDIR) -type f -name '*.pyo' -exec rm -f '{}' \;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hfst.git

