The following commit has been merged in the master branch:
commit 46bc7ca8ccb6e11eba435a428cbc1d4f4364e6b8
Author: Wolodja Wentland <babi...@gmail.com>
Date:   Sun Nov 6 13:24:38 2011 +0000

    Use unversioned clojure-contrib.jar

diff --git a/debian/leiningen.manifest b/debian/leiningen.manifest
index aa26010..a587e72 100644
--- a/debian/leiningen.manifest
+++ b/debian/leiningen.manifest
@@ -1,4 +1,4 @@
 usr/share/java/lancet.jar:
  Class-Path: /usr/share/java/ant.jar /usr/share/java/clojure-1.2.jar
 usr/share/java/leiningen.jar:
- Class-Path: /usr/share/java/ant.jar /usr/share/java/ant-launcher.jar 
/usr/share/java/classworlds.jar /usr/share/java/clojure-1.2.jar 
/usr/share/java/lucene-memory.jar /usr/share/java/maven-ant-tasks.jar 
/usr/share/java/maven-artifact.jar /usr/share/java/maven-artifact-manager.jar 
/usr/share/java/maven-error-diagnostics.jar /usr/share/java/maven-model.jar 
/usr/share/java/maven-settings.jar /usr/share/java/maven-project.jar 
/usr/share/java/maven-profile.jar /usr/share/java/maven-repository-metadata.jar 
/usr/share/java/plexus-container-default-alpha.jar 
/usr/share/java/plexus-interpolation.jar /usr/share/java/plexus-utils.jar 
/usr/share/java/wagon-file.jar /usr/share/java/wagon-http-lightweight.jar 
/usr/share/java/wagon-http-shared.jar /usr/share/java/wagon-provider-api.jar 
/usr/share/java/xml-apis.jar /usr/share/java/lucene-core.jar 
/usr/share/java/lucene-highlighter.jar /usr/share/java/clucy.jar 
/usr/share/java/robert-hooke.jar /usr/share/java/lancet.jar 
/usr/share/java/leiningen.jar /usr/share/java/backport-util-concurrent.jar
+ Class-Path: /usr/share/java/ant.jar /usr/share/java/ant-launcher.jar 
/usr/share/java/classworlds.jar /usr/share/java/clojure-1.2.jar 
/usr/share/java/clojure-contrib.jar /usr/share/java/lucene-memory.jar 
/usr/share/java/maven-ant-tasks.jar /usr/share/java/maven-artifact.jar 
/usr/share/java/maven-artifact-manager.jar 
/usr/share/java/maven-error-diagnostics.jar /usr/share/java/maven-model.jar 
/usr/share/java/maven-settings.jar /usr/share/java/maven-project.jar 
/usr/share/java/maven-profile.jar /usr/share/java/maven-repository-metadata.jar 
/usr/share/java/plexus-container-default-alpha.jar 
/usr/share/java/plexus-interpolation.jar /usr/share/java/plexus-utils.jar 
/usr/share/java/wagon-file.jar /usr/share/java/wagon-http-lightweight.jar 
/usr/share/java/wagon-http-shared.jar /usr/share/java/wagon-provider-api.jar 
/usr/share/java/xml-apis.jar /usr/share/java/lucene-core.jar 
/usr/share/java/lucene-highlighter.jar /usr/share/java/clucy.jar 
/usr/share/java/robert-hooke.jar /usr/share/java/lancet.jar 
/usr/share/java/leiningen.jar /usr/share/java/backport-util-concurrent.jar
diff --git a/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch 
b/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
index 2522edc..f97e321 100644
--- a/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
+++ b/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
@@ -8,7 +8,7 @@ This patch fixes #647632 by adding clojure-contrib to 
leiningen's CLASSPATH.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/bin/lein b/bin/lein
-index 3d1ca7b..93ded4b 100755
+index 3d1ca7b..8b7ae2a 100755
 --- a/bin/lein
 +++ b/bin/lein
 @@ -78,7 +78,7 @@ else
@@ -16,7 +16,7 @@ index 3d1ca7b..93ded4b 100755
  fi
  
 -SHARE_JARS="ant ant-launcher classworlds clojure-1.2 \
-+SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib-1.2.0 \
++SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
  lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
  maven-error-diagnostics maven-model maven-settings maven-project 
maven-profile \
  maven-repository-metadata plexus-container-default-alpha plexus-interpolation 
\

-- 
leiningen packaging

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to