[Pkg-ocaml-maint-commits] [dose3] 02/09: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/dose3

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository dose3.

commit 03a9a9289dad47e656f3c298857ac8c2d2183ced
Merge: d8b9081 4ae1108
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Oct 21 19:13:20 2014 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/dose3

 debian/changelog                          | 14 ++++++++++++++
 debian/control                            | 21 ++++++++++-----------
 debian/copyright                          |  6 +-----
 debian/patches/buildcheck-redirect-output | 20 --------------------
 debian/patches/series                     |  1 -
 5 files changed, 25 insertions(+), 37 deletions(-)

diff --cc debian/changelog
index 888e5e5,7583b04..adca093
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,26 +1,27 @@@
  dose3 (3.3~beta1-1) UNRELEASED; urgency=low
  
+   [ Ralf Treinen ]
    * new upstream version:
 -    - refreshed patches:
 -      binaries-prefix-edos,coinstall-binary-name,buildcheck-redirect-output
 -    - dropped patches that were integrated upstream: 
 -      buildcheck-manpage,buildcheck-manpage-native-arch,multiarch-accept-value-no
 -  * add rudimentary as-installed package checks
 +    - refreshed patches: binaries-prefix-edos, coinstall-binary-name,
 +      buildcheck-redirect-output
 +    - dropped patches that were integrated upstream: buildcheck-manpage,
 +      buildcheck-manpage-native-arch, multiarch-accept-value-no
 +  * add rudimentary as-installed package tests for dose-debcheck,
 +    dose-builddebcheck, dose-outdated
  
+   [ Johannes Schauer ]
+   * avoid lintian warning binary-control-field-duplicates-source field
+     "priority" by removing the Priority field from edos-distcheck in d/control
+   * avoid lintian warning vcs-field-not-canonical by modifying the Vcs-Git and
+     Vcs-Browser values accordingly
+   * the db subdirectory was removed from the upstream source so remove stanza
+     from d/copyright
+   * bump standards version to 3.9.6
+   * avoid lintian warning copyright-refers-to-symlink-license by pointing to
+     LGPL-3 license file instead of LGPL
+   * d/control: s/debian/Debian/ to avoid capitalization-error-in-description
+   * dropped buildcheck-redirect-output because it was integrated upstream
+ 
   -- Ralf Treinen <treinen at debian.org>  Mon, 20 Oct 2014 19:59:11 +0200
  
  dose3 (3.2.2-3) unstable; urgency=medium

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git