[Pkg-samba-maint] r3481 - in branches/tevent/experimental: . debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-05-14 16:20:00 +0000 (Fri, 14 May 2010)
New Revision: 3481

Added:
   branches/tevent/experimental/debian/watch
Removed:
   branches/tevent/experimental/debian/build-orig.sh
Modified:
   branches/tevent/experimental/
   branches/tevent/experimental/debian/changelog
   branches/tevent/experimental/debian/control
   branches/tevent/experimental/debian/libtevent-dev.install
   branches/tevent/experimental/debian/rules
Log:
merge unstable


Property changes on: branches/tevent/experimental
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/tevent:3038

Added: svk:merge
   + fc4039ab-9d04-0410-8cac-899223bdd6b0:/trunk/tevent:3038


Deleted: branches/tevent/experimental/debian/build-orig.sh
===================================================================
--- branches/tevent/experimental/debian/build-orig.sh	2010-05-14 14:39:50 UTC (rev 3480)
+++ branches/tevent/experimental/debian/build-orig.sh	2010-05-14 16:20:00 UTC (rev 3481)
@@ -1,28 +0,0 @@
-#!/bin/bash
-REFSPEC=$1
-GIT_URL=$2
-shift 2
-
-if [ -z "$GIT_URL" ]; then
-	GIT_URL=git://git.samba.org/samba.git
-fi
-
-if [ -z "$REFSPEC" ]; then
-	REFSPEC=origin/master
-fi
-
-TEVENTTMP=$TMPDIR/$RANDOM.tevent.git
-version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
-git clone --depth 1 -l $GIT_URL $TEVENTTMP
-if [ ! -z "$REFSPEC" ]; then
-	pushd $TEVENTTMP
-	git checkout $REFSPEC || exit 1
-	popd
-fi
-
-mv $TEVENTTMP/lib/tevent "tevent-$version"
-mv $TEVENTTMP/lib/replace "tevent-$version/libreplace"
-rm -rf $TEVENTTMP
-pushd "tevent-$version" && ./autogen.sh && popd
-tar cvz "tevent-$version" > "tevent_$version.orig.tar.gz"
-rm -rf "tevent-$version"

Modified: branches/tevent/experimental/debian/changelog
===================================================================
--- branches/tevent/experimental/debian/changelog	2010-05-14 14:39:50 UTC (rev 3480)
+++ branches/tevent/experimental/debian/changelog	2010-05-14 16:20:00 UTC (rev 3481)
@@ -1,3 +1,10 @@
+tevent (0.9.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump standards version to 3.8.3.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Fri, 11 Sep 2009 22:40:00 +0200
+
 tevent (0.9.6~20090604-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/tevent/experimental/debian/control
===================================================================
--- branches/tevent/experimental/debian/control	2010-05-14 14:39:50 UTC (rev 3480)
+++ branches/tevent/experimental/debian/control	2010-05-14 16:20:00 UTC (rev 3481)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: debhelper (>> 5.0.0), libtalloc-dev, libaio-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/tevent
 
 Package: libtevent0

Modified: branches/tevent/experimental/debian/libtevent-dev.install
===================================================================
--- branches/tevent/experimental/debian/libtevent-dev.install	2010-05-14 14:39:50 UTC (rev 3480)
+++ branches/tevent/experimental/debian/libtevent-dev.install	2010-05-14 16:20:00 UTC (rev 3481)
@@ -1,5 +1,4 @@
 usr/include/tevent.h
-usr/include/tevent_internal.h
 usr/lib/pkgconfig/tevent.pc
 usr/lib/libtevent.so
 usr/lib/libtevent.a

Modified: branches/tevent/experimental/debian/rules
===================================================================
--- branches/tevent/experimental/debian/rules	2010-05-14 14:39:50 UTC (rev 3480)
+++ branches/tevent/experimental/debian/rules	2010-05-14 16:20:00 UTC (rev 3481)
@@ -30,9 +30,6 @@
 	rm -rf build
 	dh_clean
 
-get-orig-source:
-	./debian/build-orig.sh
-
 install: build
 	dh_testdir
 	dh_testroot

Copied: branches/tevent/experimental/debian/watch (from rev 3038, trunk/tevent/debian/watch)
===================================================================
--- branches/tevent/experimental/debian/watch	                        (rev 0)
+++ branches/tevent/experimental/debian/watch	2010-05-14 16:20:00 UTC (rev 3481)
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.samba.org/pub/tevent/tevent-(.+).tar.gz