[SCM] leiningen packaging branch, master, updated. debian/1.6.1.1-2-6-g7aa5f43
Wolodja Wentland
babilen at gmail.com
Mon Nov 14 15:50:08 UTC 2011
The following commit has been merged in the master branch:
commit 3489ca43ae1ff81ee0afb6389a615e64e402739e
Author: Wolodja Wentland <babilen at gmail.com>
Date: Sun Nov 13 13:12:50 2011 +0000
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 <babilen at gmail.com> Sat, 12 Nov 2011 23:41:25 +0000
+
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..0000000
--- a/debian/patches/0002-Non-standalone-lein.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From: Wolodja Wentland <babilen at 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 clojure-1.2 \
-+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 \
-+plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
-+xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
-+backport-util-concurrent" # NFI why that last one is necessary
-+for JAR in $SHARE_JARS; do
-+ CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
- done
-
--BIN_DIR="$(dirname "$SCRIPT")"
--
--if [ -r "$BIN_DIR/../src/leiningen/core.clj" ]; then
-- # Running from source checkout
-- LEIN_DIR="$(dirname "$BIN_DIR")"
-- LEIN_LIBS="$(find -H "$LEIN_DIR/lib" -mindepth 1 -maxdepth 1 -print0 2> /dev/null | tr \\0 \:)"
-- CLASSPATH="$CLASSPATH:$LEIN_LIBS:$LEIN_DIR/src:$LEIN_DIR/classes:$LEIN_DIR/resources:$LEIN_JAR"
--
-- if [ "$LEIN_LIBS" = "" -a "$1" != "self-install" -a ! -r "$LEIN_JAR" ]; then
-- echo "Leiningen is missing its dependencies. Please see \"Building\" in the README."
-- exit 1
-- fi
--else
-- # Not running from a checkout
-- CLASSPATH="$CLASSPATH:$LEIN_JAR"
--
-- if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
-- "$0" self-install
-- fi
-+# Do not use installed leiningen jar during self-compilation
-+if ! { [ "$1" = "compile" ] &&
-+ grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
-+ project.clj ;}; then
-+ CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
- fi
-
--HTTP_CLIENT="wget --no-check-certificate -O"
--if type -p curl >/dev/null 2>&1; then
-- if [ "$https_proxy" != "" ]; then
-- CURL_PROXY="-x $https_proxy"
-- fi
-- HTTP_CLIENT="curl $CURL_PROXY --insecure -f -L -o"
-+if [ $DEBUG ]; then
-+ echo $CLASSPATH
-+ echo $CLOJURE_JAR
- fi
-
--export JAVA_CMD=${JAVA_CMD:-"java"}
--
--# Support $JAVA_OPTS for backwards-compatibility.
--export JVM_OPTS=${JVM_OPTS:-"$JAVA_OPTS"}
--
--# TODO: investigate http://skife.org/java/unix/2011/06/20/really_executable_jars.html
--# If you're packaging this for a package manager (.deb, homebrew, etc)
--# you need to remove the self-install and upgrade functionality.
--if [ "$1" = "self-install" ]; then
-- echo "Downloading Leiningen now..."
-- LEIN_DIR=`dirname "$LEIN_JAR"`
-- mkdir -p "$LEIN_DIR"
-- LEIN_URL="https://github.com/downloads/technomancy/leiningen/leiningen-$LEIN_VERSION-standalone.jar"
-- $HTTP_CLIENT "$LEIN_JAR" "$LEIN_URL"
-- if [ $? != 0 ]; then
-- echo "Failed to download $LEIN_URL"
-- if [ $SNAPSHOT = "YES" ]; then
-- echo "If you have Maven installed, you can do"
-- echo "mvn dependency:copy-dependencies; mv target/dependency lib"
-- echo "See README.md for further SNAPSHOT build instructions."
-- fi
-- rm $LEIN_JAR 2> /dev/null
-- exit 1
-- fi
--elif [ "$1" = "upgrade" ]; then
-- if [ "$LEIN_DIR" != "" ]; then
-- echo "The upgrade task is not meant to be run from a checkout."
-- exit 1
-- fi
-- if [ $SNAPSHOT = "YES" ]; then
-- echo "The upgrade task is only meant for stable releases."
-- echo "See the \"Hacking\" section of the README."
-- exit 1
-- fi
-- if [ ! -w "$SCRIPT" ]; then
-- echo "You do not have permission to upgrade the installation in $SCRIPT"
-- exit 1
-- else
-- echo "The script at $SCRIPT will be upgraded to the latest stable version."
-- echo -n "Do you want to continue [Y/n]? "
-- read RESP
-- case "$RESP" in
-- y|Y|"")
-- echo
-- echo "Upgrading..."
-- TARGET="/tmp/lein-$$-upgrade"
-- LEIN_SCRIPT_URL="https://github.com/technomancy/leiningen/raw/stable/bin/lein"
-- $HTTP_CLIENT "$TARGET" "$LEIN_SCRIPT_URL" \
-- && mv "$TARGET" "$SCRIPT" \
-- && chmod +x "$SCRIPT" \
-- && echo && $SCRIPT self-install && echo && echo "Now running" `$SCRIPT version`
-- exit $?;;
-- *)
-- echo "Aborted."
-- exit 1;;
-- esac
-- fi
--else
-- if [ "$OSTYPE" = "cygwin" ]; then
-- # When running on Cygwin, use Windows-style paths for java
-- CLOJURE_JAR=`cygpath -w "$CLOJURE_JAR"`
-- ORIGINAL_PWD=`cygpath -w "$ORIGINAL_PWD"`
-- CLASSPATH=`cygpath -wp "$CLASSPATH"`
-- NULL_DEVICE=NUL
-- fi
--
-- if [ $DEBUG ]; then
-- echo $CLASSPATH
-- echo $CLOJURE_JAR
-- fi
--
-- JLINE=""
-- if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
-- [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
-- # Use rlwrap if it's available, otherwise fall back to JLine
-- RLWRAP=`which rlwrap`
-- if [ ! -x "$RLWRAP" ] || [ "$RLWRAP" = "" ]; then
-- if [ ! -r "$LEIN_HOME/.jline-warn" ]; then
-- echo "Using JLine for console I/O; install rlwrap for optimum experience."
-- touch "$LEIN_HOME/.jline-warn"
-- fi
-- RLWRAP=""
-- JLINE=jline.ConsoleRunner
-- if [ "$OSTYPE" = "cygwin" ]; then
-- JLINE="-Djline.terminal=jline.UnixTerminal jline.ConsoleRunner"
-- CYGWIN_JLINE=y
-- fi
-- else
-- # Test to see if rlwrap supports custom quote chars
-- rlwrap -m -q '"' echo "hi" > /dev/null 2>&1
-- if [ $? -eq 0 ]; then
-- RLWRAP="$RLWRAP -m -q '\"'"
-- fi
-- fi
-+# Use rlwrap if appropriate
-+if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
-+ [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
-+ which rlwrap > /dev/null
-+ if [ $? -eq 0 ]; then
-+ RLWRAP="rlwrap -m -q '\"'" # custom quote chars
- fi
-+fi
-
-- # The -Xbootclasspath argument is optional here: if the jar
-- # doesn't exist everything will still work, it will just have a
-- # slower JVM boot.
-- test $CYGWIN_JLINE && stty -icanon min 1 -echo
-- if [ "$1" = "trampoline" ]; then
-+if [ "$1" = "trampoline" ]; then
- TRAMPOLINE_FILE="/tmp/lein-trampoline-$$"
- $JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client $JVM_OPTS \
- -Dleiningen.original.pwd="$ORIGINAL_PWD" \
- -Dleiningen.trampoline-file=$TRAMPOLINE_FILE -cp "$CLASSPATH" \
-- $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
-+ clojure.main -e "(use 'leiningen.core)(-main)" \
- $NULL_DEVICE "$@"
- if [ -r $TRAMPOLINE_FILE ]; then
- TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
- rm $TRAMPOLINE_FILE
- exec sh -c "$TRAMPOLINE"
- fi
-- else
-+else
- exec $RLWRAP $JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client $JVM_OPTS \
- -Dleiningen.original.pwd="$ORIGINAL_PWD" \
-- -cp "$CLASSPATH" $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
-+ -cp "$CLASSPATH" clojure.main -e "(use 'leiningen.core)(-main)" \
- $NULL_DEVICE "$@"
-- test $CYGWIN_JLINE && stty icanon echo
-- fi
- fi
---
diff --git a/debian/patches/0004-Lein-upgrade-message.patch b/debian/patches/0003-Lein-upgrade-message.patch
similarity index 100%
rename from debian/patches/0004-Lein-upgrade-message.patch
rename to debian/patches/0003-Lein-upgrade-message.patch
diff --git a/debian/patches/0005-Fix-manpage.patch b/debian/patches/0005-Fix-manpage.patch
deleted file mode 100644
index 703fe4b..0000000
--- a/debian/patches/0005-Fix-manpage.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Wolodja Wentland <babilen at gmail.com>
-Date: Thu, 6 Oct 2011 16:02:55 +0100
-Subject: Fix manpage
-
----
- doc/lein.1 | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/doc/lein.1 b/doc/lein.1
-index 5be6ad4..9b9f075 100644
---- a/doc/lein.1
-+++ b/doc/lein.1
-@@ -1,4 +1,4 @@
--./"to render: groff -Tascii -man doc/lein.1 > lein.man"
-+.\"to render: groff -Tascii -man doc/lein.1 > lein.man"
- .TH LEININGEN 1 "2011 June 30"
- .SH NAME
- lein \- Automate Clojure projects
---
diff --git a/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch b/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
deleted file mode 100644
index f97e321..0000000
--- a/debian/patches/0006-Add-clojure-contrib-to-CLASSPATH.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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..8b7ae2a 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 \
- 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 5ee940b..a040a31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
0001-Update-lancet.patch
-0002-Non-standalone-lein.patch
-0003-Disable-dependency-download.patch
-0004-Lein-upgrade-message.patch
-0005-Fix-manpage.patch
-0006-Add-clojure-contrib-to-CLASSPATH.patch
+0002-Disable-dependency-download.patch
+0003-Lein-upgrade-message.patch
diff --git a/debian/rules b/debian/rules
index c528cb8..a731707 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,17 +18,23 @@ MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard doc/*.md))
override_jh_build: $(MDWN_DOCS)
jar cvf lancet.jar -C src/lancet .
- LEIN_ROOT=y CLASSPATH=$(CURDIR)/lancet.jar bin/lein compile :all, jar
- zip --delete $(CURDIR)/leiningen-$(DEB_UPSTREAM_VERSION).jar 'clucy/*'
- mkdir $(CURDIR)/doc/html && mv $(CURDIR)/doc/*.html $(CURDIR)/doc/html
+ mv bin/lein bin/lein-standalone
+ cp bin/lein-pkg bin/lein
+ chmod --reference=bin/lein-standalone bin/lein
+ LEIN_ROOT=y CLASSPATH=lancet.jar bin/lein compile :all, jar
+ zip --delete leiningen-$(DEB_UPSTREAM_VERSION).jar 'clucy/*'
+ mkdir doc/html && mv doc/*.html doc/html
override_jh_clean:
jh_clean
- if [ -f $(CURDIR)/lancet.jar ] ; then \
- LEIN_ROOT=y CLASSPATH=$(CURDIR)/lancet.jar bin/lein clean; \
+ if [ -f lancet.jar ] ; then \
+ LEIN_ROOT=y CLASSPATH=lancet.jar bin/lein clean; \
+ rm -f lancet.jar; \
+ fi
+ rm -rf doc/html
+ if [ -f bin/lein-standalone ] ; then \
+ mv bin/lein-standalone bin/lein; \
fi
- rm -f $(CURDIR)/lancet.jar
- rm -rf $(CURDIR)/doc/html
override_jh_installlibs:
jh_installlibs -i --upstream-version=1.0.1 lancet.jar
@@ -38,7 +44,7 @@ override_dh_installchangelogs:
dh_installchangelogs NEWS
%.html:%.md
- cat $(CURDIR)/debian/header.html > $@
+ cat debian/header.html > $@
sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' $@
markdown $< >> $@
- cat $(CURDIR)/debian/footer.html >> $@
+ cat debian/footer.html >> $@
--
leiningen packaging
More information about the pkg-java-commits
mailing list