diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/gbp.conf | 11 |
3 files changed, 12 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index e8e8122..5f0100d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wallet (1.2-2) UNRELEASED; urgency=medium + + * Change the branch layout to follow DEP-14. + + -- Russ Allbery <rra@debian.org> Sun, 17 Jan 2016 19:40:54 -0800 + wallet (1.2-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 0baddec..9296899 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, libauthen-sasl-perl, libtest-strict-perl, libtimedate-perl, libwebauth-perl, perl, sqlite3 Standards-Version: 3.9.6 Homepage: http://www.eyrie.org/~eagle/software/wallet/ -Vcs-Git: git://git.eyrie.org/kerberos/wallet.git -b debian +Vcs-Git: git://git.eyrie.org/kerberos/wallet.git -b debian/master Vcs-Browser: http://git.eyrie.org/?p=kerberos/wallet.git Package: keytab-backend diff --git a/debian/gbp.conf b/debian/gbp.conf index c99a756..9002977 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,8 +1,7 @@ -# The standard packaging repository for wallet shares the repository -# with upstream development and does Debian packaging on the debian -# branch. +# The standard packaging repository for wallet shares the repository with +# upstream development using the DEP-14 layout. [DEFAULT] -debian-branch = debian -pristine-tar = True - +debian-branch = debian/master +upstream-branch = upstream/latest +pristine-tar = True |