[med-svn] [SCM] emboss branch, master, updated. debian/6.3.1-6-35-gedc24f6

[Andreas Tille]

The following commit has been merged in the master branch:
commit 962705ab7438842f044a3ffd765d6df558588d2e
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 20 08:40:06 2012 +0200

    Revert switch to source/format 3.0 (quilt) and recreate original upstream patch as well as quilt Build-Depends accordingt to the hint of Charles Plessy

diff --git a/debian/changelog b/debian/changelog
index 56f7595..48b59fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,6 @@ emboss (6.4.0-1) UNRELEASED; urgency=low
   * debian/control:
      - remove article from description
      - Standards-Version: 3.9.3 (no changes needed)
-  * debian/source/format: 3.0 (quilt)
-  * debian/{control,rules}: No point to explicitly mention quilt when
-    using debian/source format 3.0 (quilt)
   * debian/emboss.menu:
      - menu section is calles Applications not Apps
      - use submenu Science/Biology as root for the EMBOSS section
diff --git a/debian/control b/debian/control
index e0cc851..b97ef86 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,10 @@ DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Nelson A. de Oliveira <naoliv at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9), libx11-dev, x11proto-core-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng-dev, libexpat1-dev, libhpdf-dev, libmysqlclient-dev, libpq-dev, antiword, sharutils, autotools-dev, tcsh | csh | c-shell,
+Build-Depends: debhelper (>= 9), quilt, libx11-dev, x11proto-core-dev,
+ libgdchart-gd2-xpm-dev, zlib1g-dev, libpng-dev, libexpat1-dev, libhpdf-dev,
+ libmysqlclient-dev, libpq-dev, antiword, sharutils, autotools-dev,
+ tcsh | csh | c-shell,
 # 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
diff --git a/debian/rules b/debian/rules
index 437006f..f44dcd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@ --with autotools-dev
+	dh $@ --with autotools-dev,quilt
 
 VERSION := $(shell dpkg-parsechangelog | grep Ver | cut -d' ' -f2 | cut -d- -f1)
 RENAMED := cons pscan
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)

-- 
The European Molecular Biology Open Software Suite.