From 4652b4d2998ce0c39958b1e953f594d5269bcf80 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 18 Sep 2009 12:30:22 +0000
Subject: [PATCH] fixed debian package

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6327 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 build.xml        | 231 +++++------------------------------------------
 debian/changelog |   2 +-
 2 files changed, 25 insertions(+), 208 deletions(-)

diff --git a/build.xml b/build.xml
index 91241372f..df422a6fe 100644
--- a/build.xml
+++ b/build.xml
@@ -170,7 +170,7 @@
     </javadoc>
   </target>
 	
-  <target name="compile" depends="init" description="compile YaCy core and YaCy servlets">
+  <target name="compile-core" depends="init" description="compile YaCy core">
     <!-- defining the classpath that should be used for compiling -->
     <path id="project.class.path">
         <pathelement location="${build}" />
@@ -219,6 +219,15 @@
       <compilerarg value="-Xlint"/>
     </javac>
 
+  </target>
+
+  <target name="compile" depends="compile-core" description="compile YaCy core and YaCy servlets">
+    <!-- defining the classpath that should be used for compiling -->
+    <path id="project.class.path">
+      <pathelement location="${build}" />
+      <pathelement location="${htroot}" />
+    </path>
+
     <!-- compile htroot, htroot/yacy and htroot/htdocsdefault -->
     <javac srcdir="${htroot}/"
     	   excludes="processing/**"
@@ -229,44 +238,20 @@
     </javac>
   </target>
 
-  <target name="compileHtdocsWWW" depends="compile" description="compile and zip user-specific servlets">
-    <!-- defining the classpath that should be used for compiling -->
-    <path id="htdocsWWW.class.path">
-      <pathelement location="${build}"/>
-      <pathelement location="${htroot}"/>
-
-      <!-- userspecific libs -->
-      <pathelement location="${htdocsWWW}/lib/*.jar" />
-      <pathelement location="${htdocsWWW}/" />
-    </path>
-
-    <!-- compile htroot, htroot/yacy and htroot/htdocsdefault -->
-    <javac srcdir="${htdocsWWW}/"
-           classpathref="htdocsWWW.class.path"
-           debug="true" debuglevel="lines,vars,source"
-           source="${javacSource}" target="${javacTarget}" />
-  </target>
-
   <target name="all" depends="compile">
   </target>
 
-  <target name="copyMain4Dist" depends="compile">
-
-    <!-- make a jar file for the YaCy core -->
-    <jar jarfile="${lib}/yacycore.jar" basedir="${build}"/>
-
+  <target name="copyMain4Dist" depends="build-jar">
   	<!-- copy all libs -->
   	    <copy todir="${release_main}/lib">
   	      <fileset dir="${lib}" 
   	               includes="**/*"/>
-  	               
   	    </copy>
   	
   	<!-- copy build libs -->
   	    <copy todir="${release_main}/libbuild">
   	      <fileset dir="${libbuild}" 
   	               includes="**/*"/>
-  	               
   	    </copy>
 
     <!-- copy configuration files -->
@@ -282,10 +267,10 @@
     </copy>
 
   	<!-- copy defaults -->
-  	    <copy todir="${release_main}/defaults">
-  	      <fileset dir="${defaults}" 
-  	               includes="**/*"/>
-  	    </copy>
+    <copy todir="${release_main}/defaults">
+      <fileset dir="${defaults}" 
+               includes="**/*"/>
+    </copy>
 
   	<!-- copy Unix wrappers -->
     <copy todir="${release_main}">
@@ -307,11 +292,6 @@
         <include name="startYACY_debug.bat"/>
         <include name="stopYACY.bat"/>
       	<include name="getWin32MaxHeap.bat"/>
-      	<!--
-        <include name="startYACY_Win9x.bat"/>
-        <include name="startYACY_noconsole_Win9x.bat"/>
-        <include name="stopYACY_Win9x.bat"/>
-        -->
       </fileset>
     </copy>
     <copy todir="${release_main}" file="yacy.exe" failonerror="false"/>
@@ -397,156 +377,6 @@
 
   </target>
 
