diff -Nru karmic/rancid-2.3.2/debian/changelog ppa/rancid-2.3.2/debian/changelog
--- karmic/rancid-2.3.2/debian/changelog	2009-10-02 10:12:34.000000000 -0400
+++ ppa/rancid-2.3.2/debian/changelog	2009-10-02 10:04:58.000000000 -0400
@@ -1,3 +1,9 @@
+rancid (2.3.2-1~ppa1) hardy; urgency=low
+
+  * Added bzr as a supported RCS
+
+ -- Herb McNew <herb.mcnew@canonical.com>  Tue, 15 Sep 2009 19:15:59 -0400
+
 rancid (2.3.2-1) unstable; urgency=low
 
   * New upstream release 2.3.2.
diff -Nru karmic/rancid-2.3.2/debian/control ppa/rancid-2.3.2/debian/control
--- karmic/rancid-2.3.2/debian/control	2009-10-02 10:12:34.000000000 -0400
+++ ppa/rancid-2.3.2/debian/control	2009-10-02 10:04:58.000000000 -0400
@@ -10,9 +10,9 @@
 
 Package: rancid
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, expect, perl, cvs | subversion,
- passwd, openssh-client | ssh, iputils-ping | ping, 
- debconf (>= 0.2.26) | debconf-2.0, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, expect, perl,
+ bzr | cvs | subversion, passwd, openssh-client | ssh,
+ iputils-ping | ping, debconf (>= 0.2.26) | debconf-2.0, adduser
 Suggests: diffstat
 Provides: rancid-core, rancid-util
 Replaces: rancid-core (<< 2.3.2-1), rancid-util (<< 2.3.2-1)
diff -Nru karmic/rancid-2.3.2/debian/patches/00list ppa/rancid-2.3.2/debian/patches/00list
--- karmic/rancid-2.3.2/debian/patches/00list	2009-10-02 10:12:34.000000000 -0400
+++ ppa/rancid-2.3.2/debian/patches/00list	2009-10-02 10:04:58.000000000 -0400
@@ -7,3 +7,4 @@
 07_nrancid_bs_paging.dpatch
 08_hlogin_paging.dpatch
 09_svn.dpatch
