The following commit has been merged in the master branch:
commit 3489ca43ae1ff81ee0afb6389a615e64e402739e
Author: Wolodja Wentland babi...@gmail.com
Date: Sun Nov 13 13:12:50 2011 +
New upstream release 1.6.2
diff --git a/debian/changelog b/debian/changelog
index 432593e..b5a27aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+leiningen (1.6.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Remove patches that have been accepted upstream
+- Manpage comment syntax
+- Add clojure-contrib to CLASSPATH
+- bin/lein-pkg is now shipped by upstream
+ * Remove superfluous $(CURDIR) from debian/rules
+
+ -- Wolodja Wentland babi...@gmail.com Sat, 12 Nov 2011 23:41:25 +
+
leiningen (1.6.1.1-2) unstable; urgency=low
* Add clojure-contrib to CLASSPATH in bin/lein (Closes: #647632)
diff --git a/debian/patches/0003-Disable-dependency-download.patch
b/debian/patches/0002-Disable-dependency-download.patch
similarity index 87%
rename from debian/patches/0003-Disable-dependency-download.patch
rename to debian/patches/0002-Disable-dependency-download.patch
index 26a1ab9..795d771 100644
--- a/debian/patches/0003-Disable-dependency-download.patch
+++ b/debian/patches/0002-Disable-dependency-download.patch
@@ -7,7 +7,7 @@ Subject: Disable dependency download
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/project.clj b/project.clj
-index 1cb5b7d..9cda7ce 100644
+index 7224851..293618d 100644
--- a/project.clj
+++ b/project.clj
@@ -6,12 +6,5 @@
@@ -20,7 +20,7 @@ index 1cb5b7d..9cda7ce 100644
- [lancet 1.0.1]
- [jline 0.9.94 :exclusions [junit]]
- [robert/hooke 1.1.2]
-- [org.apache.maven/maven-ant-tasks 2.0.10 :exclusions
[ant]]]
+- [org.apache.maven/maven-ant-tasks 2.1.3 :exclusions [ant]]]
:disable-implicit-clean true
:eval-in-leiningen true)
--
diff --git a/debian/patches/0002-Non-standalone-lein.patch
b/debian/patches/0002-Non-standalone-lein.patch
deleted file mode 100644
index 5a7c46d..000
--- a/debian/patches/0002-Non-standalone-lein.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From: Wolodja Wentland babi...@gmail.com
-Date: Thu, 6 Oct 2011 16:00:15 +0100
-Subject: Non-standalone lein
-
- bin/lein | 196 +-
- 1 files changed, 40 insertions(+), 156 deletions(-)
-
-diff --git a/bin/lein b/bin/lein
-index de67bfd..3d1ca7b 100755
a/bin/lein
-+++ b/bin/lein
-@@ -1,19 +1,12 @@
--#!/bin/sh
-+#!/bin/bash
-+
-+# This variant of the lein script is meant for downstream packagers.
-+# It has all the cross-platform stuff stripped out as well as the
-+# logic for running from checkouts and self-upgrading.
-
- LEIN_VERSION=1.6.1.1
- export LEIN_VERSION
-
--case $LEIN_VERSION in
--*SNAPSHOT) SNAPSHOT=YES ;;
--*) SNAPSHOT=NO ;;
--esac
--
--# Make sure classpath is in unix format for manipulating, then put
--# it back to windows format when we use it
--if [ $OSTYPE = cygwin ] [ $CLASSPATH != ]; then
--CLASSPATH=`cygpath -up $CLASSPATH`
--fi
--
- if [ `whoami` = root ] [ $LEIN_ROOT = ]; then
- echo WARNING: You're currently running as root; probably by accident.
- echo Press control-C to abort or Enter to continue as root.
-@@ -21,10 +14,10 @@ if [ `whoami` = root ] [ $LEIN_ROOT = ]; then
- read _
- fi
-
-+# cd to the project root, if applicable
- NOT_FOUND=1
- ORIGINAL_PWD=$PWD
--while [ ! -r $PWD/project.clj ] [ $PWD != / ] [ $NOT_FOUND -ne 0 ]
--do
-+while [ ! -r $PWD/project.clj ] [ $PWD != / ] [ $NOT_FOUND -ne 0
]; do
- cd ..
- if [ $(dirname $PWD) = / ]; then
- NOT_FOUND=0
-@@ -32,9 +25,10 @@ do
- fi
- done
-
--if [ $LEIN_HOME = ]; then
--LEIN_HOME=$HOME/.lein
--fi
-+# Support $JAVA_OPTS for backwards-compatibility.
-+JVM_OPTS=${JVM_OPTS:-$JAVA_OPTS}
-+JAVA_CMD=${JAVA_CMD:-java}
-+LEIN_HOME=${LEIN_HOME:-$HOME/.lein}
-
- DEV_PLUGINS=$(ls -1 lib/dev/*jar 2 /dev/null)
- USER_PLUGINS=$(ls -1 $LEIN_HOME/plugins/*jar 2 /dev/null)
-@@ -69,7 +63,7 @@ LEIN_PLUGIN_PATH=$(echo $DEV_PLUGINS | tr \\n :)
- LEIN_USER_PLUGIN_PATH=$(echo $(unique_user_plugins) | tr \\n :)
- CLASSPATH=$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/
- LEIN_JAR=$HOME/.lein/self-installs/leiningen-$LEIN_VERSION-standalone.jar
--CLOJURE_JAR=$HOME/.m2/repository/org/clojure/clojure/1.2.1/clojure-1.2.1.jar
-+CLOJURE_JAR=/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar
- NULL_DEVICE=/dev/null
-
- # apply context specific CLASSPATH entries
-@@ -84,163 +78,53 @@ else
- SCRIPT=$0
- fi
-
--# resolve symlinks to the script itself portably
--while [ -h $SCRIPT ] ; do
--ls=`ls -ld $SCRIPT`
--link=`expr $ls : '.*- \(.*\)$'`
--if expr $link : '/.*' /dev/null; then
--SCRIPT=$link
--else
--SCRIPT=$(dirname $SCRIPT$)/$link
--fi
-+SHARE_JARS=ant ant-launcher classworlds
