[SCM] KTorrent Debian packaging. branch, master, updated. debian/3.3-rc1+svn1041897+dfsg.1-1

Modestas Vainius modax-guest at alioth.debian.org
Wed Oct 28 21:22:51 UTC 2009


The following commit has been merged in the master branch:
commit e97ee03c55994332f614688b7dea4581f9de0e74
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Oct 28 22:48:38 2009 +0200

    Switch to dpkg-source Format: 3.0 (quilt).
    
    - set debian/source/format to "3.0 (quilt)";
    - drop quilt from Build-Depends, no longer needed;
    - do not use quilt dh addon anymore;
    - adjust debian/README.source accordingly.
---
 debian/README.source |    7 +------
 debian/changelog     |    5 +++++
 debian/control       |    2 +-
 debian/rules         |    2 +-
 debian/source/format |    1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index df1ef7d..c559f05 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -22,9 +22,4 @@ Topic branches should be named as follows:
 If a patch depends on any other patch(es), create/adjust its topic branch
 dependencies as needed.
 
-However, topgit is not a build dependency. Patches are exported to
-debian/patches as quilt series before building. Please read
-/usr/share/doc/quilt/README.source (quilt version 0.46-4.1 or later) for more
-information on how to manage patches directly with quilt. Please note that this
-method is not acceptable for long term package management, only for quick
-patching.
+This package uses dpkg-source format "3.0 (quilt)" for managing patches.
diff --git a/debian/changelog b/debian/changelog
index f3574f9..d082cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ ktorrent (3.3~rc1+svn1041897+dfsg.1-0r1) UNRELEASED; urgency=low
     - Last Changed Rev: 1041897
     - Last Changed Date: 2009-10-28 21:31:36 +0200
   * Refresh patches.
+  * Switch to dpkg-source Format: 3.0 (quilt):
+    - set debian/source/format to "3.0 (quilt)";
+    - drop quilt from Build-Depends, no longer needed;
+    - do not use quilt dh addon anymore;
+    - adjust debian/README.source accordingly.
 
  -- Modestas Vainius <modestas at vainius.eu>  Wed, 28 Oct 2009 22:23:25 +0200
 
diff --git a/debian/control b/debian/control
index a36ad2f..044fc5c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas at vainius.eu>
 DM-Upload-Allowed: yes
-Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3.16), quilt (>= 0.4.6-7~), pkg-kde-tools (>= 0.5),
+Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0), kdepimlibs5-dev (>= 4:4.2.0),
  kdebase-workspace-dev (>= 4:4.2.0), libtag1-dev,
  pkg-config, libgeoip-dev, libgmp3-dev, libqca2-dev, libx11-dev, libboost-serialization-dev,
diff --git a/debian/rules b/debian/rules
index f4ef239..b43d97f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_configure:
 	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON \
 	                           -DWITH_SYSTEM_GEOIP:BOOL=ON -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
 %:
-	dh --dbg-package=ktorrent-dbg --with kde,quilt $@
+	dh --dbg-package=ktorrent-dbg --with kde $@
 
 prune-tarball:
 	# Remove non-free components: flags and geoip stuff
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list