diff options
| author | Russ Allbery <eagle@eyrie.org> | 2016-05-07 14:39:29 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2016-05-07 14:39:29 -0700 |
| commit | 886b2825394c30effeecb4eeea36dcec4edb5154 (patch) | |
| tree | 63f7e7d7ef0f75260bd70c5a553857925fdb9fb9 /debian/gbp.conf | |
| parent | 258b97cb29abf6b9a7b4b0c37089a56f235db1f0 (diff) | |
Switch to the DEP-14 branch layout
* Switch to the DEP-14 branch layout and update debian/gbp.conf and
Vcs-Git accordingly.
Diffstat (limited to 'debian/gbp.conf')
| -rw-r--r-- | debian/gbp.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index b60e797..6a98191 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,8 @@ # The Git repository referenced by the Vcs-Git field of debian/control # combines upstream development (in master) with the Debian packaging (in the -# debian branch). Tell git-buildpackage about this layout. +# debian/* branches). Tell git-buildpackage about this layout. [DEFAULT] -debian-branch = debian +debian-branch = debian/master +upstream-branch = upstream/latest + |