[SCM] KTorrent library Debian packaging branch, master, updated. upstream/1.0.0-8-g85bca2c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 85bca2c5f84f0812084c76db57b1cf4599071caf
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue May 25 03:01:10 2010 +0300

    Add debian/README.source.
---
 debian/README.source |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog     |    1 +
 2 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c550c02
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,49 @@
+Branches in the Git packaging repository
+----------------------------------------
+
+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.
+
+Repository layout is as follows:
+
+* 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 -.
+
+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 58160f1..3557705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libktorrent (1.0.0-0r1) UNRELEASED; urgency=low
     debian_disable_ipv6_only.diff). The bug remains open on kFreeBSD.
   * License files are in upstream tarball now, remove the respective note from
     debian/copyright.
+  * Add debian/README.source.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 24 May 2010 15:02:23 +0300
 

-- 
KTorrent library Debian packaging