+10_add_bzr_support.dpatch
diff -Nru karmic/rancid-2.3.2/debian/patches/10_add_bzr_support.dpatch ppa/rancid-2.3.2/debian/patches/10_add_bzr_support.dpatch
--- karmic/rancid-2.3.2/debian/patches/10_add_bzr_support.dpatch	1969-12-31 19:00:00.000000000 -0500
+++ ppa/rancid-2.3.2/debian/patches/10_add_bzr_support.dpatch	2009-10-02 10:04:58.000000000 -0400
@@ -0,0 +1,440 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_add_bzr_support.dpatch by  <herb@localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds support for bzr as an RCS
+
+@DPATCH@
+
+=== modified file 'rancid-2.3.2/Makefile.in'
+--- rancid-2.3.2/Makefile.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/Makefile.in	2009-09-15 22:35:22 +0000
+@@ -88,6 +88,7 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BZR = @BZR@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+
+=== modified file 'rancid-2.3.2/bin/Makefile.in'
+--- rancid-2.3.2/bin/Makefile.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/bin/Makefile.in	2009-09-15 22:35:22 +0000
+@@ -102,6 +102,7 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BZR = @BZR@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ 
+
+=== modified file 'rancid-2.3.2/bin/control_rancid.in'
+--- rancid-2.3.2/bin/control_rancid.in	2009-09-15 17:24:55 +0000
++++ rancid-2.3.2/bin/control_rancid.in	2009-09-15 22:53:37 +0000
+@@ -113,15 +113,20 @@
+ 
+ # RCS system
+ RCSSYS=${RCSSYS:=cvs};
+-if [ $RCSSYS != "cvs" -a $RCSSYS != "svn" ] ; then
++if [ $RCSSYS != "cvs" -a $RCSSYS != "svn" -a $RCSSYS != "bzr" ] ; then
+     echo "$RCSSYS is not a valid value for RCSSYS."
+     exit 1
+ fi
+ 
+ # the receipient(s) of diffs & mail options
+-mailrcpt=${mailrcpt:-"@MAILPLUS@${GROUP}${MAILDOMAIN}"}; export mailrcpt
+-adminmailrcpt=${adminmailrcpt:-"@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"};
+-export adminmailrcpt
++if [ $OVERRIDEADDRESS ]; then
++    mailrcpt=${OVERRIDEADDRESS}; export mailrcpt
++    adminmailrcpt=${OVERRIDEADDRESS}; export adminmailrcpt
++else
++    mailrcpt=${mailrcpt:-"rancid-${GROUP}${MAILDOMAIN}"}; export mailrcpt
++    adminmailrcpt=${adminmailrcpt:-"rancid-admin-${GROUP}${MAILDOMAIN}"};
++    export adminmailrcpt
++fi
+ set | grep MAILHEADERS= > /dev/null 2>&1
+ if [ $? -ne 0 ] ; then
+     MAILHEADERS="Precedence: bulk\n"; export MAILHEADERS
+@@ -164,6 +169,10 @@
+     if [ $RCSSYS = svn ] ; then
+ 	svn propset svn:ignore -F .cvsignore .
+     fi
++    if [ $RCSSYS = bzr ] ; then
++	bzr ignore $(cat .cvsignore)
++	bzr commit -m 'Updated ignores.'
++    fi
+ fi
+ 
+ # svn update to avoid 'Out of date' error
+@@ -294,11 +303,20 @@
+ 	router=$1
+ 
+ 	touch $router
+-	if [ $RCSSYS = cvs ] ; then
+-	    cvs add -ko $router
+-	else
+-	    svn add $router
+-	fi
++	case $RCSSYS in
++		cvs)
++			cvs add -ko $router
++			;;
++		svn)
++			svn add $router
++			;;
++		bzr)
++			bzr add $router
++			;;
++		*)
++			echo $RCSSYS " is not supported."
++			;;
++	esac
+ 	$RCSSYS commit -m 'new router' $router
+ 	echo "Added $router"
+     done
+@@ -324,28 +342,60 @@
+ cd $DIR/configs
+ # check for 'up' routers missing in RCS.  no idea how this happens to some folks
+ for router in `cut -d: -f1 ../routers.up` ; do
+-    if [ $RCSSYS = cvs ] ; then
+-	cvs status $router | grep -i 'status: unknown' > /dev/null 2>&1
+-    else
+-	svn status $router | grep '^?' > /dev/null 2>&1
+-    fi
++    case $RCSSYS in
++	cvs)
++		cvs status $router | grep -i 'status: unknown' > /dev/null 2>&1
++		;;
++	svn)
++		svn status $router | grep '^?' > /dev/null 2>&1
++		;;
++	bzr)
++		bzr status -S $router | grep '^?' > /dev/null 2>&1
++		;;
++	*)
++		echo $RCSSYS " is not supported."
++		;;
++    esac
+     if [ $? -eq 0 ] ; then
+ 	touch $router
+-	if [ $RCSSYS = cvs ] ; then
+-	    cvs add -ko $router
+-	else
+-	    svn add $router
+-	fi
++	case $RCSSYS in
++		cvs)
++			cvs add -ko $router
++			;;
++		svn)
++			svn add $router
++			;;
++		bzr)
++			bzr add $router
++			;;
++		*)
++			echo $RCSSYS " is not supported."
++			;;
++	esac
+ 	echo "$RCSSYS added missing router $router"
+     fi
+ done
+ echo
+ # delete configs from RCS for routers not listed in routers.up.
+-for router in `find . \( -name \*.new -prune -o -name CVS -prune -o -name .svn -prune \) -o -type f -print | sed -e 's/^.\///'` ; do
++for router in `find . \( -name \*.new -prune -o -name CVS -prune -o -name .svn -prune -o -name .bzr -prune \) -o -type f -print | sed -e 's/^.\///'` ; do
+     grep -i "^$router:" ../router.db > /dev/null 2>&1
+     if [ $? -eq 1 ] ; then
+-	rm -f $router
+-	$RCSSYS delete $router
++	case $RCSSYS in
++		cvs)
++			rm -f $router
++			$RCSSYS delete $router
++			;;
++		svn)
++			rm -f $router
++			$RCSSYS delete $router
++			;;
++		bzr)
++			bzr rm $router
++			;;
++		*)
++			echo $RCSSYS " is not supported."
++			;;
++	esac
+ 	$RCSSYS commit -m 'deleted router' $router
+ 	echo "Deleted $router"
+     fi
+@@ -452,12 +502,21 @@
+ # Diff the directory and then checkin.
+ trap 'rm -fr $MYTMPDIR $DIR/routers.single;' 1 2 15
+ cd $DIR
+-if [ $RCSSYS = "cvs" ] ; then
+-    cvs -f @DIFF_CMD@ -ko | sed -e '/^RCS file: /d' -e '/^--- /d' \
+-	-e '/^+++ /d' -e 's/^\([-+ ]\)/\1 /' >$TMP.diff
+-else
+-    svn diff | sed -e '/^+++ /d' -e 's/^\([-+ ]\)/\1 /' >$TMP.diff
+-fi
++case $RCSSYS in
++	cvs)
++		cvs -f diff -U 4 -ko | sed -e '/^RCS file: /d' -e '/^--- /d' \
++		    -e '/^+++ /d' -e 's/^\([-+ ]\)/\1 /' >$TMP.diff
++		;;
++	svn)
++		svn diff | sed -e '/^+++ /d' -e 's/^\([-+ ]\)/\1 /' >$TMP.diff
++		;;
++	bzr)
++		bzr diff | sed -e '/^+++ /d' -e '/^--- /d' -e 's/^\([-+ ]\)/\1 /' >$TMP.diff
++		;;
++	*)
++		echo $RCSSYS " is not supported."
++		;;
++esac
+ 
+ if [ $alt_mailrcpt -eq 1 ] ; then
+     subject="router config diffs - courtesy of $mailrcpt"
+@@ -465,10 +524,22 @@
+     subject="router config diffs"
+ fi
+ if [ "X$device" != "X" ] ; then
+-    $RCSSYS commit -m "updates - courtesy of $mailrcpt"
++    if [ $RCSSYS = "bzr" ]; then
++        if [ -s $TMP.diff ]; then
++            $RCSSYS commit -m "updates - courtesy of $mailrcpt"
++        fi
++    else
++        $RCSSYS commit -m "updates - courtesy of $mailrcpt"
++    fi
+     subject="$GROUP/$device $subject"
+ else
+-    $RCSSYS commit -m updates
++    if [ $RCSSYS = "bzr" ]; then
++        if [ -s $TMP.diff ]; then
++            $RCSSYS commit -m updates
++        fi
++    else
++        $RCSSYS commit -m updates
++    fi
+     subject="$GROUP $subject"
+ fi
+ 
+
+=== modified file 'rancid-2.3.2/bin/rancid-cvs.in'
+--- rancid-2.3.2/bin/rancid-cvs.in	2009-09-15 17:24:55 +0000
++++ rancid-2.3.2/bin/rancid-cvs.in	2009-09-15 22:51:43 +0000
+@@ -87,18 +87,27 @@
+ 
+ # RCS system
+ RCSSYS=${RCSSYS:=cvs};
+-if [ $RCSSYS != "cvs" -a $RCSSYS != "svn" ] ; then
++if [ $RCSSYS != "cvs" -a $RCSSYS != "svn" -a $RCSSYS != "bzr" ] ; then
+     echo "$RCSSYS is not a valid value for RCSSYS."
+     exit 1
+ fi
+ 
+ # Top level CVS stuff
+ if [ ! -d $CVSROOT ]; then
+-    if [ $RCSSYS = cvs ]; then
+-	cvs -d $CVSROOT init
+-    else
+-	svnadmin create $CVSROOT @SVN_FSTYPE@
+-    fi
++    case $RCSSYS in
++	bzr)
++		echo "bzr doesn't need a separate root. Continuing on..."
++		;;
++	svn)
++		svnadmin create $CVSROOT @SVN_FSTYPE@
++		;;
++	cvs)
++		cvs -d $CVSROOT init
++		;;
++	*)
++		echo $RCSSYS " is not supported."
++		;;
++    esac
+ fi
+ 
+ # Log dir
+@@ -123,17 +132,26 @@
+     if [ ! -d $DIR ]; then
+ 	mkdir -p $DIR
+ 	cd $DIR
+-	if [ $RCSSYS = cvs ]; then
+-	    cvs import -m "$GROUP" $GROUP new rancid
+-	    cd $BASEDIR
+-	    cvs checkout $GROUP
+-	else
+-	    svn import -m "$GROUP" . file:///$CVSROOT/$GROUP
+-	    cd $BASEDIR
+-	    svn checkout file:///$CVSROOT/$GROUP $GROUP
+-	    cd $DIR
+-	    svn update
+-	fi
++	case $RCSSYS in
++		cvs)
++			cvs import -m "$GROUP" $GROUP new rancid
++			cd $BASEDIR
++			cvs checkout $GROUP
++			;;
++		svn)
++			svn import -m "$GROUP" . file:///$CVSROOT/$GROUP
++			cd $BASEDIR
++			svn checkout file:///$CVSROOT/$GROUP $GROUP
++			cd $DIR
++			svn update
++			;;
++		bzr)
++			bzr init .
++			;;
++		*)
++			echo $RCSSYS " is not supported."
++			;;
++	esac
+     fi
+     cd $DIR
+     if [ ! -d configs ]; then
+
+=== modified file 'rancid-2.3.2/bin/rancid-run.in'
+--- rancid-2.3.2/bin/rancid-run.in	2009-09-15 17:24:55 +0000
++++ rancid-2.3.2/bin/rancid-run.in	2009-09-15 22:50:40 +0000
+@@ -146,8 +146,13 @@
+ 	    @PERLV@ -e "\$t = (stat(\"$LOCKFILE\"))[9]; print \"OLD\\n\" if (time() - \$t >= $LOCKTIME*60*60);" > $TMPDIR/.$GROUP.old
+ 	    if [ -s $TMPDIR/.$GROUP.old ]
+ 	    then
+-		(
+-		  echo "To: @ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"
++                if [ $OVERRIDEADDRESS ]; then
++                        recipient=${OVERRIDEADDRESS}
++                else
++                        recipient=@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}
++                fi
++                (
++		  echo "To: ${recipient}"
+ 		  echo "Subject: rancid hung - $GROUP"
+ 		  echo "Precedence: bulk"
+ 		  echo ""
+
+=== modified file 'rancid-2.3.2/configure.in'
+--- rancid-2.3.2/configure.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/configure.in	2009-09-15 22:35:22 +0000
+@@ -157,6 +157,24 @@
+ ], [AC_MSG_RESULT(no)
+     RCSSYS="cvs"
+ ])
++AC_ARG_WITH(bzr,
++	AS_HELP_STRING([--with-bzr=yes],
++			[use bazaar instead of cvs]),
++[ case "$withval" in
++  yes)
++	AC_MSG_RESULT(yes)
++	RCSSYS="bzr"
++	;;
++  no)
++	AC_MSG_RESULT(no)
++	RCSSYS="cvs"
++	;;
++  *)
++	AC_MSG_ERROR([unknown bzr flag $withval])
++  esac
++], [AC_MSG_RESULT(no)
++    RCSSYS="cvs"
++])
+ AC_SUBST(RCSSYS)
+ AC_SUBST(SVN_FSTYPE)
+ rd_cv_RCSSYS=$RCSSYS
+@@ -310,13 +328,20 @@
+ ENV_PATH="`dirname $PERLV_PATH`:`dirname $EXPECT_PATH`:`dirname $SENDMAIL`"
+ ENV_PATH="$ENV_PATH:`dirname $DIRNAME`:`dirname $DIFF`"
+ 
+-if test $RCSSYS = "cvs" ; then
+-    AC_PATH_PROG(CVS,cvs,no)
+-    ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_CVS`"
+-else
+-    AC_PATH_PROG(SVN,svn,no)
+-    ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_SVN`"
+-fi
++case "$RCSSYS" in
++  svn)
++        AC_PATH_PROG(SVN,svn,no)
++        ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_SVN`"
++        ;;
++  bzr)
++        AC_PATH_PROG(BZR,bzr,no)
++        ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_BZR`"
++        ;;
++  *)
++        AC_PATH_PROG(CVS,cvs,no)
++        ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_CVS`"
++        ;;
++esac
+ AC_PATH_PROG(COMM,comm,no)
+ ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_COMM`"
+ AC_PATH_PROG(FIND,find,no)
+
+=== modified file 'rancid-2.3.2/etc/Makefile.in'
+--- rancid-2.3.2/etc/Makefile.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/etc/Makefile.in	2009-09-15 22:35:22 +0000
+@@ -65,6 +65,7 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BZR = @BZR@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+
+=== modified file 'rancid-2.3.2/etc/rancid.conf.sample.in'
+--- rancid-2.3.2/etc/rancid.conf.sample.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/etc/rancid.conf.sample.in	2009-09-15 22:35:22 +0000
+@@ -82,3 +82,9 @@
+ # it to "" or adding X- style headers.  Individual headers must be separated
+ # by a \n.
+ #MAILHEADERS="Precedence: bulk"; export MAILHEADERS
++#
++# By default, rancid will mail messages to rancid-admin-${GROUP} and
++# rancid-${GROUP}. OVERRIDEADDRESS allows you to override that and have
++# everything sent to the same address.
++#OVERRIDEADDRESS="address@example.com"; export OVERRIDEADDRESS
++
+
+=== modified file 'rancid-2.3.2/include/Makefile.in'
+--- rancid-2.3.2/include/Makefile.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/include/Makefile.in	2009-09-15 22:35:22 +0000
+@@ -61,6 +61,7 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BZR = @BZR@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+
+=== modified file 'rancid-2.3.2/man/Makefile.in'
+--- rancid-2.3.2/man/Makefile.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/man/Makefile.in	2009-09-15 22:35:22 +0000
+@@ -62,6 +62,7 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BZR = @BZR@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+
+=== modified file 'rancid-2.3.2/share/Makefile.in'
+--- rancid-2.3.2/share/Makefile.in	2009-09-15 17:21:05 +0000
++++ rancid-2.3.2/share/Makefile.in	2009-09-15 22:35:22 +0000
+@@ -72,6 +72,7 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BZR = @BZR@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+