[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-0.9.61-2-174-g6439439

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 9c326d5bc8965cc8d79aa8b3c2983405a2346527
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat May 10 09:16:39 2008 +0200

    Changed debian/maint/import to put announce.tmp in current directory, not in the debian directory.

diff --git a/debian/maint/import b/debian/maint/import
index fa7dd94..2ae278e 100755
--- a/debian/maint/import
+++ b/debian/maint/import
@@ -39,8 +39,8 @@ git pull winehq tag "$upstream_tag"
 # format my verbose "New upstream release" messages, including ANNOUNCE file
 tag_time=`git-cat-file tag "$upstream_tag"|sed -n 's/tagger .*<.*> \([0-9]*\) .*/\1/p'`
 release_date=`date -u -d "@$tag_time" +"%b %-d, %Y"`
-echo "New upstream release $upstream_version, released $release_date." > debian/announce.tmp
-sed -n 's/^  - \(.*\)/- \1/p' ANNOUNCE >> debian/announce.tmp
+echo "New upstream release $upstream_version, released $release_date." > announce.tmp
+sed -n 's/^  - \(.*\)/- \1/p' ANNOUNCE >> announce.tmp
 
 # load original .tar.bz2 into pristine-tar
 git checkout master
diff --git a/debian/maint/import-done b/debian/maint/import-done
index 9644aed..8a6d12d 100755
--- a/debian/maint/import-done
+++ b/debian/maint/import-done
@@ -11,10 +11,10 @@ dch -v "$upstream_version-1" --distribution UNRELEASED --preserve \
  "UNRELEASED"
 git add debian/changelog
 # Amend the merge commit message
-if [ -f debian/announce.tmp ]
+if [ -f announce.tmp ]
 then
-  git commit --amend -F debian/announce.tmp
-  rm debian/announce.tmp
+  git commit --amend -F announce.tmp
+  rm announce.tmp
 else
   git commit --amend
 fi

-- 
Debian Wine packaging