summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-08-10 14:51:23 -0300
committerGuido Günther <agx@sigxcpu.org>2017-08-12 12:50:47 -0300
commit79a3af8c3cf0631aa9581a3be73942acb584a9af (patch)
treed93d4fcb915ead293d0b6b7c82b761d5b8833f37
Initial commmitHEADmaster
-rw-r--r--gbp.org164
-rwxr-xr-xmirror.sh6
2 files changed, 170 insertions, 0 deletions
diff --git a/gbp.org b/gbp.org
new file mode 100644
index 0000000..76b3794
--- /dev/null
+++ b/gbp.org
@@ -0,0 +1,164 @@
+#+STARTUP: indent
+# Debconf17, 2017-08-10 Montreal, Canada
+# Short demo of some newer gbp features and commands
+
+* What's new in git-buildpackage
+
+** gbp clone: cloning repositories
+#+BEGIN_SRC shell :results output
+set -e
+rm -rf ~/tmp/demo/libvirt-glib*
+mkdir -p ~/tmp/demo && cd ~/tmp/demo
+
+gbp clone vcsgit:libvirt-glib
+#+END_SRC
+
+- sets up upstream, pristine-tar branches as well
+- alias: vcs-git:
+- also: github:
+
+** gbp push: pushing to remotes
+
+- Repo we push to
+
+#+BEGIN_SRC shell :results output
+set -e
+rm -rf ~/tmp/demo/foo
+git init --bare ~/tmp/demo/foo
+#+END_SRC
+
+- Push changes to remote
+
+#+BEGIN_SRC shell :results output
+set -e
+cd ~/tmp/demo/libvirt-glib
+git remote add foo ../foo
+
+gbp push foo
+#+END_SRC
+
+- pushes current tags, debian-branch, upstream-branch, pristine-tar
+
+** gbp export-orig: recreating tarballs
+
+- uses pristine-tar if wanted
+- uses pristine-tar verify when available
+
+#+BEGIN_SRC shell :results output
+rm -f ~/tmp/demo/*.orig*
+cd ~/tmp/demo/libvirt-glib
+
+gbp export-orig
+#+END_SRC
+
+- stable SHA1 without pristine-tar
+
+#+BEGIN_SRC shell :results output
+set -e
+rm -f ~/tmp/demo/*.orig*
+
+cd ~/tmp/demo/libvirt-glib
+gbp export-orig --no-pristine-tar
+sha1sum ~/tmp/demo/*.orig*
+
+rm -f ~/tmp/demo/*.orig*
+gbp export-orig --no-pristine-tar
+sha1sum ~/tmp/demo/*.orig*
+#+END_SRC
+
+** gbp pristine-tar: adding pristine-tar commits later
+
+#+BEGIN_SRC shell :results output
+set -e
+cd ~/tmp/demo
+rm -rf hello-debhelper
+gbp import-dsc --no-pristine-tar data/hello-debhelper_2.8-1.dsc
+cd hello-debhelper
+git branch -l
+#+END_SRC
+
+#+BEGIN_SRC shell :results output
+set -e
+cd ~/tmp/demo/hello-debhelper
+
+gbp pristine-tar commit --component=foo ../data/hello-debhelper_2.8.orig.tar.gz
+pristine-tar list
+git branch -l
+#+END_SRC
+
+** gbp import-orig: importing tarballs
+*** No more merges in 3.0 (quilt)
+
+#+BEGIN_SRC shell
+gbp import-orig --uscan # --merge-mode=replace
+#+END_SRC
+
+*** Rollbacks
+#+BEGIN_SRC shell :results verbatim
+set -e
+cd ~/tmp/demo
+rm -rf hello-debhelper
+gbp import-dsc --no-pristine-tar data/hello-debhelper_2.8-1.dsc
+cd hello-debhelper
+#+END_SRC
+
+Import another version, make it fail to create tag
+
+#+BEGIN_SRC shell :results verbatim
+set -e
+cd ~/tmp/demo/hello-debhelper
+gbp import-orig ../data/hello-debhelper_2.9.orig.tar.gz
+#+END_SRC
+
+** import-dsc: Fetching a package from the archive
+
+No more --download
+
+#+BEGIN_SRC shell :results verbatim
+cd ~/tmp/demo
+gbp import-dsc https://people.debian.org/~agx/debian-lts/heimdal_1.6~git20120403+dfsg1-2+deb7u1.dsc
+#+END_SRC
+
+#+BEGIN_SRC shell :results verbatim
+cd ~/tmp/demo
+rm -rf sl/
+gbp import-dsc apt:sl/wheezy
+#+END_SRC
+
+** gbp buildpackage: sloppy mode
+
+#+BEGIN_SRC shell :results output
+set -e
+cd ~/tmp/demo
+rm -rf hello-debhelper *.orig*
+gbp import-dsc --no-pristine-tar data/hello-debhelper_2.8-1.dsc
+cd hello-debhelper
+
+git rm configure
+git commit -m"drop configure"
+#+END_SRC
+
+Use debian branch without debian/ dir as upstream tarball:
+
+#+BEGIN_SRC shell :results output
+cd ~/tmp/demo/hello-debhelper
+gbp buildpackage --git-upstream-tree=SLOPPY \
+ --git-no-pristine-tar \
+ --git-no-pbuilder \
+ --git-builder=/bin/true \
+ --git-no-hooks
+tar -z --list -f hello-debhelper_2.8.orig.tar.gz | grep -qs 'configure$' || echo "configure not found in tarball"
+#+END_SRC
+
+** gbp config: querying config
+
+#+BEGIN_SRC shell
+gbp config buildpackage.debian-branch
+#+END_SRC
+
+** docs
+http://gbp.sigxcpu.org/manual
+
+** gbp
+*** https://pypi.org/project/gbp/
+*** Python3 in experimental
diff --git a/mirror.sh b/mirror.sh
new file mode 100755
index 0000000..80c6df3
--- /dev/null
+++ b/mirror.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Mirror internal display on debconf17 beamer
+
+xrandr --output eDP-1 --scale-from 1280x720 --output HDMI-1 --same-as eDP-1
+