[SCM] leiningen packaging branch, master, updated. 2f39ef8d6f5ab5818577d40e62634c74197f4208

[Wolodja Wentland]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "leiningen packaging".

The branch, master has been updated
       via  2f39ef8d6f5ab5818577d40e62634c74197f4208 (commit)
      from  6b0a801cead1f926ddf7433f01c8180064667d3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f39ef8d6f5ab5818577d40e62634c74197f4208
Author: Wolodja Wentland <babilen at gmail.com>
Date:   Sun Jul 17 22:13:42 2011 +0100

    Merge newest bin/lein version from upstream

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/0002-non-standalone-lein.patch |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0002-non-standalone-lein.patch b/debian/patches/0002-non-standalone-lein.patch
index 707b6a9..78630f4 100644
--- a/debian/patches/0002-non-standalone-lein.patch
+++ b/debian/patches/0002-non-standalone-lein.patch
@@ -5,11 +5,11 @@ Subject: non-standalone lein
 The upstream version of bin/lein is a standalone one. We are, however, using
 packaged dependencies that are installed system-wide in the patched version.
 ---
- bin/lein |  191 +++++++++++---------------------------------------------------
- 1 files changed, 34 insertions(+), 157 deletions(-)
+ bin/lein |  193 +++++++++++--------------------------------------------------
+ 1 files changed, 35 insertions(+), 158 deletions(-)
 
 diff --git a/bin/lein b/bin/lein
-index 0555569..8871674 100755
+index 0555569..041819e 100755
 --- a/bin/lein
 +++ b/bin/lein
 @@ -1,19 +1,12 @@
@@ -89,9 +89,9 @@ index 0555569..8871674 100755
 +SHARE_JARS="ant ant-launcher classworlds clojure-1.2 \
 +lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
 +maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
-+plexus-container-default-alpha plexus-interpolation plexus-utils \
-+wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api xml-apis
-+lucene-core lucene-highlighter clucy robert-hooke lancet leiningen
++maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
++plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
++xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet leiningen
 +backport-util-concurrent" # NFI why that last one is necessary
 +for JAR in $SHARE_JARS; do
 +    CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
@@ -247,7 +247,8 @@ index 0555569..8871674 100755
          if [ -r $TRAMPOLINE_FILE ]; then
              TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
              rm $TRAMPOLINE_FILE
-             exec sh -c "$TRAMPOLINE"
+-            exec sh -c "$TRAMPOLINE"
++            exec sh -c "exec $TRAMPOLINE"
          fi
 -    else
 +else


hooks/post-receive
-- 
leiningen packaging