[SCM] leiningen packaging branch, master, updated. debian/1.7.1-1-8-gb9d6496

[Wolodja Wentland]

The following commit has been merged in the master branch:
commit a1cb8b838435069670a2497b5d817fec0f71c6fb
Author: Wolodja Wentland <debian at babilen5.org>
Date:   Thu May 23 14:37:36 2013 +0100

    Rebuild against newer robert-hooke version
    
    librobert-hooke-clojure used to install /usr/share/java/robert-hooke.jar, but
    it was renamed to hooke.jar to be more closely in line with upstream's naming
    scheme. The classpath used by leiningen therefore has to be adapted.

diff --git a/debian/control b/debian/control
index 0c8b8b2..f8fbc56 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  libplexus-container-default-java,
  libplexus-interpolation-java,
  libplexus-utils-java,
- librobert-hooke-clojure,
+ librobert-hooke-clojure (>= 1.3.0),
  libtext-markdown-perl | markdown,
  libwagon-java,
  default-jdk,
@@ -38,6 +38,7 @@ Depends:
  ${misc:Depends},
  default-jre | java6-runtime,
  clojure-contrib (>= 1.2.0),
+ librobert-hooke-clojure (>= 1.3.0),
  rlwrap
 Recommends:
  ${java:Recommends}
diff --git a/debian/leiningen.manifest b/debian/leiningen.manifest
index c3b1626..aac553b 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
+ 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/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
index d470ec1..ef7ab8f 100644
--- a/debian/patches/0004-Remove-backportutil-dependency.patch
+++ b/debian/patches/0004-Remove-backportutil-dependency.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
  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"
++xml-apis lucene-core lucene-highlighter clucy hooke lancet"
  for JAR in $SHARE_JARS; do
      CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
  done

-- 
leiningen packaging