merge of '3dfa2ea9f44e204ca76d700e01ae09cda54c6b6a'

and 'a90a0715f156a732cf039bd2df9bbc3d90e82693'

build.xml

@@ -962,7 +962,7 @@
         </exec>
     </target>
     <target name="debianrepo" depends="debian">
-        <exec dir="debian" executable="./makerepo.sh" />
+        <exec dir="debian" executable="./makerepo.sh" failonerror="true"/>
     </target>
 
 <!-- the following are appened to help build barebone portable version, 

debian/changelog

@@ -1,3 +1,8 @@
+i2p (0.8.0-1) all; urgency=low
+  * I2P 0.8
+  * Debian packaging improvements
+ -- HungryHobo@i2pmail.org <HungryHobo@mail.i2p>  Mon, 08 Nov 2010 17:14:57 +0000
+
 i2p (0.7.10-0) testing; urgency=low
   * tweaks
     um...

debian/makerepo.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 # This script creates a Debian repository in ${DIR} using the reprepro tool.
 # The packages are signed with the key referenced in the newest changelog entry.
-#
-# TODO: error handling
+
+set -e
 
 cd $(dirname $0)
 DIR=./repo

debian/rules

@@ -24,6 +24,7 @@ build:
 	rm debian/tmp/usr/lib/i2p/a
 	touch debian/build
 	mkdir -p debian/tmp/usr/share/doc/i2p
+
 	# Create the Debian copyright file, move the licenses dir,
 	# and delete all license files that are already in /usr/share/common-licenses/
 	cat debian/copyright.part1 LICENSE.txt > debian/tmp/usr/share/doc/i2p/copyright
@@ -33,6 +34,10 @@ build:
 	rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-GPLv2.txt
 	rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-LGPLv2.1.txt
 
+	# changelog
+	gzip -9c history.txt > debian/tmp/usr/share/doc/i2p/changelog.gz
+	gzip -9c debian/changelog > debian/tmp/usr/share/doc/i2p/changelog.Debian.gz
+
 binary: build
 	mkdir -p debian/tmp/DEBIAN
 	dpkg-gencontrol