[pkg-java] r8712 - trunk/solr/debian
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Wed Jul 1 19:57:31 UTC 2009
Author: janpascal-guest
Date: 2009-07-01 19:57:31 +0000 (Wed, 01 Jul 2009)
New Revision: 8712
Added:
trunk/solr/debian/solr-tomcat6.dirs
trunk/solr/debian/solr-tomcat6.links
trunk/solr/debian/solr-tomcat6.postinst
trunk/solr/debian/solr-tomcat6.postrm
trunk/solr/debian/solr-tomcat6.xml
Removed:
trunk/solr/debian/solr-tomcat5.5.dirs
trunk/solr/debian/solr-tomcat5.5.links
trunk/solr/debian/solr-tomcat5.5.postinst
trunk/solr/debian/solr-tomcat5.5.postrm
trunk/solr/debian/solr-tomcat5.5.xml
Modified:
trunk/solr/debian/changelog
trunk/solr/debian/control
trunk/solr/debian/rules
Log:
Foreport remaing changes from the 1.2.0+ds2 branch
Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/changelog 2009-07-01 19:57:31 UTC (rev 8712)
@@ -1,16 +1,60 @@
solr (1.3.0+ds1-1) UNRELEASED; urgency=low
* New upstream release (1.3.0).
- * Fixed debian/watch for new upstream directory name schema.
* Added workaround of bug #452586 in Jetty to debian/README.Debian. Note
that solr-jetty is still disabled because Jetty has been removed from
Lenny.
- * Added DM-Upload-Allowed: yes to debian/control.
- * Updated Galician translation
* Removed dependency on javanet staxutils (see upstream issue SOLR-851).
- -- Jan-Pascal van Best <janpascal at vanbest.org> Wed, 01 Jul 2009 13:20:24 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Wed, 01 Jul 2009 20:54:28 +0200
+solr (1.2.0+ds2-6) unstable; urgency=low
+
+ * Update dependency from tomcat5.5 to tomcat6. Closes: #526259.
+ * Bump Standards-Version to 3.8.1 (no changes needed).
+ * Remove dpkg-statoverride stuff from solr-tomcat6.postinst. It's not needed
+ and does not work.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 23 Jun 2009 15:37:07 +0200
+
+solr (1.2.0+ds2-5) unstable; urgency=low
+
+ * Use tomcat.policy symlink in original direction and have symlink
+ set by maintainer scripts to prevent problems with solr upgrades.
+ Closes: #516288.
+ * Have solr-tomcat5.5 depend on solr-common with the exact same version
+ to prevent later problems.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 27 Feb 2009 22:47:55 +0100
+
+solr (1.2.0+ds2-4) unstable; urgency=low
+
+ * Updated watch file
+ * Add ${misc:Depends} to debian/control to take into account indirect
+ dependencies from debhelper
+ * Added depenency on libxpp3-java (typo in control file, closes: #483261).
+ * Moved /etc/solr/tomcat.policy to /etc/tomcat5.5/policy.d/ and reversed
+ symlink. Closes: #515945.
+ * Remove /etc/tomcat5/policy.d from solr-tomcat5.5.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 19 Feb 2009 20:48:07 +0100
+
+solr (1.2.0+ds2-3) unstable; urgency=low
+
+ * Update Galician translations in gl.po (closes: 513148).
+ * Update to compile with Lucene 2.4.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Wed, 28 Jan 2009 13:30:55 +0100
+
+solr (1.2.0+ds2-2) unstable; urgency=low
+
+ * Fix Swedish translation of debconf messages by renaming se.po to sv.po
+ (closes: #483416).
+ * Added DM-Upload-Allowed: yes to debian/control
+ * Restricted dependency on liblucene2-java to version << 2.4.0
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Mon, 13 Oct 2008 11:54:46 +0200
+
solr (1.2.0+ds2-1) unstable; urgency=low
* New (fake) upstream version to work around a bug in dak.
Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/control 2009-07-01 19:57:31 UTC (rev 8712)
@@ -21,11 +21,12 @@
libtomcat6-java (>= 6.0.20),
libservlet2.5-java (>= 6.0.20),
libjetty-java (>= 6.1.18)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Package: solr-common
Architecture: all
-Depends: debconf (>= 1.5),
+Depends: ${misc:Depends},
+ debconf (>= 1.5),
openjdk-6-jre (>= 6b11-5) | java5-runtime,
libcommons-codec-java (>= 1.3),
libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
@@ -45,9 +46,9 @@
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
+Package: solr-tomcat6
Architecture: all
-Depends: solr-common (>= ${binary:Version}), tomcat5.5 (>= 5.5.20)
+Depends: ${misc:Depends}, solr-common (= ${binary:Version}), tomcat6 (>= 6.0.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
@@ -59,8 +60,8 @@
#Package: solr-jetty
#Architecture: all
-#Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1.14-1)
-#Conflicts: solr-tomcat5.5
+#Depends: ${misc:Depends), solr-common (= ${binary:Version}), jetty (>= 5.1.14-1)
+#Conflicts: solr-tomcat6
#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,
Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/rules 2009-07-01 19:57:31 UTC (rev 8712)
@@ -4,7 +4,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/ant.mk
-#include /usr/share/cdbs/1/class/maven.mk
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
@@ -17,7 +16,7 @@
CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
COMMON_INSTDIR=$(CURDIR)/debian/solr-common
-TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat5.5
+TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat6
JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
@@ -40,17 +39,8 @@
clean::
rm -f debian/solr-keyring.gpg
- #rm -f src/test/test-files/solr/data/spellcheckerFile/*
- #rm -f src/test/test-files/solr/data/spellchecker1/*
- #rm -f src/test/test-files/solr/data/spellchecker2/*
- #rm -f src/test/test-files/solr/data/spellchecker3/*
- #rm -f src/test/test-files/solr/data/index/*
- #rm -f src/test/test-files/solr/data/*
rm -rf src/test/test-files/solr/data
- #rm -f example/solr/data/index/*
rm -rf example/solr/data
- #rm -f example/multicore/core0/data/index/*
- #rm -f example/multicore/core1/data/index/*
rm -rf example/multicore/core0/data
rm -rf example/multicore/core1/data
@@ -80,10 +70,10 @@
rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/scripts
rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/translations
-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-tomcat6::
+ # Configure tomcat (also see solr-tomcat6.links)
+ install --mode 0644 debian/solr-tomcat6.xml $(TOMCAT_INSTDIR)/etc/solr/
+ install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/
#install/solr-jetty::
# # Configure Jetty
@@ -110,10 +100,6 @@
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 ; \
+ dpkg --contents ../solr-tomcat6_$(DEB_VERSION)_all.deb ; \
) | less
#dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
-
-upload:
- dupload -t mentors $(CHANGESFILE)
Deleted: trunk/solr/debian/solr-tomcat5.5.dirs
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.dirs 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/solr-tomcat5.5.dirs 2009-07-01 19:57:31 UTC (rev 8712)
@@ -1,4 +0,0 @@
-/etc/solr
-/etc/tomcat5/policy.d
-/var/lib/solr
-/var/lib/solr/data
Deleted: trunk/solr/debian/solr-tomcat5.5.links
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.links 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/solr-tomcat5.5.links 2009-07-01 19:57:31 UTC (rev 8712)
@@ -1,2 +0,0 @@
-/etc/solr/solr-tomcat5.5.xml /etc/tomcat5.5/Catalina/localhost/solr.xml
-/etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy
Deleted: trunk/solr/debian/solr-tomcat5.5.postinst
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.postinst 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/solr-tomcat5.5.postinst 2009-07-01 19:57:31 UTC (rev 8712)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-set -e
-# Not needed
-# . /usr/share/debconf/confmodule
-
-# If proper permissions for the stuff under /var/lib/solr haven't
-# been set, set them now
-
-case "$1" in
- configure)
-
- if ! dpkg-statoverride --quiet --list /var/lib/solr > /dev/null; then
- dpkg-statoverride --quiet --update --add tomcat55 root 0750 /var/lib/solr
- fi
-
- if ! dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
- dpkg-statoverride --quiet --update --add tomcat55 root 0750 /var/lib/solr/data
- fi
-
- if [ -d /var/lib/solr/data/index ]; then
- chown -R tomcat55:root /var/lib/solr/data
- fi
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-invoke-rc.d --quiet tomcat5.5 restart || {
- RESULT=$?
- # Ignore if tomcat5.5 init script does not exist (yet)
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
-}
-
-#DEBHELPER#
Deleted: trunk/solr/debian/solr-tomcat5.5.postrm
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.postrm 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/solr-tomcat5.5.postrm 2009-07-01 19:57:31 UTC (rev 8712)
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove)
-
- # If permissions for the stuff under /var/lib/solr haven't
- # been removed, remove them now
- if [ -x /usr/sbin/dpkg-statoverride ]; then
- if dpkg-statoverride --quiet --list /var/lib/solr > /dev/null ; then
- dpkg-statoverride --quiet --remove /var/lib/solr
- fi
-
- if dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
- dpkg-statoverride --quiet --remove /var/lib/solr/data
- fi
- fi
-
- # Is there a way not to restart tomcat if it is due to be removed, too?
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d tomcat5.5 restart || true
- fi
-
- ;;
-
- upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- # do nothing
-
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
Deleted: trunk/solr/debian/solr-tomcat5.5.xml
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.xml 2009-07-01 18:53:11 UTC (rev 8711)
+++ trunk/solr/debian/solr-tomcat5.5.xml 2009-07-01 19:57:31 UTC (rev 8712)
@@ -1,11 +0,0 @@
-<!--
- Context configuration file for the Solr Web App
--->
-
-<Context path="/solr" docBase="/usr/share/solr"
- debug="0" privileged="true" allowLinking="true" crossContext="true">
- <!-- make symlinks work in Tomcat 5 -->
- <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
-
- <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" />
-</Context>
Added: trunk/solr/debian/solr-tomcat6.dirs
===================================================================
--- trunk/solr/debian/solr-tomcat6.dirs (rev 0)
+++ trunk/solr/debian/solr-tomcat6.dirs 2009-07-01 19:57:31 UTC (rev 8712)
@@ -0,0 +1,4 @@
+/etc/solr
+/etc/tomcat6/policy.d
+/var/lib/solr
+/var/lib/solr/data
Added: trunk/solr/debian/solr-tomcat6.links
===================================================================
--- trunk/solr/debian/solr-tomcat6.links (rev 0)
+++ trunk/solr/debian/solr-tomcat6.links 2009-07-01 19:57:31 UTC (rev 8712)
@@ -0,0 +1 @@
+/etc/solr/solr-tomcat6.xml /etc/tomcat6/Catalina/localhost/solr.xml
Added: trunk/solr/debian/solr-tomcat6.postinst
===================================================================
--- trunk/solr/debian/solr-tomcat6.postinst (rev 0)
+++ trunk/solr/debian/solr-tomcat6.postinst 2009-07-01 19:57:31 UTC (rev 8712)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+# If proper permissions for the stuff under /var/lib/solr haven't
+# been set, set them now
+
+case "$1" in
+ configure)
+
+ # fixup for upgrade from solr-tomcat55, wich makes this tomcat55:root 750
+ chown root:root /var/lib/solr
+ chmod 755 /var/lib/solr
+
+ chown -R tomcat6:tomcat6 /var/lib/solr/data
+ chmod -R 770 /var/lib/solr/data
+
+ ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+invoke-rc.d --quiet tomcat6 restart || {
+ RESULT=$?
+ # Ignore if tomcat6 init script does not exist (yet)
+ if [ $RESULT != 100 ]; then
+ exit $RESULT
+ fi
+}
+
+#DEBHELPER#
Added: trunk/solr/debian/solr-tomcat6.postrm
===================================================================
--- trunk/solr/debian/solr-tomcat6.postrm (rev 0)
+++ trunk/solr/debian/solr-tomcat6.postrm 2009-07-01 19:57:31 UTC (rev 8712)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove)
+
+ rm -f /etc/tomcat6/policy.d/05solr.policy
+
+ # Is there a way not to restart tomcat if it is due to be removed, too?
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d tomcat6 restart || true
+ fi
+
+ ;;
+
+ upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ # do nothing
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+#DEBHELPER#
Added: trunk/solr/debian/solr-tomcat6.xml
===================================================================
--- trunk/solr/debian/solr-tomcat6.xml (rev 0)
+++ trunk/solr/debian/solr-tomcat6.xml 2009-07-01 19:57:31 UTC (rev 8712)
@@ -0,0 +1,11 @@
+<!--
+ Context configuration file for the Solr Web App
+-->
+
+<Context path="/solr" docBase="/usr/share/solr"
+ debug="0" privileged="true" allowLinking="true" crossContext="true">
+ <!-- make symlinks work in Tomcat -->
+ <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
+
+ <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" />
+</Context>
More information about the pkg-java-commits
mailing list