[Pkg-privacy-commits] [torbirdy] 02/10: Clean up build instructions

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian/sid
in repository torbirdy.

commit aaed35fb3789eecfe59c6d3ddbce8b66060cf743
Author: Ulrike Uhlig <u at 451f.org>
Date:   Sat Jul 2 23:00:08 2016 +0200

    Clean up build instructions
---
 debian/README.source | 175 +++++++--------------------------------------------
 1 file changed, 23 insertions(+), 152 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index ea36edf..84cfba5 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,164 +1,35 @@
-# So you want to build a new Debian package for TorBirdy?
-# These are the exact steps taken to update from TorBirdy 0.1.2 to 0.1.3
-# 
-sudo apt-get install git-buildpackage pristine-tar mozilla-devscripts zip
-export VERSION=0.1.3
-git clone ssh://anonscm.debian.org/git/pkg-mozext/torbirdy.git torbirdy
+# test if xpi build works
+# make -f debian/rules build
+# make -f debian/rules clean
+
+# this needs to be done only once, for setup
+debcheckout -a torbirdy
 cd torbirdy
-git checkout upstream
+git fetch origin
 git checkout pristine-tar
-git checkout master
-cd ..
-git clone git at github.com:ioerror/torbirdy.git torbirdy.upstream
-cd torbirdy.upstream
-git checkout $VERSION
-git archive --format=tar --prefix="torbirdy_$VERSION.orig/" \ 
-  -o ../torbirdy_$VERSION.orig.tar -v $VERSION
-cd ../torbirdy
-git checkout master
-git import-orig --filter=*.git --pristine-tar --upstream-version=$VERSION \
-  ../torbirdy_$VERSION.orig.tar
-dch -v $VERSION-1 "New upstream release"
-git add debian/changelog
-git commit -m "stage release $VERSION"
-# Make any other changes here ...
-# stage them and commit them ...
-# Now build it and ignore anything not in git:
-git-buildpackage --git-ignore-new
-# Test the resulting .deb
-# Please tag this release, build and upload the Debian package
-# Hooray!
-# You're done!
+git remote add torbirdy-upstream https://git.torproject.org/torbirdy.git
+git fetch torbirdy-upstream
 
-#########################################################################
-# The following notes are different ways to accomplish the same job
-# They are potential alternative methods for doing the task above
-# in the future.
-#########################################################################
+# This needs to be done everytime
+git fetch origin
+git fetch torbirdy-upstream
 
-# First install some packages to do the job:
-sudo apt-get install git-buildpackage pristine-tar mozilla-devscripts zip
-# Or if using schroot
-mysid=sid$RANDOM;
-schroot -b -c sid -n $mysid; dd-schroot-cmd -c $mysid apt-get update;
-dd-schroot-cmd -c $mysid apt-get build-dep torbirdy;
-dd-schroot-cmd -c $mysid apt-get install git git-buildpackage \
-  pristine-tar mozilla-devscripts zip ssh ca-certificates gitpkg
-schroot -r -c $mysid
+export VERSION="0.2.0"
+# checkout latest signed upstream tag
+git checkout $VERSION
+git archive --prefix="torbirdy-${VERSION}/" --output="../torbirdy_${VERSION}.orig.tar.gz" $VERSION
 
-# Lunar suggests the following as the ideal workflow
-# You may need to do this: gpg --recv-key 0x744301A2
-# Set the version we're going to import
-VERSION=0.1.3
-gbp clone https://anonscm.debian.org/git/pkg-mozext/torbirdy.git
-# Or if you're doing this with ssh keys:
-# gbp clone ssh://anonscm.debian.org/git/pkg-mozext/torbirdy.git
-cd torbirdy
-git remote add torbirdy-upstream https://github.com/ioerror/torbirdy.git
-# Or if you're doing this with ssh keys:
-# git remote add torbirdy-upstream ssh://git@github.com:ioerror/torbirdy.git
-git fetch torbirdy-upstream
-git tag -v $VERSION
-git checkout upstream
-git merge --ff-only $VERSION
-git tag upstream/$VERSION
-git checkout master
-git merge upstream/$VERSION
-# Make any packaging changes here (eg: dch, etc)
-git-buildpackage --git-ignore-new
+# Possibility2: merge current release
+git checkout debian/sid
+git merge $VERSION
 
