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

diff --git a/debian/changelog b/debian/changelog
index 9c7c80a57c9890b37803c0842d451f2bcb09fefe..f1dd5bd7203561db118b9ef9207ecb9fef09a420 100644 (file)
--- 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 95106891f35a53f40cb894f2be222a5775e192a6..959c07bcda4bad4801c44c794e4d8f11234c80de 100644 (file)
--- 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