[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 554c200ca249732bb53f862af35055d46f5ccdb2
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Aug 24 16:38:44 2009 +0300

    Add merge script, and copyright file.

diff --git a/libclamav/llvm/llvm/LICENSE.TXT b/COPYING.llvm
similarity index 96%
copy from libclamav/llvm/llvm/LICENSE.TXT
copy to COPYING.llvm
index 060cb4f..2ee7e2b 100644
--- a/libclamav/llvm/llvm/LICENSE.TXT
+++ b/COPYING.llvm
@@ -1,3 +1,6 @@
+The files in libclamav/llvm/llvm are from the LLVM project, original license is
+in libclamav/llvm/llvm/LICENSE.TXT:
+
 ==============================================================================
 LLVM Release License
 ==============================================================================
@@ -66,3 +69,4 @@ Autoconf            llvm/autoconf
                     llvm/projects/sample/autoconf
 CellSPU backend     llvm/lib/Target/CellSPU/README.txt
 Google Test         llvm/utils/unittest/googletest
+
diff --git a/libclamav/llvm/merge.sh b/libclamav/llvm/merge.sh
new file mode 100755
index 0000000..bba4773
--- /dev/null
+++ b/libclamav/llvm/merge.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Merge upstream LLVM from git-svn mirror
+set -e
+rm -f .git/info/grafts
+touch .git/info/grafts
+echo "Creating grafts for llvm-upstream"
+
+REPONAME=llvm
+REFPFX=refs/tags/merge-$REPONAME-
+UPSTREAM=$REPONAME-upstream/master
+git for-each-ref $REFPFX*  --format='%(refname)' | while read tag_ref
+do
+	tag_svn_ref=`echo $tag_ref|sed -e s\|$REFPFX\|\|`
+	upstream_ref=`git log $UPSTREAM -1 --grep=trunk@$tag_svn_ref --format=format:%H`
+	local_ref=`git rev-parse $tag_ref`
+	local_ref=`git rev-parse $tag_ref`
+	local_parent_ref=`git rev-parse $tag_ref^`
+	echo "$local_ref $local_parent_ref $upstream_ref" >>.git/info/grafts
+done
+echo "Merging llvm-upstream"
+MERGEREV=`git log $UPSTREAM -1 |grep /trunk@|sed -s 's/.*@\([0-9]*\).*/\1/'`
+git merge -s subtree --squash llvm-upstream/master && git commit || {
+echo "Merge failed: resolve conflicts and run: git tag merge-llvm-$MERGEREV && rm .git/info/grafts"; exit 1;}
+git tag merge-llvm-$MERGEREV
+rm .git/info/grafts

-- 
Debian repository for ClamAV