The following commit has been merged in the master branch: commit 7de359c80a28c6544bd58aabda1eb86fa885dd92 Author: Wolodja Wentland <babi...@gmail.com> Date: Thu Oct 6 13:13:29 2011 +0100
Use officially endorsed packaging style. The pkg-java team now endorses a packaging style in [0] that different from the gitpkg based one used for leiningen. This patch removes gitpkg specific information (namely debian/source/git-patches) and updates README.source to reflect this change. [0] http://wiki.debian.org/Java/JavaVcs diff --git a/debian/README.source b/debian/README.source index c14278f..96d1ef4 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,8 +1,8 @@ the debianisation of leiningen ============================== -The Debian packaging for leiningen is stored in git. You can use debcheckout -or clone it directly from the repository: +The Debian packaging for leiningen [0] is stored in git. You can use +debcheckout or clone it directly from the repository: $ debcheckout leiningen $ git clone git://git.debian.org/pkg-java/leiningen.git @@ -12,44 +12,19 @@ too: $ git clone ssh://git.debian.org/git/pkg-java/leiningen.git -branch layout -------------- +This package uses a version control system as described in +http://wiki.debian.org/Java/JavaVcs and the pages linked from there. -There are three main branches: +Note on versions <= 1.6.1-2 +--------------------------- - - master - - Contains merged debian packaging and upstream commits. Uploaded versions - are tagged with debian/$debian_ver where #debian_ver is a Debian version - such as 1.6.1-1. - - - upstream - - Contains releases merged from the upstream repository [0] and releases are - tagged with upstream/$upstream_version where $upstream_version is a version - of an upstream release such as 1.6.1. - - - pristine-tar - - Contains information to generate an exact copy of the upstream tarball that - was committed to the repository. - -In addition to these we use a branch from which patches are generated: - - - patch-queue - - This branch merges from upstream and contains patches where one commit - corresponds to one patch. The end of a patch-queue is tagged with - patches/$debian_ver and the branch may be rebased. - -build ------ - -We use gitpkg [1] to build the package. In order to generate the orig tarball -and patches you need to enable the corresponding export hooks of gitpkg: +We used gitpkg [1] to build the package up to version 1.6.1-2. In order to +generate the orig tarball and patches you need to enable the corresponding +export hooks of gitpkg and configure gitpkg to build with dpkg-buildpackage: $ git config gitpkg.pre-export-hook /usr/share/gitpkg/hooks/pristine-tar-pre-export-hook $ git config gitpkg.deb-export-hook /usr/share/gitpkg/hooks/quilt-patches-deb-export-hook + $ git config gitpkg.exit-hook /usr/share/gitpkg/hooks/dpkg-buildpackage-exit-hook and you can build with: @@ -59,103 +34,16 @@ If you want to build a specific version you can pass the corresponding tag: $ gitpkg debian/$debian_ver -new upstream version --------------------- - -We grab new upstream versions of leiningen directly from the repository on -github and generate tarballs from upstream tags. If you have no remote branch -of it yet, just fetch it: - - $ git fetch https://github.com/technomancy/leiningen.git - -which is even simpler if you use hub [2]: - - $ git fetch technomancy/leiningen - -This should create a couple of remote branches and tags and we create a -tarball directly from the newest tag ($upstream_tag) such as 1.6.1: - - $ git archive --format=tar --prefix=leiningen-$upstream_tag/ \ - $upstream_tag | gzip -9 > ../leiningen_$upstream_tag.tar.gz - -To package this new version you have to checkout the upstream branch: - - $ git checkout upstream - -remove untracked files and directories - - $ git clean -dfx - -and all tracked ones - - $ git ls-files -z | xargs -0 rm -f - -import the newly created $tarball: - - $ tar --strip-components=1 -zxf $tarball - $ git add -A - $ git commit -m "Imported $tarball" - -and tag the commit of the new release - - $ git tag -s upstream/$upstream_ver $new_release_ref - -David Bremner came up with a useful git alias for this [3] - -We can now commit the imported tarball to the pristine-tar branch: - - $ pristine-tar commit $tarball - -work on patches - - $ git checkout patch-queue - $ git merge upstream/$upstream_ver - $ work_on_patches - -tag the end of the patch-queue ($patch_commit_ref) - - $ git tag -s patches/$debian_ver $patch_commit_ref - -and work on the packaging - - $ git checkout master - $ git merge upstream/$upstream_ver - $ work_on_packaging - -and tag the last commit ref ($deb_commit_ref) once you are done and the -package has been uploaded - - $ git tag -s debian/$debian_ver $deb_commit_ref - -Do not forget to push changes and tags to pkg-java's repository - - $ git push --all - $ git push --tags - -patches -------- - -Patches are exported based on debian/source/git-patches, where each line is -an argument to git-format-patch. The variables $DEB_VERSION and -$UPSTREAM_VERSION are the Debian and upstream version being exported. -You can either use git-format-patch manually, or install gitpkg -version 0.17 or later. gitpkg needs to be configured to export the patches -automatically at source package creation time: - - $ git config gitpkg.deb-export-hook /usr/share/gitpkg/hooks/quilt-patches-deb-export-hook - -which allows you to run - - $ gitpkg master +Switching to the endorsed git packaging style described in [2] a rename of the +patch-queue branch to patch-queue/old was necessary in order to be compatible +with git-pq's branch naming scheme. If you checked out leiningen prior to this +version you need to run the following commands to update your local +repository. -to make a source package including patches. + $ git remote prune origin + $ git branch -D patch-queue + $ git pull --all [0] https://github.com/technomancy/leiningen [1] http://packages.debian.org/sid/gitpkg -[2] https://github.com/defunkt/hub -[3] Git alias for tarball import - [alias] - import-tgz = "!f() { if [ -f $1 ]; then git clean -fxd; git ls-files -z - | xargs -0 rm -f; tar --strip-components=1 -zxvf $1 ; git add -A; - git commit -m'Importing '`basename $1`; else echo "missing tarball $1"; - fi; }; f" +[2] http://wiki.debian.org/Java/JavaGit diff --git a/debian/source/git-patches b/debian/source/git-patches deleted file mode 100644 index d7e3a6d..0000000 --- a/debian/source/git-patches +++ /dev/null @@ -1 +0,0 @@ -upstream/${UPSTREAM_REF}..patches/${DEB_REF} -- leiningen packaging _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits