[apertium-nno-nob] 02/02: Imported Debian patch 1.1.0~r66076-1

Tino Didriksen tinodidriksen-guest at moszumanska.debian.org
Tue Mar 1 14:24:06 UTC 2016


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

tinodidriksen-guest pushed a commit to branch master
in repository apertium-nno-nob.

commit d063bc0d74dcde1958afe108c3a6c35f7e4a95c9
Merge: eeb26c7 81122f3
Author: Tino Didriksen <tino at didriksen.cc>
Date:   Tue Mar 1 12:24:40 2016 +0000

    Imported Debian patch 1.1.0~r66076-1

 Makefile.am                   |  103 +-
 apertium-nno-nob.nno-nob.dix  | 4475 ++++++++++++++++++++++-------------------
 apertium-nno-nob.nno-nob.lrx  |  125 +-
 apertium-nno-nob.nno-nob.t1x  |   28 +-
 apertium-nno-nob.nno-nob.t2x  |    5 +-
 apertium-nno-nob.nno-nob.t3x  |    4 +-
 apertium-nno-nob.nob-nno.lrx  |  110 +
 apertium-nno-nob.nob-nno.t1x  |  126 +-
 apertium-nno-nob.nob-nno.t2x  |    9 +-
 apertium-nno-nob.nob-nno.t3x  |    4 +-
 configure.ac                  |   45 +-
 debian/changelog              |    4 +-
 debian/compat                 |    2 +-
 debian/control                |   22 +-
 debian/copyright              |   25 +-
 debian/rules                  |   23 +-
 dev/analyse-all-stages.sh     |   49 +
 dev/precommit-testvoc.sh      |    8 +-
 dev/testvoc/bidix-unknowns.sh |   98 +
 dev/testvoc/generation.sh     |   48 +-
 dev/testvoc/streamparser.py   |  137 ++
 lexchoicebil.xsl              |  152 --
 modes.xml                     |   76 +
 t/README.org                  |   47 +
 t/config.sh                   |    2 +
 t/latest-pending.results      |  201 +-
 t/latest-regression.results   | 1115 +++++++++-
 t/pending-tests               |   11 +-
 t/regression-tests            |   11 +-
 t/wiki-tests                  |  144 +-
 30 files changed, 4713 insertions(+), 2496 deletions(-)

diff --cc debian/changelog
index 3f66e24,0000000..5e37f3f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- apertium-nno-nob (1.0.0~r59753-1) experimental; urgency=low
++apertium-nno-nob (1.1.0~r66076-1) unstable; urgency=low
 +
 +  * Initial release
 +
-  -- Tino Didriksen <mail at tinodidriksen.com>  Mon, 13 Apr 2015 16:32:19 +0000
++ -- Tino Didriksen <tino at didriksen.cc>  Tue, 01 Mar 2016 12:24:40 +0000
diff --cc debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --cc debian/control
index 83db0d3,0000000..f881341
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,0 +1,33 @@@
 +Source: apertium-nno-nob
 +Section: science
 +Priority: optional
 +Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
- Uploaders: Tino Didriksen <mail at tinodidriksen.com>,
++Uploaders: Tino Didriksen <tino at didriksen.cc>,
 +           Kartik Mistry <kartik at debian.org>
- Build-Depends: apertium-dev (>= 3.3),
-                apertium-nno,
-                apertium-nob,
++Build-Depends: apertium-dev (>= 3.4),
++               apertium-lex-tools,
++               apertium-nno (>= 0.6.0~r66076),
++               apertium-nob (>= 0.6.0~r66076),
 +               autotools-dev,
 +               cg3,
-                debhelper (>= 8.0),
++               debhelper (>= 9),
 +               dh-autoreconf,
 +               gawk,
-                locales,
 +               pkg-config (>= 0.21)
