[SCM] leiningen packaging branch, master, updated. debian/1.7.1-1-4-g55d2111

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit 01979014e26fd45161eeb41cac1269692e44e834
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 15 15:25:20 2013 +0200

    Removed the unused dependency on libbackport-util-concurrent-java

diff --git a/debian/control b/debian/control
index b742e1c..1a2a5b8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
  ant,
  bash-completion,
  clojure1.2,
- libbackport-util-concurrent-java,
  libclassworlds-java,
  libclucy-clojure,
  libjaxp1.3-java,
diff --git a/debian/leiningen.manifest b/debian/leiningen.manifest
index a587e72..c3b1626 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/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
+ 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
diff --git a/debian/patches/0004-Remove-backportutil-dependency.patch b/debian/patches/0004-Remove-backportutil-dependency.patch
new file mode 100644
index 0000000..d470ec1
--- /dev/null
+++ b/debian/patches/0004-Remove-backportutil-dependency.patch
@@ -0,0 +1,16 @@
+Description: Removes the unused dependency on backport-util-concurrent.
+ This change has already been applied upstream in version 2.0 
+Author: Emmanuel Bourg
+Forwarded: not-needed
+--- a/bin/lein-pkg
++++ b/bin/lein-pkg
+@@ -83,8 +83,7 @@
+ 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
++xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet"
+ for JAR in $SHARE_JARS; do
+     CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 6867755..33ca9af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Update-lancet.patch
 0002-Lein-upgrade-message.patch
 0003-Disable-dependency-download.patch
+0004-Remove-backportutil-dependency.patch

-- 
leiningen packaging