[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.0-beta2-1-18-gd9b534f
Modestas Vainius
modax at alioth.debian.org
Tue May 25 08:15:46 UTC 2010
The following commit has been merged in the master branch:
commit 7607be9c3007a4905cc4d6468d8f27dc6616c987
Author: Modestas Vainius <modestas at vainius.eu>
Date: Tue May 25 03:05:42 2010 +0300
Rewrite debian/README.source: no more topgit.
---
debian/README.source | 64 ++++++++++++++++++++++++++++++++++---------------
debian/changelog | 1 +
2 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index c559f05..c550c02 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,25 +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
+-------------------------------------------
-This package uses dpkg-source format "3.0 (quilt)" for managing 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 72f17c2..bb755ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ ktorrent (4.0.0-0r1) UNRELEASED; urgency=low
* Add libktorrent-l10n to ktorrent Depends.
* Add libktorrent-dbg to ktorrent-dbg Depends.
* Drop topgit support from debian/rules.
+ * Rewrite debian/README.source: no more topgit.
-- Modestas Vainius <modax at debian.org> Sat, 08 May 2010 18:23:59 +0300
--
KTorrent Debian packaging.
More information about the pkg-kde-commits
mailing list