[med-svn] [emboss] 01/05: cme fix dpkg-control

[Andreas Tille]

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

tille pushed a commit to branch master
in repository emboss.

commit dfa92ddf92b3a17cf9583a7aa31dca6c16ec6646
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 19 20:53:26 2014 +0200

    cme fix dpkg-control
---
 debian/changelog |  7 ++++++-
 debian/control   | 16 +++-------------
 debian/rules     |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 094edba..32701ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,12 @@ emboss (6.6.0-2) UNRELEASED; urgency=medium
   [ Gert Wollny ]
   * Add patch to pad Hershey_to_Unicode_table consistently (Closes: #748395)
 
- -- Andreas Tille <tille at debian.org>  Fri, 16 May 2014 23:28:32 +0200
+  [ Andreas Tille ]
+  * cme fix dpkg-control:
+     - drop very old library versions from conflicts / replaces list
+  * remove explicite quilt dependency which is not needed
+
+ -- Andreas Tille <tille at debian.org>  Mon, 19 May 2014 20:52:12 +0200
 
 emboss (6.6.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e890247..5299711 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Charles Plessy <plessy at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               quilt,
                libx11-dev,
                x11proto-core-dev,
                libgdchart-gd2-xpm-dev,
@@ -24,7 +23,7 @@ Build-Depends: debhelper (>= 9),
 # Needed until the following is solved: https://sourceforge.net/tracker/?func=detail&aid=3033326&group_id=93650&atid=605031 
                default-jdk
 #Build-Depends-Indep: default-jdk
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/emboss.git
 Vcs-Git: git://anonscm.debian.org/debian-med/emboss.git
 Homepage: http://emboss.sourceforge.net
@@ -85,21 +84,13 @@ Package: emboss-lib
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libajax5,
-           libajax6,
-           libajax5-dev,
+Conflicts: libajax6,
            libajax6-dev,
-           libnucleus5,
            libnucleus6,
-           libnucleus5-dev,
            libnucleus6-dev
-Replaces: libajax5,
-          libajax6,
-          libajax5-dev,
+Replaces: libajax6,
           libajax6-dev,
-          libnucleus5,
           libnucleus6,
-          libnucleus5-dev,
           libnucleus6-dev
 Description: EMBOSS Libraries
  This package contains the core libraries of the European Molecular Biology
@@ -129,4 +120,3 @@ Depends: ${shlibs:Depends},
 Description: graphical user interface to EMBOSS
  Jemboss is a Graphical User Interface (GUI) to EMBOSS, the European Molecular
  Biology Open Software Suite. It is part of the EMBOSS distribution.
-
diff --git a/debian/rules b/debian/rules
index af98c70..46f2ba9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@ --with autotools-dev,quilt,autoreconf
+	dh $@ --with autotools-dev,autoreconf
 
 VERSION := $(shell dpkg-parsechangelog | grep Ver | cut -d' ' -f2 | cut -d- -f1)
 RENAMED := cons pscan

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/emboss.git