[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-0.9.61-127-g815a087

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 28c7e7f4791b469ea705a60ac160f6fadfc469b1
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat May 3 00:41:46 2008 +0200

    Added scripts to import new upstream releases and build packages using the pkg-wine Git repository.

diff --git a/debian/maint/build b/debian/maint/build
new file mode 100755
index 0000000..f29d556
--- /dev/null
+++ b/debian/maint/build
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+rm -f debian/amd64.tar.lzma.uu
+export DEB_FIXDIFF=yes
+git-buildpackage --git-pristine-tar \
+ --git-upstream-tag="wine-%(version)s" \
+ --git-debian-tag="wine-%(version)s" \
+ "$@"
diff --git a/debian/maint/build-final b/debian/maint/build-final
new file mode 100755
index 0000000..a17fd73
--- /dev/null
+++ b/debian/maint/build-final
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+rm -f debian/amd64.tar.lzma.uu
+version=`dpkg-parsechangelog|sed -n 's/Version: \(.*\)/\1/p'`
+last_version=`dpkg-parsechangelog -o1 -c1|sed -n 's/Version: \(.*\)/\1/p'`
+git-dch --release --auto --full --meta \
+ --debian-tag="wine-$last_version" \
+ --git-log="--first-parent"
+git add debian/changelog
+git commit -m "Release $version"
+export DEB_FIXDIFF=yes
+git-buildpackage --git-pristine-tar \
+ --git-upstream-tag="wine-%(version)s" \
+ --git-debian-tag="wine-%(version)s" \
+ --git-tag \
+ "$@"
diff --git a/debian/maint/import b/debian/maint/import
new file mode 100755
index 0000000..fa7dd94
--- /dev/null
+++ b/debian/maint/import
@@ -0,0 +1,57 @@
+#!/bin/sh
+set -e
+if [ "$1" != "--upstream-version" ]
+then
+  echo "Usage: $0 --upstream-version VERSION FILENAME"
+  exit 1
+fi
+upstream_version="$2"
+origfilename="$3"
+
+# dereference symlink, we'll stash the original filename into pristine-tar
+# (currently, debian does not allow .tar.bz2 source packages anyway, so this
+# reserves the .orig.tar.* names for what's actually uploaded to Debian)
+filename=`find "$origfilename" -printf "%h/%l"`
+
+# craft the .orig.tar.gz for the Debian source package
+debfilename="`dirname "$origfilename"`/wine_$upstream_version.orig.tar.gz"
+if [ "$filename" != "$origfilename" ] && [ "$origfilename" != "$debfilename" ]
+then
+  # kill .orig.tar.bz2, we won't use it
+  rm "$origfilename"
+fi
+if [ ! -f "$debfilename" ]
+then
+  # convert .orig.tar.gz
+  bzcat "$filename"|gzip -9 > "$debfilename"
+fi
+
+# if we're not building from a git tree, use regular uupdate
+if [ ! -d ".git" ]
+then
+  exec uupdate --no-symlink "$*"
+fi
+
+# pull from upstream git repository
+upstream_tag="wine-$upstream_version"
+git checkout upstream
+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
+
+# load original .tar.bz2 into pristine-tar
+git checkout master
+pristine-tar -v commit "$filename" "$upstream_tag"
+
+# load converted .tar.gz into pristine-tar
+pristine-tar -v commit "$debfilename" "$upstream_tag"
+
+# merge from upstream into master branch
+git checkout -q master
+git merge upstream
+
+# amend the merge commit message
+$0-done --upstream-version "$upstream_version"
diff --git a/debian/maint/import-done b/debian/maint/import-done
new file mode 100755
index 0000000..7b3c2b3
--- /dev/null
+++ b/debian/maint/import-done
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+if [ "$1" != "--upstream-version" ]
+then
+  echo "Usage: $0 --upstream-version VERSION"
+  exit 1
+fi
+upstream_version="$2"
+# Create changelog entry, so build tools can find the upstream version
+dch -v "$upstream_version-1" --distribution UNRELEASED --preserve \
+ "Merge upstream Wine $upstream_version"
+git add debian/changelog
+# Amend the merge commit message
+if [ -f debian/announce.tmp ]
+then
+  git commit --amend -F debian/announce.tmp
+  rm debian/announce.tmp
+else
+  git commit --amend
+fi

-- 
Debian Wine packaging