From: Bdale Garbee <bdale@gag.com>
Date: Tue, 25 Jan 2011 23:08:49 +0000 (+1000)
Subject: update changelog and gbp.conf to support upload aimed at squeeze
X-Git-Tag: debian/1.7.4p4-2.squeeze.1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=15a9fecce90f6fcda43030d786bff261530d84e3;p=debian%2Fsudo

update changelog and gbp.conf to support upload aimed at squeeze
---

diff --git a/debian/changelog b/debian/changelog
index 9c7c80a..f1dd5bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sudo (1.7.4p4-2.squeeze.1) testing; urgency=low
+
+  * patch from upstream to fix special case in password checking code
+    when only the gid is changing, closes #609641
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 26 Jan 2011 09:08:12 +1000
+
 sudo (1.7.4p4-2) unstable; urgency=low
 
   * add a NEWS item about change in $HOME handling that impacts programs
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 9510689..959c07b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -8,7 +8,7 @@
 # the default branch for upstream sources:
 upstream-branch = upstream
 # the default branch for the debian patch:
-debian-branch = master
+debian-branch = squeeze
 # the default tag formats used:
 #upstream-tag = upstream/%(version)s
 #debian-tag = debian/%(version)s