[SCM] leiningen packaging branch, master, updated. debian/1.6.1.1-1-2-g68eaa8e

[Wolodja Wentland]

The following commit has been merged in the master branch:
commit 54ddd92e57fef26a4621cdd80828fecfa1fb1655
Author: Wolodja Wentland <babilen at gmail.com>
Date:   Sat Nov 5 13:48:01 2011 +0000

    Add clojure-contrib to CLASSPATH
    
    Plugin authors are promised that clojure-contrib is on the CLASSPATH, which
    was not the case so far and caused #647632.

diff --git a/debian/changelog b/debian/changelog
index b0758df..18ef583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+leiningen (1.6.1.1-2) unstable; urgency=low
+
+  * Add clojure-contrib to CLASSPATH in bin/lein (Closes: #647632)
+  * Depend on clojure-contrib
+
+ -- Wolodja Wentland <babilen at gmail.com>  Sat, 05 Nov 2011 13:46:01 +0000
+
 leiningen (1.6.1.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 523f562..1f77fc5 100644
--- a/debian/control
+++ b/debian/control
@@ -38,11 +38,11 @@ Architecture: all
 Depends:
  ${java:Depends},
  ${misc:Depends},
- openjdk-6-jre | openjdk-7-jre | sun-java6-jre
+ openjdk-6-jre | openjdk-7-jre | sun-java6-jre,
+ clojure-contrib (>= 1.2.0)
 Recommends:
  ${java:Recommends},
- rlwrap,
- clojure-contrib (>= 1.2.0)
+ rlwrap
 Description: simple build system for Clojure
  Working on Clojure projects with tools designed for Java can be an
  exercise in frustration. With Leiningen, you describe your build with
diff --git a/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch b/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
new file mode 100644
index 0000000..2522edc
--- /dev/null
+++ b/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
@@ -0,0 +1,23 @@
+From: Wolodja Wentland <babilen at gmail.com>
+Date: Sat, 5 Nov 2011 13:35:57 +0000
+Subject: Add clojure-contrib to CLASSPATH
+
+This patch fixes #647632 by adding clojure-contrib to leiningen's CLASSPATH.
+---
+ bin/lein |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/lein b/bin/lein
+index 3d1ca7b..93ded4b 100755
+--- a/bin/lein
++++ b/bin/lein
+@@ -78,7 +78,7 @@ else
+     SCRIPT="$0"
+ fi
+ 
+-SHARE_JARS="ant ant-launcher classworlds clojure-1.2 \
++SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib-1.2.0 \
+ 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 \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 897ea95..5ee940b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Disable-dependency-download.patch
 0004-Lein-upgrade-message.patch
 0005-Fix-manpage.patch
+0006-Add-clojure-contrib-to-CLASSPATH.patch

-- 
leiningen packaging