[ucto] 01/01: Undid seperation into new ucto-common-data package again, not needed said Andreas

[Maarten van Gompel]

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

proycon-guest pushed a commit to branch master
in repository ucto.

commit 0bb09bca9d9dbeef270a8ef1ba5c4336f8041876
Author: proycon <proycon at anaproy.nl>
Date:   Mon Jan 23 18:02:26 2017 +0100

    Undid seperation into new ucto-common-data package again, not needed said Andreas
---
 debian/changelog                |  4 ----
 debian/control                  | 32 +-------------------------------
 debian/libucto2.install         |  1 +
 debian/ucto-common-data.install |  1 -
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dbf91d..856a2c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,6 @@ ucto (0.9.6-1) unstable; urgency=high
 
   * Updated to new upstream (0.9.6)
   * Updated uctodata dependency to 0.4
-  * Added new ucto-common-data package containing
-    minimal data that used to be in libucto2
-    (as recommended by Andreas Beckmann in bug #838112)
-    Stated this to break/replace ucto << 0.9.6-1
   * Added preinst/postinst/postrm scripts to remove
     old config files in /etc/ucto left by libucto2
 
diff --git a/debian/control b/debian/control
index 0dd0de3..3349d2d 100644
--- a/debian/control
+++ b/debian/control
@@ -78,8 +78,7 @@ Package: libucto2
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ucto-common-data (= ${source:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
 Replaces: ucto (<< 0.5.5-1)
 Breaks: ucto (<< 0.5.5-1)
@@ -104,32 +103,3 @@ Description: Unicode Tokenizer - runtime
  do scientific research in natural language processing, ucto will likely be of
  use to you.
 
-Package: ucto-common-data
-Section: libs
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Replaces: ucto (<< 0.9.6-1)
-Breaks: ucto (<< 0.9.6-1)
-Description: Unicode Tokenizer - minimal data
- Ucto can tokenize UTF-8 encoded text files (i.e. separate words from
- punctuation, split sentences, generate n-grams), and  offers several other
- basic preprocessing steps that make your text suited for further processing
- such as indexing, part-of-speech tagging, or machine translation.
- .
- This package provides generic data files only.
- Additional data files are available in the uctodata package.
- .
- Ucto was written by Maarten van Gompel and Ko van der Sloot.  Work on Ucto
- was funded by NWO, the Netherlands Organisation for Scientific Research,
- under the Implicit Linguistics project, the CLARIN-NL program, and the
- CLARIAH project.
- .
- Ucto is a product of the Centre of Language and Speech Technology (Radboud
- University Nijmegen), and previously the ILK Research Group
- (Tilburg University, The Netherlands).
- .
- If you are interested in machine parsing of UTF-8 encoded text files, e.g. to
- do scientific research in natural language processing, ucto will likely be of
- use to you.
diff --git a/debian/libucto2.install b/debian/libucto2.install
index 24ebe3b..30f9468 100644
--- a/debian/libucto2.install
+++ b/debian/libucto2.install
@@ -1 +1,2 @@
+/usr/share/ucto
 /usr/lib/*/libucto.so.2*
diff --git a/debian/ucto-common-data.install b/debian/ucto-common-data.install
deleted file mode 100644
index 040e4b2..0000000
--- a/debian/ucto-common-data.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/ucto

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