[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792

[James Page]

The following commit has been merged in the master branch:
commit 2080542d3dd6ce062edb382b15576abc74b8d8ad
Author: James Page <james.page at ubuntu.com>
Date:   Mon May 28 09:34:56 2012 +0100

    General tidy of debian/* to remove cruft and minimize files

diff --git a/debian/liblucene3-java.docs b/debian/liblucene3-java.docs
index 31890ce..f4f097a 100644
--- a/debian/liblucene3-java.docs
+++ b/debian/liblucene3-java.docs
@@ -1,3 +1,2 @@
-lucene/BUILD.txt
 lucene/NOTICE.txt
 lucene/README.txt
diff --git a/debian/solr-common.docs b/debian/libsolr-java.docs
similarity index 100%
copy from debian/solr-common.docs
copy to debian/libsolr-java.docs
diff --git a/debian/rules b/debian/rules
index b35bcc2..076738b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ override_dh_auto_build:
 	ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
 		-Dversion=$(DEB_UPSTREAM_VERSION) jar-core docs javadocs build-contrib
 	ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
-		-Dversion=$(DEB_UPSTREAM_VERSION) dist-war
+		-Dversion=$(DEB_UPSTREAM_VERSION) dist-war javadocs
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
diff --git a/debian/solr-common.dirs b/debian/solr-common.dirs
index 98f30a3..db577bd 100644
--- a/debian/solr-common.dirs
+++ b/debian/solr-common.dirs
@@ -1,4 +1,2 @@
-/etc/solr
-/usr/share/solr/WEB-INF/lib/
 /var/lib/solr/data
 /var/log/solr
diff --git a/debian/solr-common.install b/debian/solr-common.install
index 6b59360..ffc005d 100644
--- a/debian/solr-common.install
+++ b/debian/solr-common.install
@@ -1,5 +1,3 @@
-# This needs to be in libsolr-java
-#solr/dist/*.jar /usr/share/solr/WEB-INF/lib/
 solr/build/web/* /usr/share/solr/
 solr/example/solr/conf /etc/solr
 solr/scripts/* /usr/share/solr/bin
diff --git a/debian/solr-jetty.dirs b/debian/solr-jetty.dirs
deleted file mode 100644
index 58d8c8a..0000000
--- a/debian/solr-jetty.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/jetty/webapps
-/usr/share/solr/WEB-INF
-
diff --git a/debian/solr-jetty.postinst b/debian/solr-jetty.postinst
index bdc8894..fd0c895 100644
--- a/debian/solr-jetty.postinst
+++ b/debian/solr-jetty.postinst
@@ -1,16 +1,13 @@
 #!/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/solri3 > /dev/null; then
+        if ! dpkg-statoverride --quiet --list /var/lib/solr > /dev/null; then
             dpkg-statoverride --quiet --update --add jetty root 0750 /var/lib/solr
         fi
 
@@ -26,7 +23,7 @@ case "$1" in
             RESULT=$?
             # Ignore if jetty init script does not exist (yet)
             if [ $RESULT != 100 ]; then
-            exit $RESULT
+                exit $RESULT
             fi
         }
     ;;
diff --git a/debian/solr-jetty.postrm b/debian/solr-jetty.postrm
index de17d69..3edc322 100644
--- a/debian/solr-jetty.postrm
+++ b/debian/solr-jetty.postrm
@@ -16,7 +16,6 @@ case "$1" in
     	    fi
     	fi
 
-    	# Is there a way not to restart Jetty if it is due to be removed, too?
     	if [ -x /usr/sbin/invoke-rc.d ]; then
     	    invoke-rc.d jetty restart || true
     	fi
diff --git a/debian/solr-tomcat.dirs b/debian/solr-tomcat.dirs
deleted file mode 100644
index e985a36..0000000
--- a/debian/solr-tomcat.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-/etc/solr
-/etc/tomcat7/policy.d 
-/var/lib/solr
-/var/lib/solr/data
diff --git a/debian/solr-tomcat.postinst b/debian/solr-tomcat.postinst
index 94305fc..f08c7e0 100644
--- a/debian/solr-tomcat.postinst
+++ b/debian/solr-tomcat.postinst
@@ -32,7 +32,7 @@ invoke-rc.d --quiet tomcat7 restart || {
     RESULT=$?
     # Ignore if tomcat7 init script does not exist (yet)
     if [ $RESULT != 100 ]; then
-	exit $RESULT
+	    exit $RESULT
     fi
 }
 
diff --git a/debian/solr-tomcat.postrm b/debian/solr-tomcat.postrm
index 0fcd0a2..cb4fe35 100644
--- a/debian/solr-tomcat.postrm
+++ b/debian/solr-tomcat.postrm
@@ -5,7 +5,6 @@ set -e
 case "$1" in
     remove)
         rm -f /etc/tomcat7/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 tomcat7 restart || true
     	fi

-- 
lucene-solr packaging