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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5da0e0d3e418592868dc559cd08b68ad06f83548
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun May 23 00:08:53 2010 +0300

    Drop topgit support. New README.source.
    
    * Drop topgit support:
      - remove snippet from debian/rules;
      - rewrite debian/README.source.
---
 debian/README.source |   64 +++++++++++++++++++++++++++++++++++---------------
 debian/changelog     |    3 ++
 debian/rules         |    6 ----
 3 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index cdd7a19..c550c02 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,23 +1,49 @@
-This package uses git+topgit as the packaging VCS. Please install Debian topgit
-package 0.5 or higher and read /usr/share/doc/topgit/HOWTO-tg2quilt.gz for more
-information how to checkout, add, remove, modify patches (topic branches) and
-do other common tasks. Branch structure of the repository is as follows:
+Branches in the Git packaging repository
+----------------------------------------
 
-* upstream   - upstream source code.
-* master     - the Debianization branch (upstream source and debian directory).
-               This branch also contains exported debian/patches ready for
-               building.
+Packaging branches must NOT have any debian/patches/* applied. When diff'ing
+packaging and the respective upstream branch, there must NOT be any changes
+outside debian/ subdirectory.
 
-Topic branches should be named as follows:
+Repository layout is as follows:
 
-* general/*  - namespace for general upstream patches. Patches can be named
-               freely, but it is recommended to suffix names with '_fix' for
-               patches fixing bugs and with '_feature' for patches introducing
-               new features. These patches should be based on the upstream
-               branch.
-* debian/*   - Debian specific patches should be put in this namespace. These
-               patches should be based on the upstream branch or even master
-               branch if necessary.
+* master               - the main packaging branch (upstream source and
+                         debian directory). Typically targets Debian unstable.
+* upstream             - upstream source code for the master branch.
+* <suitename>          - packaging branch targeting Debian <suite_name>
+* upstream-<suitename> - upstream source code for packaging in <suite_name>
+                         branch.
+* pristine-tar         - a branch with pristine-tar deltas for original
+                       - upstream tarballs.
+* debian/<dversion>    - annotated signed tags for package releases to Debian
+                         (based on master and <suitename> branches. ~ is
+                         replaced with -. Tag message should be of the form
+                         '<dversion>/<suitename>'.
+* upstream/<uversion>  - annotated tags for upstream releases which had at least one
+                         debian package release (based on upstream and
+                         upstream-<suitename> branches). ~ is replaced with -.
 
-If a patch depends on any other patch(es), create/adjust its topic branch
-dependencies as needed.
+General rules for patches in debian/patches
+-------------------------------------------
+
+- Patches are managed with `QUILT_PATCHES=debian/patches quilt`.
+* Highly recommended ~/.quiltrc settings are as follows:
+  -------<--------->--------
+  QUILT_NO_DIFF_INDEX=y
+  QUILT_NO_DIFF_TIMESTAMPS=y
+  QUILT_REFRESH_ARGS="-p ab"
+  QUILT_DIFF_OPTS="-p"
+  -------<--------->--------
+* All patches must have valid DEP-3 [1] headers with at least Description and
+  Author/Origin fields.
+* Patches should follow these naming rules:
+  - Each patch should be prefixed with either "debian_" for Debian specific
+    changes, "general_" for distribution agnostic changes or "backport_" for
+    changes backported from future releases.
+  - Patch name should be rather short and meaningfully reflect nature of the
+    changes. "_" should be used as a word separator.
+  - It is recommended to suffix the patch name with either  "_fix" for patches
+    fixing bugs or with '_feature' for patches introducing new features.
+* All patches should have .diff extension.
+
+1. http://dep.debian.net/deps/dep3/
diff --git a/debian/changelog b/debian/changelog
index 80d1750..10212b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ konversation (1.3~beta1-1) UNRELEASED; urgency=low
   * Rename patches:
     - debian/dbug_autoreplace.diff -> debian_dbug_autoreplace.diff;
     - debian/debian_channel.diff -> debian_channel.diff.
+  * Drop topgit support:
+    - remove snippet from debian/rules;
+    - rewrite debian/README.source.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 22 May 2010 22:45:28 +0300
 
diff --git a/debian/rules b/debian/rules
index 49bde57..8a14d5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,6 @@
 
 #DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
-ifneq (,$(shell which tg))
-QUILT_PATCH_DIR := debian/patches
-TG_BRANCHES := $(filter-out debian/aboutdata_add_debian_version,$(shell tg summary -t))
-include /usr/share/topgit/tg2quilt.mk
-endif
-
 override_dh_auto_configure:
 	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON
 

-- 
Konversation packaging for Debian