[pkg-java] r6280 - in tags/solr: . 1.2.0+ds1-3 1.2.0+ds1-3/debian 1.2.0+ds1-3/debian/patches

janpascal-guest at alioth.debian.org janpascal-guest at alioth.debian.org
Sat Apr 26 19:54:27 UTC 2008


Author: janpascal-guest
Date: 2008-04-26 19:54:26 +0000 (Sat, 26 Apr 2008)
New Revision: 6280

Added:
   tags/solr/1.2.0+ds1-3/
   tags/solr/1.2.0+ds1-3/debian/
   tags/solr/1.2.0+ds1-3/debian/changelog
   tags/solr/1.2.0+ds1-3/debian/control
   tags/solr/1.2.0+ds1-3/debian/patches/00list
   tags/solr/1.2.0+ds1-3/debian/patches/07_fix-for-lucene-2.3.dpatch
   tags/solr/1.2.0+ds1-3/debian/rules
Removed:
   tags/solr/1.2.0+ds1-3/debian/
   tags/solr/1.2.0+ds1-3/debian/changelog
   tags/solr/1.2.0+ds1-3/debian/control
   tags/solr/1.2.0+ds1-3/debian/patches/00list
   tags/solr/1.2.0+ds1-3/debian/rules
Log:
Tagged solr release 1.2.0+ds1-3

Copied: tags/solr/1.2.0+ds1-3 (from rev 5587, trunk/solr)

Copied: tags/solr/1.2.0+ds1-3/debian (from rev 6191, trunk/solr/debian)