-  <target name="copyMain4SourceDist" depends="init,clean">
-    <!-- copy main class files -->
-    <copy todir="${release_source}/classes" failonerror="false">
-      <fileset dir="${build}">
-        <include name="**/*.*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy libs -->
-    <copy todir="${release_source}/lib">
-      <fileset dir="${lib}" 
-               includes="**/*"/>
-               
-    </copy>
-    <copy todir="${release_source}/libt">
-      <fileset dir="${libt}" 
-               includes="**/*"/>
-               
-    </copy>
-    <copy todir="${release_source}/libbuild">
-      <fileset dir="${libbuild}" 
-               includes="**/*"/>
-               
-    </copy>
-
-    <!-- copy configuration files -->
-    <copy todir="${release_source}">
-      <fileset dir=".">
-        <include name="yacy.logging"/>
-        <include name="yacy.yellow"/>
-        <include name="yacy.badwords.example"/>
-        <include name="yacy.stopwords"/>
-        <include name="yacy.parser"/>
-        <include name="httpd.mime"/>
-        <include name="superseed.txt"/>
-      </fileset>
-    </copy>
-
-  	<!-- copy defaults -->
-  	    <copy todir="${release_source}/defaults">
-  	      <fileset dir="${defaults}" 
-  	               includes="**/*"/>
-  	    </copy>
-
-  	<!-- copy Unix wrappers -->
-    <copy todir="${release_source}">
-      <fileset dir=".">
-        <include name="startYACY.sh"/>
-        <include name="stopYACY.sh"/>
-        <include name="killYACY.sh"/>
-        <include name="restart.sh"/>
-        <include name="startYACY.command"/>
-        <include name="stopYACY.command"/>
-      </fileset>
-    </copy>
-
-    <!-- copy other wrappers -->
-    <copy todir="${release_source}">
-      <fileset dir=".">
-        <include name="startYACY.bat"/>
-        <include name="startYACY_noconsole.bat"/>
-        <include name="stopYACY.bat"/>
-      	<include name="getWin32MaxHeap.bat"/>
-      	<!--
-        <include name="startYACY_Win9x.bat"/>
-        <include name="startYACY_noconsole_Win9x.bat"/>
-        <include name="stopYACY_Win9x.bat"/>
-        -->
-      </fileset>
-    </copy>
-
-    <!-- copy locales  -->
-    <copy todir="${release_source}/locales">
-      <fileset dir="${locales}">
-        <include name="*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy skins  -->
-    <copy todir="${release_source}/skins">
-      <fileset dir="${skins}">
-        <include name="*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy language statistics files -->
-    <copy todir="${release_source}/langstats">
-      <fileset dir="${langstats}">
-        <include name="*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy documentation -->
-    <copy todir="${release_source}">
-      <fileset dir=".">
-        <include name="readme.txt"/>
-        <include name="gpl.txt"/>
-        <include name="ChangeLog"/>
-      	<include name="AUTHORS"/>
-      	<include name="COPYRIGHT"/>
-      	<include name="NOTICE"/>
-      </fileset>
-    </copy>
-
-    <!-- copy source code -->
-    <copy todir="${release_source}/source">
-      <fileset dir="${src}">
-        <include name="**/*.*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy server pages -->
-    <copy todir="${release_source}/htroot">
-      <fileset dir="${htroot}">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy add-on's -->
-    <copy todir="${release_source}/addon">
-      <fileset dir="${addon}">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy ranking files -->
-    <copy todir="${release_source}/ranking">
-      <fileset dir="${ranking}">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!-- copy development tools -->
-    <copy todir="${release_source}">
-      <fileset dir=".">
-        <include name="build.xml"/>
-        <include name="build.properties"/>
-      </fileset>
-    </copy>
-  	
-    <!-- copy searchtest -->
-    <copy todir="${release_main}/bin">
-      <fileset dir="bin">
-        <include name="searchtest.*"/>
-        <include name="localsearch.sh"/>
-      </fileset>
-    </copy>
-
-  </target>
-
   <!-- run unittests-->
   <target name="compileTest" depends="compile" description="run unittests">
 	  <javac srcdir="${test}" destdir="${test}"
@@ -604,24 +434,6 @@
     <delete dir="${release}/SPECS" failonerror="false" />
   </target>
 
-  <target name="sdist" depends="copyMain4SourceDist" description="make for standard source YaCy">
-    <tar destfile="${release}/${sourceReleaseFile}" compression="gzip" defaultexcludes="yes" longfile="fail">
-
-      <!-- packing all files into a gzipped tar -->
-      <tarfileset dir="${release_source}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsExecutable}">
-        <include name="**/*.sh"/>
-        <include name="**/*.command"/>
-      </tarfileset>
-      <tarfileset dir="${release_source}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" >
-        <include name="**/*"/>
-        <exclude name="**/*.sh"/>
-        <exclude name="**/*.command"/>
-      </tarfileset>
-    </tar>
-
-    <delete dir="${release_source}"/>
-  </target>
-
   <!-- make clean -->
   <target name="clean" description="make clean">
     <delete dir="${release_main}" failonerror="false"/>
@@ -711,11 +523,7 @@
       </fileset>
     </copy>
 
-    <!-- work around a feature/bug :( -->
-    <mkdir dir="${DESTDIR}/usr/share/yacy/xlib" />
-
     <!-- prepare /var/lib/yacy -->
-
     <mkdir dir="${DESTDIR}/var/lib/yacy" />
     <mkdir dir="${DESTDIR}/var/lib/yacy/LOG" />
     <mkdir dir="${DESTDIR}/var/lib/yacy/SETTINGS" />
@@ -887,6 +695,15 @@
                   replace="yacy (*auto-svn-version*) unstable; urgency=low" />
   </target>
 
+  <target name="build-jar" depends="compile">
+    <jar destfile="${lib}/yacycore.jar" basedir="${build}/">
+      <manifest>
+        <attribute name="Main-Class" value="yacy"/>
+      </manifest>
+    </jar>
+  </target>
+
+	
   <target name="sign" depends="readBuildProperties" description="sign current release file in RELEASE/ with $privateKey">
     <java classname="de.anomic.tools.CryptoLib" failonerror="true">
       <classpath>
diff --git a/debian/changelog b/debian/changelog
index a507b234d..6adb92661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-yacy (*auto-svn-version*) unstable; urgency=low
+yacy (0.91svn6326) unstable; urgency=low
 
   * SVN Update