[Python-modules-commits] [python-django] 01/03: Update README.source and debian/gbp.conf.

[Raphaël Hertzog]

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

hertzog pushed a commit to branch debian/experimental
in repository python-django.

commit c90a3e8e610133cf0e476d14c9af8cc9598c6be5
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Tue May 30 14:43:18 2017 +0200

    Update README.source and debian/gbp.conf.
---
 debian/README.source | 24 ++----------------------
 debian/changelog     |  6 ++++++
 debian/gbp.conf      |  1 +
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index fe66ea4..d09624c 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,25 +4,5 @@ Git packaging rules for python-django
 The package is following DEP-14 for the branches layout:
 http://dep.debian.net/deps/dep14/
 
-Configure usage of pristine-tar
--------------------------------
-Run the following command:
-git config dpm.pristineTarCommit true
-
-Coping with git-dpm limitations
--------------------------------
-
-Until #801666 is fixed, you have to manually update your .git/config with the
-following commands (and update them again when a branch starts following
-a new upstream release):
-
-git config branch.debian/experimental.dpmUpstreamBranch upstream/1.9.x
-git config branch.debian/master.dpmUpstreamBranch upstream/1.9.x
-git config branch.debian/jessie.dpmUpstreamBranch upstream/1.7.x
-git config branch.debian/wheezy.dpmUpstreamBranch upstream/1.4.x
-git config branch.debian/squeeze.dpmUpstreamBranch upstream/1.2.x
-git config branch.debian/experimental.dpmPatchedBranch debian/patched-experimental
-git config branch.debian/master.dpmPatchedBranch debian/patched-master
-git config branch.debian/jessie.dpmPatchedBranch debian/patched-jessie
-git config branch.debian/wheezy.dpmPatchedBranch debian/patched-wheezy
-git config branch.debian/squeeze.dpmPatchedBranch debian/patched-squeeze
+We are using git-buildpackage to manage the Git repository
+and the appropriate debian/gbp.conf is included.
diff --git a/debian/changelog b/debian/changelog
index 46e4409..e84b333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-django (1:1.11.1-4) UNRELEASED; urgency=medium
+
+  * Update README.source and debian/gbp.conf.
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Tue, 30 May 2017 14:42:53 +0200
+
 python-django (1:1.11.1-3) experimental; urgency=medium
 
   * Really add Build-Depends on libgdal-dev.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e209f19..815f580 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [DEFAULT]
 upstream-branch=upstream/1.11.x
 debian-branch=debian/experimental
+pristine-tar=True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git