Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

build.xml

@@ -770,7 +770,7 @@
     </exec>
     <replaceregexp file="debian/changelog"
                   match="yacy \(.*\) unstable; urgency=low"
-                  replace="yacy (*auto-svn-version*) unstable; urgency=low" />
+                  replace="yacy (*auto-git-version*) unstable; urgency=low" />
   </target>
 	
   <target name="sign" depends="readBuildProperties" description="sign current release file in RELEASE/ with ${privateKeyFile}">

debian/changelog

@@ -1,6 +1,6 @@
-yacy (*auto-svn-version*) unstable; urgency=low
+yacy (*auto-git-version*) unstable; urgency=low
 
   * SVN Update
 
- -- root <root@debian>  Wed, 28 May 2008 19:15:45 +0200
+ -- Michael Peter Christen <mc@yacy.net>  Wed, 28 May 2008 19:15:45 +0200
 

debian/control

@@ -1,21 +1,19 @@
 Source: yacy
 Section: network
 Priority: extra
-Maintainer: root <root@debian>
+Maintainer: Michael Peter Christen <mc@yacy.net>
 Build-Depends: ant, sun-java6-jdk | openjdk-6-jdk, debhelper (>= 5), m4
 Standards-Version: 3.7.2
 
 Package: yacy
 Architecture: all
 Depends: java2-runtime, sudo, debconf
-Description: P2P Web Search Engine
+Description: Peer-to-Peer Web Search Engine
- YaCy is a Java-based peer-2-peer search engine.
+ YaCy is a Java-based peer-to-peer search engine.
- It provoids a personal websearch engine, which is
+ It provides a personal web search engine, which is
- free and decentral. The search index is distributed
+ free and decentralized. The search index is distributed
- over a peer2peer network. It contains a crawler, an indexer
+ over a p2p network. It contains a crawler, an indexer
- and an own database engine. In the robinson-modus, yacy
+ and an own database engine. In the 'robinson-modus', YaCy
- can be used for a topic-oriented search protal or to index an
+ can be used for a topic-oriented search portal or to index an
  intranet.
- Also included in YaCy is a Wiki, a P2P-message-system, a
- Blog and a bookmark management system. 
 Homepage: http://yacy.net/

debian/copyright

@@ -27,4 +27,4 @@ The Debian packaging is (C) 2008, Florian Richter <Florian_Richter@gmx.de> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 
 
-Some libraries of yacy have different licenses. Please have a look at lib/ and libx/
+Some libraries of yacy have different licenses. Please have a look at lib/