From 6f0c8f9492235c0b6fa2910c394657e0d2b5e1e4 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 6 Nov 2013 08:20:50 +0100
Subject: Update to git-pbuilder 1.30

that resyncs with what we shipped in gbp.
---
 bin/git-pbuilder | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'bin/git-pbuilder')

diff --git a/bin/git-pbuilder b/bin/git-pbuilder
index a6ab9e6..66a6a25 100644
--- a/bin/git-pbuilder
+++ b/bin/git-pbuilder
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: git-pbuilder,v 1.29 2012/12/26 00:10:52 eagle Exp $
+# $Id: git-pbuilder,v 1.30 2013/11/05 18:17:09 eagle Exp $
 #
 # git-pbuilder -- Wrapper around pbuilder for git-buildpackage
 #
@@ -8,9 +8,9 @@
 # get the contents of that environment variable to undergo the correct amount
 # of shell expansion.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Based on the example in the git-buildpackage documentation
-# Copyright 2008, 2009, 2010, 2011, 2012
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # Permission to use, copy, modify, and distribute this software and its
@@ -71,13 +71,18 @@ esac
 if expr "$DIST" : '.*-backports$' >/dev/null; then
     DIST=${DIST%-backports}
     EXT="-backports"
+
     # The URL to the Debian backports repository to add to the chroot
     # configuration when created via this script for a distribution ending in
-    # -backports.
+    # -backports.  Backports was incorporated into the main mirrors as of
+    # wheezy.
     case $DIST in
         squeeze|oldstable)
-            BACKPORTS='http://backports.debian.org/debian-backports' ;;
-        *)  BACKPORTS='http://ftp.debian.org/debian' ;;
+            BACKPORTS='http://backports.debian.org/debian-backports'
+            ;;
+        *)
+            BACKPORTS='http://ftp.debian.org/debian'
+            ;;
     esac
 else
     EXT=
@@ -367,11 +372,15 @@ C<create>, or C<login>.  In this case, it calls B<cowbuilder> (or the
 configured builder as described above) using B<sudo> and passes the
 corresponding command to the builder, using the same logic as above to
 determine the base directory and distribution.  If the distribution (set
-in DIST) ends in C<-backports>, the following will be added as an
+in DIST) ends in C<-backports>, one of the following will be added as an
 B<--othermirror> parameter to the builder:
 
+    deb http://ftp.debian.org/debian $DIST main
     deb http://backports.debian.org/debian-backports $DIST main
 
+The first will be used for most distributions, and the second for
+C<squeeze-backports> or C<oldstable-backports>.
+
 Any additional arguments to B<git-pbuilder> are passed along to the
 builder.  Due to how B<sudo> works, invoking the builder with an action
 will not read the user's F<.pbuilderrc> by default, so in this case
@@ -493,7 +502,7 @@ L<http://www.eyrie.org/~eagle/software/scripts/>.
 
 =head1 AUTHOR
 
-Russ Allbery <rra@stanford.edu>
+Russ Allbery <eagle@eyrie.org>
 
 =cut
 
-- 
cgit v1.2.3