Merge lp:~debfx/keepassx/fix-lp311359 into lp:~siretart/keepassx/debian

[Felix Geyer]

=== modified file 'debian/changelog'
--- debian/changelog	2008-11-09 20:59:49 +0000
+++ debian/changelog	2009-03-16 23:37:32 +0000
@@ -1,3 +1,12 @@
+keepassx (0.3.4-2) experimental; urgency=low
+
+  * Bug fix: "Keepassx crashes on save when password entry changes".
+    LP: #311359
+    - add debian/patches/svn281_fix_buffer_too_small.patch
+    - build-depend on quilt
+
+ -- Felix Geyer <[e-mail]>  Mon, 16 Mar 2009 23:52:21 +0100
+
 keepassx (0.3.4-1) experimental; urgency=low
 
   * new upstream release. LP: #296014

=== modified file 'debian/control'
--- debian/control	2008-10-02 08:41:54 +0000
+++ debian/control	2009-03-16 23:37:32 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Reinhard Tartler <[e-mail]>
 Uploaders: David Valot <[e-mail]>
-Build-Depends: debhelper (>= 5.0.0), libqt4-dev (>= 4.3.0), libxtst-dev
+Build-Depends: debhelper (>= 5.0.0), libqt4-dev (>= 4.3.0), libxtst-dev, quilt
 Standards-Version: 3.7.3
 Homepage: http://keepassx.sourceforge.net
 Vcs-Bzr: http://code.launchpad.net/~siretart/keepassx/ubuntu

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2009-03-16 23:37:32 +0000
@@ -0,0 +1,1 @@
+svn281_fix_buffer_too_small.patch

=== added file 'debian/patches/svn281_fix_buffer_too_small.patch'
--- debian/patches/svn281_fix_buffer_too_small.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/svn281_fix_buffer_too_small.patch	2009-03-16 23:37:32 +0000
@@ -0,0 +1,19 @@
+--- trunk/src/Kdb3Database.cpp	2009/03/11 21:18:28	280
++++ trunk/src/Kdb3Database.cpp	2009/03/11 23:52:42	281
+@@ -1364,14 +1364,14 @@
+ 
+ 	for(int i=0; i < UnknownMetaStreams.size(); i++){
+ 		FileSize
+-			+=164
++			+=165
+ 			+UnknownMetaStreams[i].Comment.toUtf8().length()+1
+ 			+UnknownMetaStreams[i].Binary.length();
+ 	}
+ 
+ 	for(int i=0; i < MetaStreams.size(); i++){
+ 		FileSize
+-				+=164
++				+=165
+ 				+MetaStreams[i].Comment.toUtf8().length()+1
+ 				+MetaStreams[i].Binary.length();
+ 	}

=== modified file 'debian/rules'
--- debian/rules	2008-10-02 08:37:13 +0000
+++ debian/rules	2009-03-16 23:37:32 +0000
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -12,14 +14,14 @@
 endif
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	qmake-qt4 PREFIX=/usr DEBUG=1 QMAKE_CFLAGS_DEBUG="$(CFLAGS)" \
 	     QMAKE_CXXFLAGS_DEBUG="$(CFLAGS)"
 	lrelease-qt4 src/src.pro
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean