[frog] 01/02: bumped compat/debhelper to 10, fixed copyright ordering, wrap-and-sort cleanup

Maarten van Gompel proycon-guest at moszumanska.debian.org
Fri Nov 11 17:51:06 UTC 2016


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

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

commit f8b49cff8a847b3ba567c2ea866585a1d09d0cb6
Author: proycon <proycon at anaproy.nl>
Date:   Fri Nov 11 18:48:33 2016 +0100

    bumped compat/debhelper to 10, fixed copyright ordering, wrap-and-sort cleanup
---
 debian/changelog           |  6 +++++-
 debian/compat              |  2 +-
 debian/control             | 24 ++++++++++++------------
 debian/copyright           | 30 ++++++++++--------------------
 debian/libfrog-dev.install |  2 +-
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 692f2b0..554bb26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ frog (0.13.5-2) unstable; urgency=high
   [ Maarten van Gompel ]
   * debian/control: require libfolia v1.4 
     (Closes: #843053)
+  * debian/copyright: removed reduntant entries, fixed ordering
+  * debian/compat: bumped to 10
+  * debian/control: bumped debhelper to 10
+  * debian/*: wrap-and-sort cleanup
 
- -- Maarten van Gompel <proycon at anaproy.nl>  Tue, 02 Aug 2016 13:55:00 +0200
+ -- Maarten van Gompel <proycon at anaproy.nl>  Fri, 11 November 2016 18:44:00 +0200
 
 frog (0.13.5-1) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c03e0f5..b40cbfb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,18 @@ Uploaders: Maarten van Gompel <proycon at anaproy.nl>,
 Section: science
 Priority: extra
 Build-Depends: cdbs,
-               debhelper (>= 9),
+               debhelper (>= 10),
                dh-autoreconf,
-               pkg-config,
-               libicu-dev,
-               libxml2-dev,
-               libucto-dev (>= 0.9.0),
-               libtimbl4-dev | libtimbl-dev (>= 6.4.4),
-               libtimblserver4-dev,
+               frogdata (>= 0.10),
                libfolia-dev (>= 1.4),
+               libicu-dev,
                libmbt1-dev (>= 3.2.14) | libmbt-dev (>= 3.2.14),
                libticcutils2-dev (>= 0.13),
-               frogdata (>= 0.10),
+               libtimbl4-dev | libtimbl-dev (>= 6.4.4),
+               libtimblserver4-dev,
+               libucto-dev (>= 0.9.0),
+               libxml2-dev,
+               pkg-config,
                uctodata
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/frog.git
@@ -25,8 +25,8 @@ Homepage: https://languagemachines.github.io/frog/
 
 Package: frog
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ucto
 Description: tagger and parser for natural languages (runtime)
  Memory-Based Learning (MBL) is a machine-learning method applicable to a wide
@@ -53,8 +53,8 @@ Description: tagger and parser for natural languages (runtime)
 Package: libfrog1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: tagger and parser for Dutch language (library)
  Memory-Based Learning (MBL) is a machine-learning method applicable to a wide
  range of tasks in Natural Language Processing (NLP).
diff --git a/debian/copyright b/debian/copyright
index 59d6251..c2d0ab4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,21 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://github.com/LanguageMachines/frog
 
+Files: *
+Copyright: Copyright © 2006 - 2016, Centre for Language and Speech
+ Technology (Radboud University Nijmegen), the ILK Research Group
+ (Tilburg University, The Netherlands) and the CLiPS Research Centre
+ (University of Antwerp, Belgium).
+License: GPL-3+
+Author: Antal van den Bosch, Berjan Busser, Maarten van Gompel,
+ Ko van der Sloot
+
 Files: debian/*
 Copyright: Copyright © 2010 Joost van Baal <joostvb at ad1810.com>
 License: GPL-3+
 Author: Joost van Baal, Maarten van Gompel
 
-Files: m4/ac_define_dir.m4
-Copyright: Copyright © 2006 Stepan Kasal <kasal at ucw.cz>
- Copyright © 2006 Andreas Schwab <schwab at suse.de>
- Copyright © 2006 Guido U. Draheim <guidod at gmx.de>
- Copyright © 2006 Alexandre Oliva
-License: other
- Copying and distribution of this file, with or without
- modification, are permitted in any medium without royalty provided
- the copyright notice and this notice are preserved.
-Author: Stepan Kasal, Andreas Schwab, Guido U. Draheim, Alexandre Oliva
-
-Files: m4/acx_pthread.m4
+Files: m4/ax_pthread.m4
 Copyright: Copyright © 2008 Steven G. Johnson <stevenj at alum.mit.edu>
 License: GPL-3+exception
  This program is free software: you can redistribute it and/or modify it
@@ -71,14 +69,6 @@ License: GPL-2+
  the same distribution terms that you use for the rest of that program.
 Author: Scott James Remnant
 
-Files: *
-Copyright: Copyright © 2006 - 2016, Centre for Language and Speech
- Technology (Radboud University Nijmegen), the ILK Research Group
- (Tilburg University, The Netherlands) and the CLiPS Research Centre
- (University of Antwerp, Belgium).
-License: GPL-3+
-Author: Antal van den Bosch, Berjan Busser, Maarten van Gompel,
- Ko van der Sloot
 
 License: GPL-3+
  Frog is free software; you can redistribute it and/or modify
diff --git a/debian/libfrog-dev.install b/debian/libfrog-dev.install
index 0a34ff7..23febf3 100644
--- a/debian/libfrog-dev.install
+++ b/debian/libfrog-dev.install
@@ -1,3 +1,3 @@
+usr/include/frog
 usr/lib/*.a
 usr/lib/libfrog.so
-usr/include/frog

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



More information about the debian-science-commits mailing list