[Pkg-openldap-devel] [openldap] 280/281: Convert to source format 3.0 (quilt).

Ryan Tandy rtandy-guest at moszumanska.debian.org
Thu Jul 9 01:43:10 UTC 2015


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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 700bdf591e974025d5d543d24bfe08349a709694
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Wed Jul 8 04:05:29 2015 +0000

    Convert to source format 3.0 (quilt).
---
 debian/README.source | 8 --------
 debian/changelog     | 1 +
 debian/control       | 2 +-
 debian/rules         | 2 +-
 debian/source/format | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 2051d6b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.  Please see:
-
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
diff --git a/debian/changelog b/debian/changelog
index cad44a8..dd6ac33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openldap (2.4.41+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update patches for upstream changes, drop patches included upstream.
   * debian/rules: Adjust get-orig-source target to add +dfsg to version.
+  * Convert to source format 3.0 (quilt).
 
  -- Ryan Tandy <ryan at nardis.ca>  Wed, 08 Jul 2015 02:53:48 +0000
 
diff --git a/debian/control b/debian/control
index be8222d..917639f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
 	libdb5.3-dev, nettle-dev,
  libgnutls28-dev, unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
- libwrap0-dev, perl, po-debconf, quilt (>= 0.46-7),
+ libwrap0-dev, perl, po-debconf,
  groff-base, time, heimdal-multidev,
  dh-autoreconf
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
diff --git a/debian/rules b/debian/rules
index af949a8..1196dd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ get-orig-source:
 	gzip -9 openldap_$(VERSION)+dfsg.orig.tar
 
 %:
-	dh $@ --with quilt,autoreconf --builddirectory=$(builddir) --parallel
+	dh $@ --with autoreconf --builddirectory=$(builddir) --parallel
 
 # Only contrib/ldapc++ uses Automake, so special care is needed to update
 # config.guess and config.sub at the top level.
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

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



More information about the Pkg-openldap-devel mailing list