From b5528800d84200cb9db35503fb89d7eebb133675 Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Fri, 21 Mar 2008 17:53:26 -0400
Subject: [PATCH] Added Debian source package support.

- changed maintainer script to use CVS export instead of checkout,
       to avoid the CVS directories
- added support for building Debian source packages with proper
       diff.gz and dsc files
---
 ChangeLog                      |  5 +++++
 maintainer/make-release-tar.sh | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89d37d8a..d51cb777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Release: version 0.12 - 2008/03/??
 ------------------------------------------------------------------------------
+2008/03/21
+	- changed maintainer script to use CVS export instead of checkout,
+		to avoid the CVS directories
+	- added support for building Debian source packages with proper
+		diff.gz and dsc files
 2008/03/13
 	- renamed all vformat_ and VFormat symbols in opensync plugin's
 		copy of vformat code, so they don't conflict with the
diff --git a/maintainer/make-release-tar.sh b/maintainer/make-release-tar.sh
index 24e9630a..6dfd7d8b 100755
--- a/maintainer/make-release-tar.sh
+++ b/maintainer/make-release-tar.sh
@@ -42,10 +42,10 @@ cd build || exit 1
 set -e
 
 if [ "$3" != "HEAD" ] ; then
-	cvs -z3 -d "$CVSROOT" co -d $DIRNAME -r $TAGNAME "$CVSREP"
+	cvs -z3 -d "$CVSROOT" export -d $DIRNAME -r $TAGNAME "$CVSREP"
 	echo "Fetched tag: $TAGNAME"
 else
-	cvs -z3 -d "$CVSROOT" co -d $DIRNAME "$CVSREP"
+	cvs -z3 -d "$CVSROOT" export -d $DIRNAME -r HEAD "$CVSREP"
 	echo "Fetched HEAD"
 fi
 (cd $DIRNAME/doc/www && ./static.sh)
@@ -53,5 +53,17 @@ fi
 #(cd $DIRNAME/gui && ./buildgen.sh)
 #(cd $DIRNAME/opensync-plugin && ./buildgen.sh)
 rm -rf "$DIRNAME/autom4te.cache" "$DIRNAME/gui/autom4te.cache" "$DIRNAME/opensync-plugin/autom4te.cache"
-tar --exclude=CVS -cvf - $DIRNAME | bzip2 -9c > barry-$1.$2.tar.bz2
+tar -cvf - $DIRNAME | bzip2 -9c > barry-$1.$2.tar.bz2
+
+# Create Debian source package, by creating a patched and "orig" set of trees.
+#
+# The following dance is to keep the .orig.tar.gz containing barry-0.12/
+# as the directory, and not something like barry-0.12.orig/ which gets
+# corrected by Debian tools.  If there is a better way, please send a patch.
+cp -a $DIRNAME $DIRNAME.patched
+rm -rf $DIRNAME/debian
+tar -cf - $DIRNAME | gzip -9c > barry_$1.$2.orig.tar.gz
+rm -rf $DIRNAME
+mv $DIRNAME.patched $DIRNAME
+dpkg-source -b $DIRNAME barry_$1.$2.orig.tar.gz
 
-- 
2.11.4.GIT