[Pkg-cyrus-sasl2-commits] r434 - in /cyrus-sasl-2.1/trunk/debian: changelog repack.sh watch

[roberto at users.alioth.debian.org]

Author: roberto
Date: Fri May 15 17:13:16 2009
New Revision: 434

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=434
Log:
Updated watch file and repack script to use +dfsg instead of .dfsg1

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/repack.sh
    cyrus-sasl-2.1/trunk/debian/watch

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=434&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Fri May 15 17:13:16 2009
@@ -1,9 +1,13 @@
 cyrus-sasl2 (2.1.22.dfsg1-26) UNRELEASED; urgency=low
 
+  [ Fabian Fagerholm ]
   * NOT RELEASED YET
   * debian/control: Set section to debug to match override.
 
- -- Fabian Fagerholm <fabbe at debian.org>  Sun, 10 May 2009 09:55:01 +0300
+  [ Roberto C. Sanchez ]
+  * Updated watch file and repack script to use +dfsg instead of .dfsg1
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Fri, 15 May 2009 13:13:08 -0400
 
 cyrus-sasl2 (2.1.22.dfsg1-25) unstable; urgency=high
 

Modified: cyrus-sasl-2.1/trunk/debian/repack.sh
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/repack.sh?rev=434&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/repack.sh (original)
+++ cyrus-sasl-2.1/trunk/debian/repack.sh Fri May 15 17:13:16 2009
@@ -8,7 +8,7 @@
 
 FILE=$3
 PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
-VER=`dpkg-parsechangelog|grep ^Version:|sed 's/^Version: //; s/.dfsg1-[^-]\+$//'`
+VER="$2+dfsg"
 
 printf "\nRepackaging $FILE\n"
 
@@ -17,6 +17,7 @@
 
 tar xzf $FILE -C $DIR
 
+TARGET=`echo $FILE |sed 's/_\(.*\)\.orig/_\1+dfsg.orig/'`
 REPACK=`basename $FILE`
 
 UP_DIR=`ls -1 $DIR`
@@ -35,6 +36,7 @@
     tar -c $REPACK_DIR | gzip -9 > $REPACK
 )
 
-mv $DIR/$REPACK $FILE
+rm -v $FILE
+mv $DIR/$REPACK $TARGET
 
 echo "*** $FILE repackaged"

Modified: cyrus-sasl-2.1/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/watch?rev=434&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/watch (original)
+++ cyrus-sasl-2.1/trunk/debian/watch Fri May 15 17:13:16 2009
@@ -1,4 +1,4 @@
 version=3
 
-opts="dversionmangle=s/\.dfsg1//" http://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-(.*)\.tar\.gz debian debian/repack.sh
+opts="dversionmangle=s/\+dfsg//" http://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-(.*)\.tar\.gz debian debian/repack.sh