[SCM] Konversation packaging for Debian branch, master, updated. debian/1.2.1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit d5bed959969d0e75b2888ffa92f66946cda51619
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Nov 12 18:16:21 2009 +0200

    Switch to dpkg-source format 3.0 (quilt).
    
    * Switch to dpkg-source format 3.0 (quilt):
      - do not use quilt dh addon anymore;
      - do not build depend on quilt;
      - remove notes about quilt from README.source.
---
 debian/README.source |    7 -------
 debian/changelog     |    4 ++++
 debian/control       |    2 +-
 debian/rules         |    2 +-
 debian/source/format |    1 +
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index df1ef7d..cdd7a19 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -21,10 +21,3 @@ 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.
diff --git a/debian/changelog b/debian/changelog
index 77ffdbd..6ef556b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ konversation (1.2.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * Fix download URL in debian/watch. konversation moved to ftp.kde.org.
     Track upstream stable branch dir.
+  * Switch to dpkg-source format 3.0 (quilt):
+    - do not use quilt dh addon anymore;
+    - do not build depend on quilt;
+    - remove notes about quilt from README.source.
 
  -- Modestas Vainius <modestas at vainius.eu>  Thu, 12 Nov 2009 18:13:24 +0200
 
diff --git a/debian/control b/debian/control
index 4f848b2..577ce0d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas at vainius.eu>
-Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5), quilt (>= 0.46-7~),
+Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libqt4-dev (>= 4.4.3), kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
  libx11-dev, x11proto-core-dev, libxss-dev, libqca2-dev
 Standards-Version: 3.8.3
diff --git a/debian/rules b/debian/rules
index 3a530d1..49bde57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,4 +19,4 @@ override_dh_install:
 	fi
 
 %:
-	dh --with kde,quilt --dbg-package=konversation-dbg $@
+	dh --with kde --dbg-package=konversation-dbg $@
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)

-- 
Konversation packaging for Debian