[Pkg-privacy-commits] [tails-installer] 04/09: Tabs to spaces.
Ulrike Uhlig
ulrike at moszumanska.debian.org
Sun Feb 4 09:38:38 UTC 2018
This is an automated email from the git hooks/post-receive script.
ulrike pushed a commit to annotated tag debian/5.0.4+dfsg-1
in repository tails-installer.
commit 11ad3ec064e9e90c66e0d56a11698f4f2c4517d3
Author: Ulrike Uhlig <u at 451f.org>
Date: Sat Feb 3 16:25:29 2018 +0100
Tabs to spaces.
---
debian/README.source | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index adce0aa..3abcdba 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -100,21 +100,21 @@ Update the Debian package for Tails
Checkout the packaging branch:
- export PKG_NAME=tails-installer
- export PACKAGING_BRANCH=tails/jessie
- git checkout "$PACKAGING_BRANCH"
+ export PKG_NAME=tails-installer
+ export PACKAGING_BRANCH=tails/jessie
+ git checkout "$PACKAGING_BRANCH"
Verify that `debian/gbp.conf` references the correct upstream and Debian (packaging) branches,
and that `pristine-tar` usage is enabled, e.g.:
- [DEFAULT]
- upstream-branch = upstream/4.x+dfsg
- debian-branch = tails/jessie
- pristine-tar = True
+ [DEFAULT]
+ upstream-branch = upstream/4.x+dfsg
+ debian-branch = tails/jessie
+ pristine-tar = True
Extract the upstream and packaging branch from gbp.conf:
- export UPSTREAM_BRANCH=`gbp config buildpackage.upstream-branch | sed -r -e 's,.*=,,'`
+ export UPSTREAM_BRANCH=`gbp config buildpackage.upstream-branch | sed -r -e 's,.*=,,'`
Create a DFSG-compatible tarball from the previously created Git
archive and reimport it into the source tree. This merges, into the
@@ -122,14 +122,14 @@ archive and reimport it into the source tree. This merges, into the
imported the current DFSG-free upstream tarball into the
`upstream-branch`, but also the corresponding upstream Git history:
- mk-origtargz \
- -C ../tarballs \
- --version "$NEW_UPSTREAM_VERSION+dfsg" \
- --copy \
- ../tarballs/${PKG_NAME}_${NEW_UPSTREAM_VERSION}.tar.gz && \
- gbp import-orig \
- --upstream-vcs-tag="${PKG_NAME}_$NEW_UPSTREAM_VERSION" \
- ../tarballs/${PKG_NAME}_${NEW_UPSTREAM_VERSION}+dfsg.orig.tar.gz
+ mk-origtargz \
+ -C ../tarballs \
+ --version "$NEW_UPSTREAM_VERSION+dfsg" \
+ --copy \
+ ../tarballs/${PKG_NAME}_${NEW_UPSTREAM_VERSION}.tar.gz && \
+ gbp import-orig \
+ --upstream-vcs-tag="${PKG_NAME}_$NEW_UPSTREAM_VERSION" \
+ ../tarballs/${PKG_NAME}_${NEW_UPSTREAM_VERSION}+dfsg.orig.tar.gz
Update `debian/changelog`:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list