-##########################################
-# Alternative ways to build this package #
-##########################################
+# if we want to import the tarball. no-merge does not merge twice into debian branch
+gbp import-orig --no-merge --upstream-vcs-tag=0.2.0 --pristine-tar "../torbirdy_${VERSION}.orig.tar.gz"
 
-# Ulrike's version
-export VERSION=0.1.4
-debcheckout -a torbirdy
-cd torbirdy
-git fetch origin --tags
-git checkout pristine-tar
-git remote add torbirdy-upstream https://git.torproject.org/torbirdy.git
-git fetch torbirdy-upstream
-git checkout master
-uscan --verbose # this should download the latest upstream version and repack it as orig.tar.*
-# this will import delta into pristine-tar, create an upstream tag and import to debian packagin branch, in this case it's "master"
-gbp import-orig ../torbirdy_$VERSION.orig.tar.gz
 dch -i
 git commit debian/changelog
+
+# build
 gbp buildpackage
 git tag -s debian/$VERSION-1
 git push origin master && git push origin --tags
-# end Ulrike's version
-
-# Grab the current package's source:
-git clone ssh://anonscm.debian.org/git/pkg-mozext/torbirdy.git torbirdy
-# OR perhaps https://anonscm.debian.org/git/pkg-mozext/torbirdy.git
-# checkout the various branches:
-cd torbirdy
-git checkout upstream
-git checkout pristine-tar
-git checkout master
-# Grab upstream's latest git repo:
-cd ..
-git clone ssh://git@github.com:ioerror/torbirdy.git torbirdy.upstream
-# OR perhaps https://github.com/ioerror/torbirdy.git
-# Now create an orig.tar.bz of the upstream release
-cd torbirdy.upstream
-git checkout $VERSION # This is to ensure that we create a .tar of tag $VERSION
-# Make a pristine tarball from the upstream repo:
-git archive --format=tar --prefix="torbirdy_$VERSION.orig/" \ 
-  -o ../torbirdy_$VERSION.orig.tar -v $VERSION
-# Now import it
-cd ../torbirdy
-git checkout master
-git import-orig --filter=*.git --pristine-tar --upstream-version=$VERSION \
-  ../torbirdy_$VERSION.orig.tar
-# update the debian/changelog
-dch -v $VERSION-1 "New upstream release"
-# Commit the changes
-git add debian/changes
-git commit -m "stage release $VERSION"
-# Now build it and ignore anything not in git:
-git-buildpackage --git-ignore-new
-
-######################################
-# Git expert version follows:        #
-######################################
-git clone https://anonscm.debian.org/git/pkg-mozext/torbirdy.git
-cd torbirdy
-git checkout upstream
-git checkout pristine-tar
-git checkout master
-git remote add torbirdy.upstream https://github.com/ioerror/torbirdy.git
-git fetch torbirdy.upstream
-git checkout $VERSION
-git checkout -b $VERSION-merge-madness
-git merge -m 'directed acyclic graph trick' upstream -s ours
-git branch -m upstream old-upstream
-git branch -m $VERSION-merge-madness upstream
-git branch -d old-upstream
-git checkout upstream
-git checkout master
-# update the debian/changelog
-dch -v $VERSION-1 "New upstream release"
-# Commit the changes
-git add debian/changes
-git commit -m "stage release $VERSION"
-# Merge upstream into master
-git merge upstream
-# create the pristine-tar in ../deb-packages/torbirdy/torbirdy_$VERSION.orig.tar.gz
-# this also creates a source package in ../deb-packages/torbirdy/
-gitpkg master upstream
-# build the package
-cd ../deb-packages/torbirdy/
-dpkg-source -x torbirdy_$VERSION-1.dsc
-cd torbirdy-$VERSION
-DEBUILD_DPKG_BUILDPACKAGE_OPTS="-us -uc -I -i"
-DEBUILD_LINTIAN_OPTS="-i -I --show-overrides"
-debuild
-
-#### Now if you want - you can pretend you did the same steps as above ....
-git import-orig --filter=*.git --pristine-tar --upstream-version=$VERSION \
-  ../deb-packages/torbirdy/torbirdy_$VERSION.orig.tar.gz
-# build our deb and ignore anything not in git:
-git-buildpackage --git-ignore-new

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbirdy.git