Deleted: tags/solr/1.2.0+ds1-3/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	2008-04-18 08:04:11 UTC (rev 6191)
+++ tags/solr/1.2.0+ds1-3/debian/changelog	2008-04-26 19:54:26 UTC (rev 6280)
@@ -1,35 +0,0 @@
-solr (1.2.0+ds1-3~pre1) UNRELEASED; urgency=low
-
-  * Updated control file for new Vcs-* and Homepage fields
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 28 Nov 2007 21:17:22 +0100
-
-solr (1.2.0+ds1-2) unstable; urgency=low
-
-  * Run unit tests during build (closes: #441890).
-  * Rename /usr/share/solr/bin directory to /usr/share/solr/scripts, since
-    this directory contains only scripts.
-  * Install link to config file in /etc/tomcat5.5/Catalina/localhost because
-    this is the new location in recent Tomcat packaging.
-  * Remove portions of the copyright file that referred to libraries that are
-    not shipped with the Debian package for Solr.
-  * Debconf templates and debian/control reviewed by the debian-l10n-
-    english team as part of the Smith review project. (closes: #444655).
-  * Add Portuguese translation of debconf messages (closes: #442306, #445351).
-  * Add Tamil translation of debconf messages (closes: #445284).
-  * Add Czech translation of debconf messages (closes: #445652).
-  * Add Finnish translation of debconf messages (closes: #445701).
-  * Add Russian translation of debconf messages (closes: #446140).
-  * Add German translation of debconf messages (closes: #446284).
-  * Add Galician translation of debconf messages (closes: #446607).
-  * Add Vietnamese translation of debconf messages (closes: #446986).
-  * Add Brazilian Portuguese translation of debconf messages (closes: #447091).
-  * Add French translation of debconf messages (closes: #447223).
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 26 Nov 2007 12:02:17 +0100
-
-solr (1.2.0+ds1-1) unstable; urgency=low
-
-  * Initial upload (Closes: #426763)
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 06 Sep 2007 22:50:49 +0200

Copied: tags/solr/1.2.0+ds1-3/debian/changelog (from rev 6227, trunk/solr/debian/changelog)
===================================================================
--- tags/solr/1.2.0+ds1-3/debian/changelog	                        (rev 0)
+++ tags/solr/1.2.0+ds1-3/debian/changelog	2008-04-26 19:54:26 UTC (rev 6280)
@@ -0,0 +1,38 @@
+solr (1.2.0+ds1-3) unstable; urgency=low
+
+  * Updated control file for new Vcs-* and Homepage fields
+  * Removed solr-jetty binary package since the jetty package 
+    has been removed from Lenny
+  * Update to Lucene 2.3
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 22 Apr 2008 17:08:50 +0200
+
+solr (1.2.0+ds1-2) unstable; urgency=low
+
+  * Run unit tests during build (closes: #441890).
+  * Rename /usr/share/solr/bin directory to /usr/share/solr/scripts, since
+    this directory contains only scripts.
+  * Install link to config file in /etc/tomcat5.5/Catalina/localhost because
+    this is the new location in recent Tomcat packaging.
+  * Remove portions of the copyright file that referred to libraries that are
+    not shipped with the Debian package for Solr.
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. (closes: #444655).
+  * Add Portuguese translation of debconf messages (closes: #442306, #445351).
+  * Add Tamil translation of debconf messages (closes: #445284).
+  * Add Czech translation of debconf messages (closes: #445652).
+  * Add Finnish translation of debconf messages (closes: #445701).
+  * Add Russian translation of debconf messages (closes: #446140).
+  * Add German translation of debconf messages (closes: #446284).
+  * Add Galician translation of debconf messages (closes: #446607).
+  * Add Vietnamese translation of debconf messages (closes: #446986).
+  * Add Brazilian Portuguese translation of debconf messages (closes: #447091).
+  * Add French translation of debconf messages (closes: #447223).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 26 Nov 2007 12:02:17 +0100
+
+solr (1.2.0+ds1-1) unstable; urgency=low
+
+  * Initial upload (Closes: #426763)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 06 Sep 2007 22:50:49 +0200

Deleted: tags/solr/1.2.0+ds1-3/debian/control
===================================================================
--- trunk/solr/debian/control	2008-04-18 08:04:11 UTC (rev 6191)
+++ tags/solr/1.2.0+ds1-3/debian/control	2008-04-26 19:54:26 UTC (rev 6280)
@@ -1,67 +0,0 @@
-Source: solr
-Section: contrib/web
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/solr/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/solr/
-Build-Depends: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), po-debconf,
- sun-java5-jdk (>= 1.5.0),
- ant (>= 1.7.0), ant-optional (>= 1.7.0), 
- junit (>= 3.8.1.1), libeasymock-java (>= 2.3),
- libcommons-codec-java (>= 1.3),
- libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
- libcommons-fileupload-java (>= 1.2),
- libcommons-io-java (>= 1.3.1),
- libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.2),
- libxpp3-java (>= 1.1.3.4.0)
-Standards-Version: 3.7.2
-
-Package: solr-common
-Architecture: all
-Depends: debconf (>= 1.5),
- sun-java5-jre (>= 1.5.0) | sun-java6-jre (>= 6),
- libcommons-codec-java (>= 1.3),
- libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
- libcommons-fileupload-java (>= 1.2),
- libcommons-io-java (>= 1.3.1),
- libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.2),
- libxpp3-java (>= 1.1.3.4.0)
-Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
-Homepage: http://lucene.apache.org/solr/
-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, 
- faceted search, caching, replication, and a web administration 
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the common files for Solr. Install
- solr-tomcat5.5 or solr-jetty to use Solr under Tomcat or Jetty.
-
-Package: solr-tomcat5.5
-Architecture: all
-Depends: solr-common (>= ${binary:Version}), tomcat5.5 (>= 5.5.20)
-Conflicts: solr-jetty
-Homepage: http://lucene.apache.org/solr/
-Description: enterprise search server based on Lucene - Tomcat integration
- Solr is an open source enterprise search server based on the Lucene 
- Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
- faceted search, caching, replication, and a web administration 
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the Tomcat integration files for Solr. 
-
-Package: solr-jetty
-Architecture: all
-Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1)
-Conflicts: solr-tomcat5.5
-Homepage: http://lucene.apache.org/solr/
-Description: enterprise search server based on Lucene - Jetty integration
- Solr is an open source enterprise search server based on the Lucene 
- Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
- faceted search, caching, replication, and a web administration 
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the Jetty integration files for Solr. 

Copied: tags/solr/1.2.0+ds1-3/debian/control (from rev 6279, trunk/solr/debian/control)
===================================================================
--- tags/solr/1.2.0+ds1-3/debian/control	                        (rev 0)
+++ tags/solr/1.2.0+ds1-3/debian/control	2008-04-26 19:54:26 UTC (rev 6280)
@@ -0,0 +1,65 @@
+Source: solr
+Section: contrib/web
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
+Homepage: http://lucene.apache.org/solr/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/solr/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/solr/
+Build-Depends: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), po-debconf,
+ sun-java5-jdk (>= 1.5.0),
+ ant (>= 1.7.0), ant-optional (>= 1.7.0), 
+ junit (>= 3.8.1.1), libeasymock-java (>= 2.3),
+ libcommons-codec-java (>= 1.3),
+ libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
+ libcommons-fileupload-java (>= 1.2),
+ libcommons-io-java (>= 1.3.1),
+ libservlet2.4-java (>= 5.0.30),
+ liblucene2-java (>= 2.3),
+ libxpp3-java (>= 1.1.3.4.0)
+Standards-Version: 3.7.3
+
+Package: solr-common
+Architecture: all
+Depends: debconf (>= 1.5),
+ sun-java5-jre (>= 1.5.0) | sun-java6-jre (>= 6),
+ libcommons-codec-java (>= 1.3),
+ libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
+ libcommons-fileupload-java (>= 1.2),
+ libcommons-io-java (>= 1.3.1),
+ libservlet2.4-java (>= 5.0.30),
+ liblucene2-java (>= 2.3),
+ libxpp3-java (>= 1.1.3.4.0)
+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, 
+ faceted search, caching, replication, and a web administration 
+ interface. It runs in a Java servlet container such as Tomcat.
+ .
+ This package provides the common files for Solr. Install
+ solr-tomcat5.5 or solr-jetty to use Solr under Tomcat or Jetty.
+
+Package: solr-tomcat5.5
+Architecture: all
+Depends: solr-common (>= ${binary:Version}), tomcat5.5 (>= 5.5.20)
+Conflicts: solr-jetty
+Description: enterprise search server based on Lucene - Tomcat integration
+ Solr is an open source enterprise search server based on the Lucene 
+ Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
+ faceted search, caching, replication, and a web administration 
+ interface. It runs in a Java servlet container such as Tomcat.
+ .
+ This package provides the Tomcat integration files for Solr. 
+
+#Package: solr-jetty
+#Architecture: all
+#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 
+# Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
+# faceted search, caching, replication, and a web administration 
+# interface. It runs in a Java servlet container such as Tomcat.
+# .
+# This package provides the Jetty integration files for Solr. 

Deleted: tags/solr/1.2.0+ds1-3/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list	2008-04-18 08:04:11 UTC (rev 6191)
+++ tags/solr/1.2.0+ds1-3/debian/patches/00list	2008-04-26 19:54:26 UTC (rev 6280)
@@ -1,5 +0,0 @@
-01_remove-all-jarfiles.dpatch
-02_fix-solr-version.dpatch
-03_relocate-datadir.dpatch
-04_fix-lucene-lock-directory.dpatch
-05_use-debian-java-libraries.dpatch

Copied: tags/solr/1.2.0+ds1-3/debian/patches/00list (from rev 6227, trunk/solr/debian/patches/00list)
===================================================================
--- tags/solr/1.2.0+ds1-3/debian/patches/00list	                        (rev 0)
+++ tags/solr/1.2.0+ds1-3/debian/patches/00list	2008-04-26 19:54:26 UTC (rev 6280)
@@ -0,0 +1,6 @@
+01_remove-all-jarfiles.dpatch
+02_fix-solr-version.dpatch
+03_relocate-datadir.dpatch
+04_fix-lucene-lock-directory.dpatch
+05_use-debian-java-libraries.dpatch
+07_fix-for-lucene-2.3.dpatch

Copied: tags/solr/1.2.0+ds1-3/debian/patches/07_fix-for-lucene-2.3.dpatch (from rev 6227, trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch)
===================================================================
--- tags/solr/1.2.0+ds1-3/debian/patches/07_fix-for-lucene-2.3.dpatch	                        (rev 0)
+++ tags/solr/1.2.0+ds1-3/debian/patches/07_fix-for-lucene-2.3.dpatch	2008-04-26 19:54:26 UTC (rev 6280)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_fix-for-lucene-2.3.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for update to Lucene 2.3 (upstream SVN rev. 614789).
+
+ at DPATCH@
+diff -urNad solr~/src/java/org/apache/solr/analysis/StopFilterFactory.java solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
+--- solr~/src/java/org/apache/solr/analysis/StopFilterFactory.java	2008-04-22 16:47:42.000000000 +0200
++++ solr/src/java/org/apache/solr/analysis/StopFilterFactory.java	2008-04-22 16:49:19.000000000 +0200
+@@ -44,10 +44,12 @@
+       } catch (IOException e) {
+         throw new RuntimeException(e);
+       }
++    } else {
++      stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS, ignoreCase);
+     }
+   }
+ 
+-  private Set stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS);
++  private Set stopWords;
+   private boolean ignoreCase;
+ 
+   public TokenStream create(TokenStream input) {

Deleted: tags/solr/1.2.0+ds1-3/debian/rules
===================================================================
--- trunk/solr/debian/rules	2008-04-18 08:04:11 UTC (rev 6191)
+++ tags/solr/1.2.0+ds1-3/debian/rules	2008-04-26 19:54:26 UTC (rev 6280)
@@ -1,97 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-#
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# UPSTREAM_VERSION is what Apache Solr thinks its version is
-# DEB_UPSTREAM_VERSION is the Debian source package version (with the +dsN)
-UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*")
-UPSTREAM_BASENAME = apache-solr-$(UPSTREAM_VERSION)
-WARFILE = $(UPSTREAM_BASENAME).war
-CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
-
-COMMON_INSTDIR=$(CURDIR)/debian/solr-common
-TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat5.5
-JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
-SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
-
-# We should like to build with gcj, but solr fails the unit
-# tests with gcj. Use Sun's java 1.5.0 instead.
-#JAVA_HOME = /usr/lib/jvm/java-gcj
-JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
-JAR = $(JAVA_HOME)/bin/jar
-
-# Set ant parameters
-DEB_ANT_BUILD_TARGET = compile javadoc dist-war
-DEB_ANT_CHECK_TARGET = test
-DEB_JARS = ant-junit junit
-
-DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt
-
-cleanbuilddir:: build.xml
-build.xml:
-	debian/rules restore-from-source
-
-clean::
-	rm -rf example/solr/data/index
-	rm -f debian/solr-keyring.gpg
-
-install/solr-common::
-	# First unpack the .war file, we need most of it.
-	cd $(SHAREDIR) ; $(JAR) xf $(CURDIR)/dist/$(WARFILE) 
-	mv $(SHAREDIR)/WEB-INF/web.xml $(COMMON_INSTDIR)/etc/solr/
-	
-	# Install replication scripts
-	install src/scripts/* $(SHAREDIR)/scripts
-	
-	# Install Solr configuration files
-	# FIXME: this is example configuration, including example schema
-	# Should be changed to some minimal config, with pointers
-	# to documentation
-	cp -r $(CURDIR)/example/solr/conf/* $(COMMON_INSTDIR)/etc/solr/conf/
-	
-	# This information is already in debian/copyright
-	rm -f $(COMMON_INSTDIR)/usr/share/solr/META-INF/LICENSE.txt
-
-install/solr-tomcat5.5::
-	# Configure tomcat (also see solr-tomcat5.5.links)
-	install --mode 0644 debian/solr-tomcat5.5.xml $(TOMCAT_INSTDIR)/etc/solr/
-	install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/tomcat.policy
-
-install/solr-jetty::
-	# Configure Jetty
-	install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/
-
-remove-source:
-	rm -f build.xml
-	rm -f *.txt
-	rm -f *stamp
-	rm -rf debian/patched
-	rm -rf build dist docs example lib src
-	rm -rf apache-solr*
-
-restore-from-source: remove-source ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	tar xzf ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	mv $(UPSTREAM_BASENAME)/* .
-	rmdir $(UPSTREAM_BASENAME)
-
-get-orig-source: ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-
-../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz:
-	debian/get-orig-source
-
-check:
-	lintian -i $(CHANGESFILE)
-	linda -i $(CHANGESFILE)
-	zgrep "^---" ../solr_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
-	( dpkg --contents ../solr-common_$(DEB_VERSION)_all.deb ; \
-	  dpkg --contents ../solr-tomcat5.5_$(DEB_VERSION)_all.deb ; \
-	  dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ) | less
-
-upload:
-	dupload -t mentors $(CHANGESFILE)

Copied: tags/solr/1.2.0+ds1-3/debian/rules (from rev 6227, trunk/solr/debian/rules)
===================================================================
--- tags/solr/1.2.0+ds1-3/debian/rules	                        (rev 0)
+++ tags/solr/1.2.0+ds1-3/debian/rules	2008-04-26 19:54:26 UTC (rev 6280)
@@ -0,0 +1,98 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# UPSTREAM_VERSION is what Apache Solr thinks its version is
+# DEB_UPSTREAM_VERSION is the Debian source package version (with the +dsN)
+UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*")
+UPSTREAM_BASENAME = apache-solr-$(UPSTREAM_VERSION)
+WARFILE = $(UPSTREAM_BASENAME).war
+CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
+
+COMMON_INSTDIR=$(CURDIR)/debian/solr-common
+TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat5.5
+JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
+SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
+
+# We should like to build with gcj, but solr fails the unit
+# tests with gcj. Use Sun's java 1.5.0 instead.
+#JAVA_HOME = /usr/lib/jvm/java-gcj
+JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
+JAR = $(JAVA_HOME)/bin/jar
+
+# Set ant parameters
+DEB_ANT_BUILD_TARGET = compile javadoc dist-war
+DEB_ANT_CHECK_TARGET = test
+DEB_JARS = ant-junit junit
+
+DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt
+
+cleanbuilddir:: build.xml
+build.xml:
+	debian/rules restore-from-source
+
+clean::
+	rm -rf example/solr/data/index
+	rm -f debian/solr-keyring.gpg
+
+install/solr-common::
+	# First unpack the .war file, we need most of it.
+	cd $(SHAREDIR) ; $(JAR) xf $(CURDIR)/dist/$(WARFILE) 
+	mv $(SHAREDIR)/WEB-INF/web.xml $(COMMON_INSTDIR)/etc/solr/
+	
+	# Install replication scripts
+	install src/scripts/* $(SHAREDIR)/scripts
+	
+	# Install Solr configuration files
+	# FIXME: this is example configuration, including example schema
+	# Should be changed to some minimal config, with pointers
+	# to documentation
+	cp -r $(CURDIR)/example/solr/conf/* $(COMMON_INSTDIR)/etc/solr/conf/
+	
+	# This information is already in debian/copyright
+	rm -f $(COMMON_INSTDIR)/usr/share/solr/META-INF/LICENSE.txt
+
+install/solr-tomcat5.5::
+	# Configure tomcat (also see solr-tomcat5.5.links)
+	install --mode 0644 debian/solr-tomcat5.5.xml $(TOMCAT_INSTDIR)/etc/solr/
+	install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/tomcat.policy
+
+#install/solr-jetty::
+#	# Configure Jetty
+#	install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/
+
+remove-source:
+	rm -f build.xml
+	rm -f *.txt
+	rm -f *stamp
+	rm -rf debian/patched
+	rm -rf build dist docs example lib src
+	rm -rf apache-solr*
+
+restore-from-source: remove-source ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	tar xzf ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	mv $(UPSTREAM_BASENAME)/* .
+	rmdir $(UPSTREAM_BASENAME)
+
+get-orig-source: ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+
+../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz:
+	debian/get-orig-source
+
+check:
+	lintian -i $(CHANGESFILE)
+	linda -i $(CHANGESFILE)
+	zgrep "^---" ../solr_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
+	( dpkg --contents ../solr-common_$(DEB_VERSION)_all.deb ; \
+	  dpkg --contents ../solr-tomcat5.5_$(DEB_VERSION)_all.deb ; \
+	) | less
+	  #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
+
+upload:
+	dupload -t mentors $(CHANGESFILE)




More information about the pkg-java-commits mailing list