# HG changeset patch
# User Heiko Schlittermann (JUMPER) <hs@schlittermann.de>
# Date 1304340109 -7200
# Node ID 1958c7ab13f159242a16ed979b3c019da8bac43a
# Parent  57c147981554105235ce2346831cb4e21c6394f4# Parent  73e32571b22fa1f77c0186b8671129c70c010e4f
merged

diff -r 73e32571b22f -r 1958c7ab13f1 .hgtags
--- a/.hgtags	Mon May 02 14:40:54 2011 +0200
+++ b/.hgtags	Mon May 02 14:41:49 2011 +0200
@@ -10,3 +10,10 @@
 0000000000000000000000000000000000000000 v0.9
 0000000000000000000000000000000000000000 v0.9
 df6151ec3fa7baf54b1ae1c082730a645f5a7c48 v0.9
+df6151ec3fa7baf54b1ae1c082730a645f5a7c48 v0.9
+f9f9e2398ba59b02f492e1e785068b5f0a42f4f0 v0.9
+f9f9e2398ba59b02f492e1e785068b5f0a42f4f0 v0.9
+69ec9e16616b8e0a2d6e0621c31349afc1340c81 v0.9
+593a778c191513324fda45bc0cf36204304650a2 deb0.9-1
+70f544c3831ad57bdf8d15b80e9e27572391af1c v1.0
+bef429bef3af31270f05d5d9113a6e368506d222 deb1.0-1
diff -r 73e32571b22f -r 1958c7ab13f1 bin/ftbackup
--- a/bin/ftbackup	Mon May 02 14:40:54 2011 +0200
+++ b/bin/ftbackup	Mon May 02 14:41:49 2011 +0200
@@ -19,7 +19,7 @@
 $ENV{LC_ALL} = "C";
 
 my $ME      = basename $0;
-my $VERSION = "0.9";
+my $VERSION = "1.0";
 
 my @CONFIGS = ("/etc/$ME.conf", "$ENV{HOME}/.$ME.conf", "$ME.conf");
 
diff -r 73e32571b22f -r 1958c7ab13f1 debian/changelog
--- a/debian/changelog	Mon May 02 14:40:54 2011 +0200
+++ b/debian/changelog	Mon May 02 14:41:49 2011 +0200
@@ -1,3 +1,15 @@
+ftbackup (1.0-0) stable; urgency=low
+
+  * current stable upstream 
+
+ -- Heiko Schlittermann <hs@schlittermann.de>  Fri, 29 Apr 2011 17:42:51 +0200
+
+ftbackup (0.9-1) stable; urgency=low
+
+  * current stable upstream 
+
+ -- Heiko Schlittermann <hs@schlittermann.de>  Fri, 29 Apr 2011 13:04:25 +0200
+
 ftbackup (0.7) stable; urgency=low
 
   * fixed typo in info header 
diff -r 73e32571b22f -r 1958c7ab13f1 debian/control
--- a/debian/control	Mon May 02 14:40:54 2011 +0200
+++ b/debian/control	Mon May 02 14:41:49 2011 +0200
@@ -4,13 +4,12 @@
 Maintainer: Heiko Schlittermann <hs@schlittermann.de>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.7.3
-Homepage: https://keller.schlittermann.de/hg/incubator/ftbackup
+Homepage: https://keller.schlittermann.de/hg/ftbackup
 
 Package: ftbackup
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, 
-    perl-modules (>= 5.10.0-19lenny2), 
-    libperl6-slurp-perl, 
+    perl-modules (>= 5.10.0-19lenny2), lvm2,
     dump
 Recommends: ftpipe
 Description: encrypted backup via ftp
diff -r 73e32571b22f -r 1958c7ab13f1 debian/rules
--- a/debian/rules	Mon May 02 14:40:54 2011 +0200
+++ b/debian/rules	Mon May 02 14:41:49 2011 +0200
@@ -15,7 +15,7 @@
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --prefix=/usr
+	perl Build.PL --install-base=/usr
 	touch $@
 
 
@@ -25,7 +25,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	chmod +x ftbackup
+	./Build
 	#docbook-to-man debian/ftbackup.sgml > ftbackup.1
 
 	touch $@
@@ -36,7 +36,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	-./Build distclean
 
 	dh_clean 
 
@@ -47,10 +47,10 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/ftbackup.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/ftbackup install
+	./Build --destdir=$(CURDIR)/debian/ftbackup install
 
-	install -d $(CURDIR)/debian/ftbackup/etc/ftbackup
-	install -m 0600 ftbackup.conf.example $(CURDIR)/debian/ftbackup/etc/ftbackup/default
+	install -d $(CURDIR)/debian/ftbackup/etc
+	install -m 0600 ftbackup.conf.example $(CURDIR)/debian/ftbackup/etc/ftbackup.conf
 
 # Build architecture-independent files here.
 binary-indep: build install
diff -r 73e32571b22f -r 1958c7ab13f1 ftbackup.conf.example
--- a/ftbackup.conf.example	Mon May 02 14:40:54 2011 +0200
+++ b/ftbackup.conf.example	Mon May 02 14:41:49 2011 +0200
@@ -2,10 +2,11 @@
 # the commented values are the built in defaults
 
 # The encryption key
-# KEY = 
+# KEY = <please provide a good key>
 
 # FTP-Server hostname
-# FTP_HOST = 
+# for login and password please use ~/.netrc
+# FTP_HOST = <fill in the ftp servers hostname here>
 
 # FTP-Server base directory
 # the following expansion work: