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

Tue Aug 7 20:13:04 UTC 2007

Author: janpascal-guest
Date: 2007-08-07 20:13:04 +0000 (Tue, 07 Aug 2007)
New Revision: 4001

Modified:
   trunk/solr/debian/ant.properties
   trunk/solr/debian/changelog
   trunk/solr/debian/copyright
   trunk/solr/debian/get-orig-source
   trunk/solr/debian/rules
   trunk/solr/debian/solr-common.dirs
   trunk/solr/debian/solr-common.docs
Log:
Repackage upstream source without .jars and generated stuff

Modified: trunk/solr/debian/ant.properties
===================================================================

--- trunk/solr/debian/ant.properties	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/ant.properties	2007-08-07 20:13:04 UTC (rev 4001)
@@ -7,3 +7,4 @@
 build.compiler=javac1.5
 compile.debug=on
 compile.optimize=on
+ant.library.dir=/usr/share/ant/lib

Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/changelog	2007-08-07 20:13:04 UTC (rev 4001)
@@ -1,3 +1,10 @@
+solr (1.2.0+ds1-1~pre2) unstable; urgency=low
+
+  * Repackaged upstream without the included .jar files, .war file, generated
+    API docs
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 07 Aug 2007 21:53:27 +0200
+
 solr (1.2.0-1~pre1) unstable; urgency=low
 
   * Initial upload (Closes: #426763)

Modified: trunk/solr/debian/copyright
===================================================================
--- trunk/solr/debian/copyright	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/copyright	2007-08-07 20:13:04 UTC (rev 4001)
@@ -3,8 +3,10 @@
 
 It was downloaded from
     http://www.apache.org/dist/lucene/solr/1.2/apache-solr-1.2.tgz
-Run debian/rules get-orig-source to get the original source tarball and check
-the GPG signature on it.
+and then superflous library .jars and generated .jars, .war and Javadoc
+was removed to generate the .orig.tar.gz file. Run 
+    debian/rules get-orig-source 
+to download the source tarball from Apache and repack it into the Debian source.
 
 Apache Solr is 
     Copyright 2007 The Apache Software Foundation

Modified: trunk/solr/debian/get-orig-source
===================================================================
--- trunk/solr/debian/get-orig-source	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/get-orig-source	2007-08-07 20:13:04 UTC (rev 4001)
@@ -11,16 +11,18 @@
 URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
 VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
 
-SOURCEFILE=../solr_$VERSION.orig.tar.gz
-SIGFILE=../solr_$VERSION.orig.tar.gz.asc
+DESTDIR=$PWD/..
+UPSTREAM_SOURCE=$DESTDIR/apache-solr-$VERSION.tgz
+UPSTREAM_SIG=$DESTDIR/apache-solr-$VERSION.tgz.asc
+ORIGFILE=$DESTDIR/solr_$VERSION+ds1.orig.tar.gz
 
 KEYURL="http://www.apache.org/dist/lucene/solr/KEYS.txt"
 KEYFILE="debian/KEYS.txt"
 KEYRING="debian/solr-keyring.gpg"
 
 # Download source tarball and signature file
-wget "$URL" -O $SOURCEFILE
-wget "$URL.asc" -O $SIGFILE
+wget "$URL" -O $UPSTREAM_SOURCE
+wget "$URL.asc" -O $UPSTREAM_SIG
 
 # If necessary, recreate keyring used for signing
 # Only do this if the keyring is not yet downloaded
@@ -34,6 +36,27 @@
 fi
 
 # Check signature
-gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
+gpgv --quiet --keyring $KEYRING $UPSTREAM_SIG $UPSTREAM_SOURCE
 
 echo "Check whether the archive has been signed by Yorick Seeley, key ID 0AFCEE7C"
+
+# Repackage upstream source file without the third party jars
+TEMPDIR=`mktemp -d`
+echo "Unpacking into tempdir $TEMPDIR..."
+tar xzf $UPSTREAM_SOURCE -C $TEMPDIR
+
+echo "Removing third party jars, wars, and generated API docs..."
+find $TEMPDIR -name \*.jar -exec rm {} \;
+find $TEMPDIR -name \*.war -exec rm {} \;
+rm -rf $TEMPDIR/apache-solr-$VERSION/dist
+rm -rf $TEMPDIR/apache-solr-$VERSION/docs/api
+
+echo "Packing new orig source tarball $ORIGFILE..."
+rm -f $ORIGFILE
+cd $TEMPDIR
+GZIP=--best tar czf $ORIGFILE *
+cd $DESTDIR
+
+echo "Removing tempdir..."
+rm -rf "$TEMPDIR"
+

Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/rules	2007-08-07 20:13:04 UTC (rev 4001)
@@ -8,7 +8,10 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-UPSTREAM_BASENAME = apache-solr-$(DEB_UPSTREAM_VERSION)
+# 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
 
@@ -17,12 +20,12 @@
 JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
 SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
 
-# Explicitly build with sun-java5-jdk
+# Explicitly build with sun-java5-jdk; gcj-java does not handle Solr (yet)
 JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
 JAR = $(JAVA_HOME)/bin/jar
 
 # Set ant parameters
-DEB_ANT_BUILD_TARGET = compile dist-war
+DEB_ANT_BUILD_TARGET = compile javadoc dist-war
 # ant test needs easymock which is not in Debian
 #DEB_ANT_CHECK_TARGET = test
 DEB_JARS = ant-junit junit

Modified: trunk/solr/debian/solr-common.dirs
===================================================================
--- trunk/solr/debian/solr-common.dirs	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/solr-common.dirs	2007-08-07 20:13:04 UTC (rev 4001)
@@ -4,5 +4,5 @@
 /usr/share/solr/bin
 /var/lib/solr
 /var/lib/solr/data
-/usr/share/doc/solr/examples 
+/usr/share/doc/solr-common/examples 
 

Modified: trunk/solr/debian/solr-common.docs
===================================================================
--- trunk/solr/debian/solr-common.docs	2007-08-07 13:29:01 UTC (rev 4000)
+++ trunk/solr/debian/solr-common.docs	2007-08-07 20:13:04 UTC (rev 4001)
@@ -2,3 +2,4 @@
 NOTICE.txt
 README.txt
 docs/
+build/docs


