[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-14-gab43224

James Page james.page at ubuntu.com
Wed May 23 15:42:00 UTC 2012


The following commit has been merged in the master branch:
commit 8ffd51414b72caac19a9f7ab9c8a8a8f57319933
Author: James Page <james.page at ubuntu.com>
Date:   Wed May 23 16:21:10 2012 +0100

    Added myself to uploaders.
    
    * Added myself to uploaders.
    * Bumped Standards-Version to 3.9.3:
      - d/copyright: Referenced released version of DEP-5 and tidied up
        obsolete field names.
    * Added commons-logging.jar to WEB-INF/lib (Closes: #587512).
    * Added http[client,core,mime].jar to WEB-INF/lib (Closes: #587510).
    * Install utility scripts to correct location under ${solr.home}
      (Closes: #538229), create symlink for backwards compatibility.
    * Link /var/log/solr to ${solr.home}/logs.
    * Added Italian debconf translation (Closes: #659388). Thanks to Beatrice
      Torracca for this work.
    * Sync changes from Ubuntu and fix FTBFS with current versions of lucene
      (Closes: #593027).
    * Drop dependency on glassfish-mail, no longer required (Closes: #575208).

diff --git a/debian/ant.properties b/debian/ant.properties
index b8f2fa9..6542be0 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -8,4 +8,4 @@ build.compiler=javac1.5
 compile.debug=on
 compile.optimize=on
 ant.library.dir=/usr/share/ant/lib
-lucene_version=2.9.2
+lucene_version=2.9.4
diff --git a/debian/changelog b/debian/changelog
index cd7f6c8..88f310a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,25 @@
 solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
 
+  [ Jan-Pascal van Best ]
   * Removed Jan-Pascal from uploaders.
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 16 Aug 2011 21:27:22 +0200
+  [ James Page ]
+  * Added myself to uploaders.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Referenced released version of DEP-5 and tidied up 
+      obsolete field names.
+  * Added commons-logging.jar to WEB-INF/lib (Closes: #587512).
+  * Added http[client,core,mime].jar to WEB-INF/lib (Closes: #587510).
+  * Install utility scripts to correct location under ${solr.home}
+    (Closes: #538229), create symlink for backwards compatibility.
+  * Link /var/log/solr to ${solr.home}/logs.
+  * Added Italian debconf translation (Closes: #659388). Thanks to Beatrice
+    Torracca for this work.
+  * Sync changes from Ubuntu and fix FTBFS with current versions of lucene
+    (Closes: #593027).
+  * Drop dependency on glassfish-mail, no longer required (Closes: #575208).
+
+ -- James Page <james.page at ubuntu.com>  Wed, 23 May 2012 16:10:48 +0100
 
 solr (1.4.1+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dbf6457..6264698 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: solr
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Koch <thomas at koch.ro>
+Uploaders: Thomas Koch <thomas at koch.ro>, James Page <james.page at ubuntu.com>
 DM-Upload-Allowed: yes
 Homepage: http://lucene.apache.org/solr/
 Vcs-Browser: http://git.debian.org/?p=pkg-java/solr.git
 Vcs-Git: git://git.debian.org/git/pkg-java/solr.git
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 8), po-debconf,
  default-jdk,
  ant (>= 1.7.0), ant-optional (>= 1.7.0), 
@@ -16,13 +16,13 @@ Build-Depends: debhelper (>= 8), po-debconf,
  libcommons-fileupload-java (>= 1.2.1),
  libcommons-httpclient-java (>= 3.1),
  libcommons-io-java (>= 1.4),
+ libcommons-logging-java,
  libjaxp1.3-java (>= 1.3.04),
  libjetty-java (>= 6.1.21),
  liblucene2-java (>= 2.9.1),
  libservlet2.5-java (>= 6.0.20),
  libslf4j-java (>= 1.5.10),
  libxml-commons-external-java (>= 1.3.04),
- glassfish-mail (>= 1:2ur2-b04),
  junit4,
  libjmock-java
 
@@ -36,13 +36,15 @@ Depends: ${misc:Depends},
  libcommons-fileupload-java (>= 1.2.1),
  libcommons-httpclient-java (>= 3.1),
  libcommons-io-java (>= 1.4),
+ libcommons-logging-java,
+ libhttpclient-java,
+ libhttpmime-java,
  libjaxp1.3-java (>= 1.3.05-1),
  libjetty-java (>= 6.1.21),
  liblucene2-java (>= 2.9.1),
  libservlet2.5-java (>= 6.0.20),
  libslf4j-java (>= 1.5.10),
- libxml-commons-external-java (>= 1.3.04),
- glassfish-mail (>= 1:2ur2-b04),
+ libxml-commons-external-java (>= 1.3.04)
 Recommends: solr-tomcat (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
 Suggests: libmysql-java
 Description: enterprise search server based on Lucene - common files
diff --git a/debian/copyright b/debian/copyright
index 4a4435f..c8d89ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
-Name: solr
-Maintainer: solr-dev at lucene.apache.org
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: solr
+Upstream-Contact: solr-dev at lucene.apache.org
 Source: http://lucene.apache.org/solr/
 
 Files: *
diff --git a/debian/po/cs.po b/debian/po/it.po
similarity index 52%
copy from debian/po/cs.po
copy to debian/po/it.po
index 7732a5f..88a2189 100644
--- a/debian/po/cs.po
+++ b/debian/po/it.po
@@ -1,25 +1,26 @@
-# Czech translation of solr debconf messages.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Italian translation of solr debconf messages.
+# Copyright (C) 2012 solr package copyright holder
 # This file is distributed under the same license as the solr package.
-# Miroslav Kure <kurem at debian.cz>, 2007.
-#
+# Beatrice Torracca <beatricet at libero.it>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: solr\n"
+"Project-Id-Version: solr 1.4.1+dfsg1-2\n"
 "Report-Msgid-Bugs-To: pkg-java-maintainers at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-10-04 07:18+0200\n"
-"PO-Revision-Date: 2007-10-07 16:54+0200\n"
-"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"PO-Revision-Date: 2012-02-10 17:43+0200\n"
+"Last-Translator: Beatrice Torracca <beatricet at libero.it>\n"
+"Language-Team: debian-l10n-italian\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
 #. Description
 #: ../solr-common.templates:2001
 msgid "Remove Solr index files?"
-msgstr "Odstranit indexové soubory Solr?"
+msgstr "Rimuovere i file indice di Solr?"
 
 #. Type: boolean
 #. Description
@@ -28,8 +29,8 @@ msgid ""
 "The Solr data directory (/var/lib/solr), and the index files it contains, "
 "may be removed while purging the package."
 msgstr ""
-"Při vyčištění balíku ze systému se může smazat také datový adresář Solr (/"
-"var/lib/solr) a indexové soubory v něm obsažené."
+"La directory dei dati di Solr (/var/lib/solr) e i file indice che contiene "
+"possono essere rimossi durante l'eliminazione definitiva del pacchetto."
 
 #. Type: boolean
 #. Description
@@ -38,5 +39,5 @@ msgid ""
 "You should not choose this option if you intend to re-use Solr's index files "
 "later."
 msgstr ""
-"Plánujete-li v budoucnu znovupoužít indexové soubory Solr, tuto možnost "
-"zamítněte."
+"Non si dovrebbe scegliere questa opzione se si ha intenzione di riusare i "
+"file indice di Solr in un momento successivo."
diff --git a/debian/rules b/debian/rules
index 9643c1b..88df5c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,9 @@ export JAVA_HOME=/usr/lib/jvm/default-java/
 	dh $@
 
 override_dh_auto_build:
-	ant -Dversion=1.4.1 init-forrest-entities dist-solrj dist-jar dist-contrib compile make-manifest
-
+	ant -propertyfile debian/ant.properties -Dversion=1.4.1 \
+		init-forrest-entities dist-solrj dist-jar dist-contrib \
+		compile make-manifest
 
 ##!/usr/bin/make -f
 ## -*- makefile -*-
diff --git a/debian/solr-common.install b/debian/solr-common.install
index 75ad05b..8b81a6e 100644
--- a/debian/solr-common.install
+++ b/debian/solr-common.install
@@ -1,5 +1,5 @@
 src/webapp/web/WEB-INF/web.xml /etc/solr/
-src/scripts /usr/share/solr
+src/scripts/* /usr/share/solr/bin
 example/solr/conf /etc/solr
 dist/*.jar /usr/share/solr/WEB-INF/lib/
 src/webapp/web/* /usr/share/solr/
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 3a5ac4d..370939d 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -1,10 +1,15 @@
 /etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
 /etc/solr/conf /usr/share/solr/conf
+/usr/share/solr/bin /usr/share/solr/scripts
 /usr/share/java/commons-codec.jar       /usr/share/solr/WEB-INF/lib/commons-codec.jar
 /usr/share/java/commons-csv.jar         /usr/share/solr/WEB-INF/lib/commons-csv.jar
 /usr/share/java/commons-fileupload.jar  /usr/share/solr/WEB-INF/lib/commons-fileupload.jar
 /usr/share/java/commons-httpclient.jar  /usr/share/solr/WEB-INF/lib/commons-httpclient.jar
 /usr/share/java/commons-io.jar          /usr/share/solr/WEB-INF/lib/commons-io.jar
+/usr/share/java/commons-logging.jar     /usr/share/solr/WEB-INF/lib/commons-logging.jar
+/usr/share/java/httpcore.jar            /usr/share/solr/WEB-INF/lib/httpcore.jar
+/usr/share/java/httpclient.jar          /usr/share/solr/WEB-INF/lib/httpclient.jar
+/usr/share/java/httpmime.jar            /usr/share/solr/WEB-INF/lib/httpmime.jar
 /usr/share/java/jcl-over-slf4j.jar      /usr/share/solr/WEB-INF/lib/jcl-over-slf4j.jar
 /usr/share/java/jetty.jar               /usr/share/solr/WEB-INF/lib/jetty.jar
 /usr/share/java/jetty-util.jar          /usr/share/solr/WEB-INF/lib/jetty-util.jar
diff --git a/debian/watch b/debian/watch
index b495213..bb3d0ae 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
 
-opts=dversionmangle=s/\+ds\d+$// \
+opts=dversionmangle=s/\.dfsg\.\d+$// \
   http://archive.apache.org/dist/lucene/solr/(?:[\d\.]+)/apache-solr-(.*).tgz \
   debian

-- 
Solr - web service for full-text indexing and searching - Debian packaging



More information about the pkg-java-commits mailing list