[kbibtex] 02/07: Improve packaging

[Bastien ROUCARIES]

This is an automated email from the git hooks/post-receive script.

broucaries-guest pushed a commit to branch debian/0.6+20160107git762e8425-1
in repository kbibtex.

commit 6f5e091ed8df0fccc7fabd73778535920d00eb4a
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Jan 17 15:03:31 2016 +0100

    Improve packaging
---
 debian/README.source      | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog          |  3 +-
 debian/source/git-patches |  1 +
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..31c0394
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,78 @@
+This package use gitpkg over quilt over git svn
+
+[quick install]
+
+* clone repo
+
+git clone git://login@git.debian.org/git/debian-science/packages/kbibtex.git
+git svn init http://svn.gna.org/svn/kbibtex
+
+* pull trunk
+
+git checkout -f trunk
+git svn fetch
+
+* new upstream version
+
+git svn fetch #retrieve recent svn commit
+git checkout 9682bf563240ad971717554bab3f69f7252767f5 # git revision for svn commit 7980 aka version 6.7.7.0
+git checkout -b upstream/6.7.7.0 # create an upstream branch for revision 6.7.7.0
+rm -rf * # clean up directory tree
+tar --strip 1 -xaf ../kbibtex_6.7.7.0.orig.tar.bz2 # extract origin
+git add . # add everything
+git commit -a -m "add uptream tar.bz2"
+pristine-tar commit ../kbibtex_6.7.7.0.orig.tar.bz2 upstream/6.7.7.0 # use pristine tar
+git checkout -b debian-patches/6.7.7.0-1
+git checkout debian/6.7.6.8-1 # checkout previous debian tree
+git checkout -b  debian/6.7.7.0-1 # create new debian branch
+git checkout debian/6.7.6.8-1 # checkout previous debian tree
+git merge  --no-commit upstream/6.7.7.0 # merge but without commiting
+find ./* -path './debian' -prune -o -path './.git' -prune -o -exec rm -rf '{}' + # remove all except debian and git
+tar --strip 1 -xaf ../kbibtex_6.7.7.0.orig.tar.bz2 # use upstream
+git add .
+git commit -a -m 'merge with upstream' # emulate git theirs but safer
+
+* use patch from debian branches and rebase
+
+git checkout debian-patches/$(version -1)
+git branch debian-patches/$(version)
+git checkout debian-patches/$(version)
+git rebase upstream/$version
+
+* package for debian
+
+gitpkg debian/$version upstream/$version
+
+
+[gitpkg]
+This is controlled by a file debian/source/git-patches. Each line contains a range suitable for passing to git-format-patch(1). 
+The variables UPSTREAM_VERSION and DEB_VERSION are replaced with values taken from debian/changelog. 
+Note that $UPSTREAM_VERSION is the first part of $DEB_VERSION
+An example is:
+ upstream/$UPSTREAM_VERSION..patches/$DEB_VERSION
+ upstream/$UPSTREAM_VERSION..embedded-libs/$DEB_VERSION
+
+This tells gitpkg to export the given two ranges of commits to debian/patches while generating the source package. 
+Each commit becomes a patch in debian/patches, with names generated from the commit messages. In this example, we get 5 patches from the two ranges.
+ 0001-expand-pattern-in-no-java-rule.patch
+ 0002-fix-dd_free_global_constants.patch
+ 0003-Backported-patch-for-CPlusPlus-name-mangling-guesser.patch
+ 0004-Use-system-copy-of-nauty-in-apps-graph.patch
+ 0005-Comment-out-jreality-installation.patch
+
+Thanks to the wonders of 3.0 (quilt) packages, these are applied when the source package is unpacked.
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+Moreinformation: man gitpkg
+
+[quilt]
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+More information: /usr/share/doc/quilt/README.source
+
+ -- Bastien Roucariès <roucaries.bastien+debian at gmail.com>, Mon,  5 Nov 2012 12:06:39 +0100
diff --git a/debian/changelog b/debian/changelog
index 7ca0cc5..8527880 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,10 @@ kbibtex (0.6+20160107git762e8425-1) experimental; urgency=medium
     qoauth and libqxt (part) not yet compiled for qt5.
   * Move arch all data to kbibtex-data.
   * Bump policy and upgrade debian package:
-    + add of 001-add-keywords-to-desktop.patch
     + rewrite of d/watch
     + remove of the menu file
 
- -- Bastien Roucariès <roucaries.bastien+debian at gmail.com>  Sat, 02 Jan 2016 19:16:36 +0100
+ -- Bastien Roucariès <roucaries.bastien+debian at gmail.com>  Sun, 17 Jan 2016 14:58:58 +0100
 
 kbibtex (0.4.1-1) experimental; urgency=low
 
diff --git a/debian/source/git-patches b/debian/source/git-patches
new file mode 100644
index 0000000..5485c5a
--- /dev/null
+++ b/debian/source/git-patches
@@ -0,0 +1 @@
+upstream/$UPSTREAM_REF..debian-patches/$DEB_REF

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kbibtex.git