- Standards-Version: 3.9.6
++Standards-Version: 3.9.7
 +Homepage: http://apertium.org/
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-nno-nob.git
++Vcs-Git: https://anonscm.debian.org/debian-science/packages/apertium-nno-nob.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/apertium-nno-nob.git
 +
 +Package: apertium-nno-nob
 +Architecture: all
- Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
++Depends: apertium (>= 3.4),
++         apertium-lex-tools,
++         cg3,
++         ${misc:Depends},
++         ${shlibs:Depends}
 +Provides: apertium-nob-nno
 +Conflicts: apertium-nob-nno
 +Description: Apertium translation data for the Norwegian Nynorsk-Norwegian Bokmål pair
 + Data package providing Apertium language resources for translating
 + between the Norwegian Nynorsk and Norwegian Bokmål languages.
diff --cc debian/copyright
index 47566d5,0000000..fe54980
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,64 -1,0 +1,53 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Source: http://apertium.org/
 +
 +Files: *
- Copyright: 2009-2015, Kevin Brubeck Unhammer <unhammer at fsfe.org>
-            2008-2014, Trond Trosterud <trond.trosterud at hum.uit.no>
++Copyright: 2009-2016, Kevin Brubeck Unhammer <unhammer at fsfe.org>
++           2008-2016, Trond Trosterud <trond.trosterud at hum.uit.no>
 +           2008-2011, Francis M. Tyers <ftyers at prompsit.com>
 +                2010, Sjurum <moshagen at users.sourceforge.net>
 +           2008-2009, Jim O'Regan <joregan at gmail.com>
 +                2009, Jacob Nordfalk <jacob.nordfalk at gmail.com>
 +                2008, Frode Håvik Korneliussen <frokor at users.sourceforge.net>
 +License: GPL-2+
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-  .
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  .
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
-  .
-  On Debian systems, the complete text of the GNU General
-  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 +
 +Files: lexchoicebil.xsl
 +Copyright: 2005, Universitat d'Alacant / Universidad de Alicante
 +License: GPL-2
-  This program is free software: you can redistribute it and/or modify
++
++License: GPL-2
++This program is free software: you can redistribute it and/or modify
 + it under the terms of the GNU General Public License as published by
 + the Free Software Foundation, version 2 of the License
 + .
 + This package is distributed in the hope that it will be useful,
 + but WITHOUT ANY WARRANTY; without even the implied warranty of
 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + GNU General Public License for more details.
 + .
 + You should have received a copy of the GNU General Public License
 + along with this program. If not, see <http://www.gnu.org/licenses/>.
 + .
 + On Debian systems, the complete text of the GNU General
 + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 +
 +Files: debian/*
 +Copyright: 2014, Apertium Project Management Committee <apertium-pmc at dlsi.ua.es>
 +License: GPL-2+
++
++License: GPL-2+
 + This program is free software: you can redistribute it and/or modify
 + it under the terms of the GNU General Public License as published by
 + the Free Software Foundation, either version 2 of the License, or
 + (at your option) any later version.
 + .
 + This package is distributed in the hope that it will be useful,
 + but WITHOUT ANY WARRANTY; without even the implied warranty of
 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + GNU General Public License for more details.
 + .
 + You should have received a copy of the GNU General Public License
 + along with this program. If not, see <http://www.gnu.org/licenses/>.
 + .
 + On Debian systems, the complete text of the GNU General
 + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --cc debian/rules
index 11004df,0000000..c12d371
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,27 -1,0 +1,12 @@@
 +#!/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
- 
- # This has to be exported to make some magic below work.
 +export DH_OPTIONS
++export LC_ALL=C.UTF-8
 +
 +%:
- 	dh $@ --with autoreconf
++	dh $@ --fail-missing --with autoreconf
 +
- override_dh_auto_build:
- 	mkdir -p debian/tmp/locale/
- 	localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
- 	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
- 	export LC_ALL=en_US.UTF-8 && \
- 	dh_auto_build
++override_dh_auto_test:
++	# Disable test for now

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



More information about the debian-science-commits mailing list