[pkg-java] r3991 - trunk/solr/debian

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-08-06 08:02:08 +0000 (Mon, 06 Aug 2007)
New Revision: 3991

Modified:
   trunk/solr/debian/control
   trunk/solr/debian/get-orig-source
Log:
Fix lintian warnings and update get-orig-source for fixed uscan

Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	2007-08-06 07:25:59 UTC (rev 3990)
+++ trunk/solr/debian/control	2007-08-06 08:02:08 UTC (rev 3991)
@@ -18,7 +18,7 @@
 
 Package: solr-common
 Architecture: all
-Depends: ${misc:Depends}, 
+Depends: debconf (>= 1.5),
  sun-java5-jre | sun-java6-jre,
  libcommons-codec-java,
  libcommons-csv-java,
@@ -27,7 +27,7 @@
  libservlet2.4-java,
  liblucene2-java (>= 2.2),
  libxpp3-java
-Recommends: solr-tomcat5.5 (>= ${Source-Version}) | solr-jetty (>= ${Source-Version})
+Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
 Description: enterprise search server based on Lucene (common files)
  Solr is an open source enterprise search server based on the Lucene 
  Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
@@ -41,8 +41,7 @@
 
 Package: solr-tomcat5.5
 Architecture: all
-Depends: ${misc:Depends},
- solr-common (>= ${Source-Version}), tomcat5.5
+Depends: solr-common (>= ${binary:Version}), tomcat5.5
 Conflicts: solr-jetty
 Description: enterprise search server based on Lucene (Tomcat integration)
  Solr is an open source enterprise search server based on the Lucene 
@@ -56,8 +55,7 @@
 
 Package: solr-jetty
 Architecture: all
-Depends: ${misc:Depends}, 
- jetty (>= 5.1), solr-common (>= ${Source-Version})
+Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1)
 Conflicts: solr-tomcat5.5
 Description: enterprise search server based on Lucene (Jetty integration)
  Solr is an open source enterprise search server based on the Lucene 

Modified: trunk/solr/debian/get-orig-source
===================================================================
--- trunk/solr/debian/get-orig-source	2007-08-06 07:25:59 UTC (rev 3990)
+++ trunk/solr/debian/get-orig-source	2007-08-06 08:02:08 UTC (rev 3991)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEHS=`( uscan --no-download --dehs ; echo "</dehs>" )`
+DEHS=` uscan --no-download --dehs`
 
 URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
 VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`