Hi kmymoney2 maintainers, attached you can find a patch that does the needed steps to update the kmymoney2 package to version 0.8.9. The suggested debian/changelog entry describes what I've changed:
* New upstream release
* drop patches 07_ofximport_ldflags and 08_remove_deprecated_miniicon
(included upstream)
* drop patch 10_fix_gcc4.3 (obsolete, builds without errors using GCC 4.3)
* regenerate patch 98_buildprep by running 'quilt refresh'
Regards
Micha
reverted:
--- kmymoney2-0.8.8/debian/patches/10_fix_gcc4.3
+++ kmymoney2-0.8.8.orig/debian/patches/10_fix_gcc4.3
@@ -1,11 +0,0 @@
---- kmymoney2-0.8.8.orig/kmymoney2/mymoney/storage/mymoneystoragebin.h
-+++ kmymoney2-0.8.8/kmymoney2/mymoney/storage/mymoneystoragebin.h
-@@ -107,7 +107,7 @@
- const MyMoneyTransaction readTransaction(QDataStream& s);
-
- void writeSplits(QDataStream& s, const MyMoneyTransaction& t);
-- void writeSplit(QDataStream& s, const MyMoneySplit& s);
-+ void writeSplit(QDataStream& s, const MyMoneySplit& t);
- const QValueList<MyMoneySplit> readSplits(QDataStream& s);
- const MyMoneySplit readSplit(QDataStream& s);
-
diff -u kmymoney2-0.8.8/debian/patches/98_buildprep.diff kmymoney2-0.8.9/debian/patches/98_buildprep.diff
--- kmymoney2-0.8.8/debian/patches/98_buildprep.diff
+++ kmymoney2-0.8.9/debian/patches/98_buildprep.diff
@@ -1,7 +1,9 @@
#DPATCHLEVEL=0
# vi: ft=diff
---- a/acinclude.m4
-+++ b/acinclude.m4
+Index: kmymoney2-0.8.9/acinclude.m4
+===================================================================
+--- kmymoney2-0.8.9.orig/acinclude.m4 2008-03-24 15:49:39.000000000 +0100
++++ kmymoney2-0.8.9/acinclude.m4 2008-03-27 23:00:37.000000000 +0100
@@ -612,7 +612,7 @@
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -4359,8 +4361,10 @@
/usr \
/"])
---- a/aclocal.m4
-+++ b/aclocal.m4
+Index: kmymoney2-0.8.9/aclocal.m4
+===================================================================
+--- kmymoney2-0.8.9.orig/aclocal.m4 2008-03-24 15:49:48.000000000 +0100
++++ kmymoney2-0.8.9/aclocal.m4 2008-03-27 23:00:37.000000000 +0100
@@ -726,6 +726,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -4397,8 +4401,10 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
---- a/configure
-+++ b/configure
+Index: kmymoney2-0.8.9/configure
+===================================================================
+--- kmymoney2-0.8.9.orig/configure 2008-03-24 15:49:54.000000000 +0100
++++ kmymoney2-0.8.9/configure 2008-03-27 23:00:37.000000000 +0100
@@ -586,15 +586,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -15717,14 +15723,18 @@
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
---- /dev/null
-+++ b/configure.files
+Index: kmymoney2-0.8.9/configure.files
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmymoney2-0.8.9/configure.files 2008-03-27 23:00:37.000000000 +0100
@@ -0,0 +1,3 @@
+./admin/configure.in.min
+configure.in.in
+configure.in.bot
---- a/configure.in
-+++ b/configure.in
+Index: kmymoney2-0.8.9/configure.in
+===================================================================
+--- kmymoney2-0.8.9.orig/configure.in 2008-03-24 15:49:39.000000000 +0100
++++ kmymoney2-0.8.9/configure.in 2008-03-27 23:00:37.000000000 +0100
@@ -17,8 +17,8 @@
dnl You should have received a copy of the GNU Library General Public License
@@ -15738,7 +15748,7 @@
# I lifted it in some mater. (Stephan Kulow)
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kmymoney2, 0.8.8) dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kmymoney2, 0.8.9) dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -15767,8 +15777,10 @@
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
---- a/developer-doc/Makefile.in
-+++ b/developer-doc/Makefile.in
+Index: kmymoney2-0.8.9/developer-doc/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/developer-doc/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/developer-doc/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -15865,8 +15877,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/developer-doc/phb/Makefile.in
-+++ b/developer-doc/phb/Makefile.in
+Index: kmymoney2-0.8.9/developer-doc/phb/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/developer-doc/phb/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/developer-doc/phb/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -15963,8 +15977,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/doc/en/Makefile.in
-+++ b/doc/en/Makefile.in
+Index: kmymoney2-0.8.9/doc/en/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/doc/en/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/doc/en/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -16061,8 +16077,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
+Index: kmymoney2-0.8.9/doc/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/doc/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/doc/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -16159,8 +16177,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/converter/Makefile.in
-+++ b/kmymoney2/converter/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/converter/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/converter/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/converter/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -16257,8 +16277,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/dialogs/Makefile.in
-+++ b/kmymoney2/dialogs/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/dialogs/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/dialogs/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/dialogs/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17260,8 +17282,10 @@
$(UIC) $(srcdir)/kcurrencycalculatordecl.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> kcurrencycalculatordecl.h ;
kcurrencycalculatordecl.moc: kcurrencycalculatordecl.h
$(MOC) kcurrencycalculatordecl.h -o kcurrencycalculatordecl.moc
---- a/kmymoney2/html/images/Makefile.in
-+++ b/kmymoney2/html/images/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/html/images/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/html/images/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/html/images/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17358,8 +17382,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/html/Makefile.in
-+++ b/kmymoney2/html/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/html/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/html/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/html/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17456,8 +17482,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/16x16/actions/Makefile.in
-+++ b/kmymoney2/icons/hicolor/16x16/actions/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/16x16/actions/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/16x16/actions/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/16x16/actions/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17563,8 +17591,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/16x16/Makefile.in
-+++ b/kmymoney2/icons/hicolor/16x16/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/16x16/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/16x16/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/16x16/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17661,8 +17691,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/22x22/actions/Makefile.in
-+++ b/kmymoney2/icons/hicolor/22x22/actions/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/22x22/actions/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/22x22/actions/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/22x22/actions/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17768,8 +17800,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/22x22/Makefile.in
-+++ b/kmymoney2/icons/hicolor/22x22/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/22x22/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/22x22/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/22x22/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17866,8 +17900,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/32x32/apps/Makefile.in
-+++ b/kmymoney2/icons/hicolor/32x32/apps/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/32x32/apps/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/32x32/apps/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/32x32/apps/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -17973,8 +18009,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/32x32/Makefile.in
-+++ b/kmymoney2/icons/hicolor/32x32/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/32x32/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/32x32/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/32x32/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18071,8 +18109,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/48x48/apps/Makefile.in
-+++ b/kmymoney2/icons/hicolor/48x48/apps/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/48x48/apps/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/48x48/apps/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/48x48/apps/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18178,8 +18218,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/48x48/Makefile.in
-+++ b/kmymoney2/icons/hicolor/48x48/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/48x48/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/48x48/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/48x48/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18276,8 +18318,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/64x64/apps/Makefile.in
-+++ b/kmymoney2/icons/hicolor/64x64/apps/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/64x64/apps/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/64x64/apps/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/64x64/apps/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18383,8 +18427,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/64x64/Makefile.in
-+++ b/kmymoney2/icons/hicolor/64x64/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/64x64/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/64x64/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/64x64/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18481,8 +18527,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/hicolor/Makefile.in
-+++ b/kmymoney2/icons/hicolor/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/hicolor/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/hicolor/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/hicolor/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18579,8 +18627,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/icons/Makefile.in
-+++ b/kmymoney2/icons/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/icons/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/icons/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/icons/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18677,8 +18727,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/Makefile.in
-+++ b/kmymoney2/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18805,8 +18857,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/mymoney/Makefile.in
-+++ b/kmymoney2/mymoney/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/mymoney/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/mymoney/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/mymoney/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -18903,8 +18957,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/mymoney/storage/Makefile.in
-+++ b/kmymoney2/mymoney/storage/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/mymoney/storage/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/mymoney/storage/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/mymoney/storage/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19001,8 +19057,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/pics/Makefile.in
-+++ b/kmymoney2/pics/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/pics/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/pics/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/pics/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19099,8 +19157,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/plugins/interfaces/Makefile.in
-+++ b/kmymoney2/plugins/interfaces/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/plugins/interfaces/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/plugins/interfaces/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/plugins/interfaces/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19197,8 +19257,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/plugins/kbanking/Makefile.in
-+++ b/kmymoney2/plugins/kbanking/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/plugins/kbanking/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/plugins/kbanking/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/plugins/kbanking/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19295,8 +19357,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/plugins/Makefile.in
-+++ b/kmymoney2/plugins/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/plugins/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/plugins/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/plugins/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19393,8 +19457,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/plugins/ofximport/Makefile.in
-+++ b/kmymoney2/plugins/ofximport/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/plugins/ofximport/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/plugins/ofximport/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/plugins/ofximport/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19423,15 +19489,6 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -378,7 +381,7 @@
- # LD flags for the plugin
- # -module says: this is a module, i.e. something you're going to dlopen
- # so e.g. it has no version number like a normal shared lib would have.
--kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KDECORE) $(LIB_QT)
-+kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KDECORE) $(LIB_QT) -L../.libs
-
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kmm_ofximport.desktop
@@ -390,7 +393,7 @@
.SUFFIXES:
@@ -19500,8 +19557,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/reports/Makefile.in
-+++ b/kmymoney2/reports/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/reports/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/reports/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/reports/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19598,8 +19657,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/C/Makefile.in
-+++ b/kmymoney2/templates/C/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/C/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/C/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/C/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19696,8 +19757,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/de_DE/Makefile.in
-+++ b/kmymoney2/templates/de_DE/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/de_DE/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/de_DE/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/de_DE/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19794,8 +19857,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/en_GB/Makefile.in
-+++ b/kmymoney2/templates/en_GB/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/en_GB/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/en_GB/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/en_GB/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19892,8 +19957,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/en_US/Makefile.in
-+++ b/kmymoney2/templates/en_US/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/en_US/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/en_US/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/en_US/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -19990,8 +20057,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/es_ES/Makefile.in
-+++ b/kmymoney2/templates/es_ES/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/es_ES/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/es_ES/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/es_ES/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20088,8 +20157,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/fr_FR/Makefile.in
-+++ b/kmymoney2/templates/fr_FR/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/fr_FR/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/fr_FR/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/fr_FR/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20186,8 +20257,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/gl_ES/Makefile.in
-+++ b/kmymoney2/templates/gl_ES/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/gl_ES/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/gl_ES/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/gl_ES/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20284,8 +20357,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/Makefile.in
-+++ b/kmymoney2/templates/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20382,8 +20457,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/nl_NL/Makefile.in
-+++ b/kmymoney2/templates/nl_NL/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/nl_NL/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/nl_NL/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/nl_NL/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20480,8 +20557,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/pt_BR/Makefile.in
-+++ b/kmymoney2/templates/pt_BR/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/pt_BR/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/pt_BR/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/pt_BR/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20578,8 +20657,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/ru_SU/Makefile.in
-+++ b/kmymoney2/templates/ru_SU/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/ru_SU/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/ru_SU/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/ru_SU/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20676,8 +20757,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/templates/zh_CN/Makefile.in
-+++ b/kmymoney2/templates/zh_CN/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/templates/zh_CN/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/templates/zh_CN/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/templates/zh_CN/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -20774,8 +20857,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/kmymoney2/views/Makefile.in
-+++ b/kmymoney2/views/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/views/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/views/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/views/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -21168,8 +21253,10 @@
$(UIC) $(srcdir)/kinvestmentviewdecl.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> kinvestmentviewdecl.h ;
kinvestmentviewdecl.moc: kinvestmentviewdecl.h
$(MOC) kinvestmentviewdecl.h -o kinvestmentviewdecl.moc
---- a/kmymoney2/widgets/Makefile.in
-+++ b/kmymoney2/widgets/Makefile.in
+Index: kmymoney2-0.8.9/kmymoney2/widgets/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/kmymoney2/widgets/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/kmymoney2/widgets/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -21616,8 +21703,10 @@
$(UIC) $(srcdir)/kmymoneygpgconfigdecl.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> kmymoneygpgconfigdecl.h ;
kmymoneygpgconfigdecl.moc: kmymoneygpgconfigdecl.h
$(MOC) kmymoneygpgconfigdecl.h -o kmymoneygpgconfigdecl.moc
---- a/libkgpgfile/Makefile.in
-+++ b/libkgpgfile/Makefile.in
+Index: kmymoney2-0.8.9/libkgpgfile/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/libkgpgfile/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/libkgpgfile/Makefile.in 2008-03-27 23:00:37.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -21714,8 +21803,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/Makefile.in
-+++ b/Makefile.in
+Index: kmymoney2-0.8.9/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/Makefile.in 2008-03-24 15:50:03.000000000 +0100
++++ kmymoney2-0.8.9/Makefile.in 2008-03-27 23:00:38.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
@@ -21788,8 +21879,10 @@
kde-rpo-clean:
-rm -f *.rpo
---- a/po/Makefile.in
-+++ b/po/Makefile.in
+Index: kmymoney2-0.8.9/po/Makefile.in
+===================================================================
+--- kmymoney2-0.8.9.orig/po/Makefile.in 2008-03-24 15:50:04.000000000 +0100
++++ kmymoney2-0.8.9/po/Makefile.in 2008-03-27 23:00:38.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.11.2.3 $
reverted:
--- kmymoney2-0.8.8/debian/patches/08_remove_deprecated_miniicon.diff
+++ kmymoney2-0.8.8.orig/debian/patches/08_remove_deprecated_miniicon.diff
@@ -1,9 +0,0 @@
---- a/kmymoney2/kmymoney2.desktop
-+++ b/kmymoney2/kmymoney2.desktop
-@@ -15,6 +15,5 @@
- Type=Application
- DocPath=kmymoney2/index.html
- Icon=kmymoney2
--MiniIcon=kmymoney2
- ServiceTypes=
- Categories=Office;Finance
diff -u kmymoney2-0.8.8/debian/patches/series kmymoney2-0.8.9/debian/patches/series
--- kmymoney2-0.8.8/debian/patches/series
+++ kmymoney2-0.8.9/debian/patches/series
@@ -7,5 +7,2 @@
06_disable_no_undefined.diff
-07_ofximport_ldflags.diff
-08_remove_deprecated_miniicon.diff
-10_fix_gcc4.3
98_buildprep.diff
reverted:
--- kmymoney2-0.8.8/debian/patches/07_ofximport_ldflags.diff
+++ kmymoney2-0.8.8.orig/debian/patches/07_ofximport_ldflags.diff
@@ -1,11 +0,0 @@
---- a/kmymoney2/plugins/ofximport/Makefile.am
-+++ b/kmymoney2/plugins/ofximport/Makefile.am
-@@ -15,7 +15,7 @@
- # LD flags for the plugin
- # -module says: this is a module, i.e. something you're going to dlopen
- # so e.g. it has no version number like a normal shared lib would have.
--kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KDECORE) $(LIB_QT)
-+kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KDECORE) $(LIB_QT) -L../.libs
-
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kmm_ofximport.desktop
diff -u kmymoney2-0.8.8/debian/changelog kmymoney2-0.8.9/debian/changelog
--- kmymoney2-0.8.8/debian/changelog
+++ kmymoney2-0.8.9/debian/changelog
@@ -1,3 +1,13 @@
+kmymoney2 (0.8.9-1) unstable; urgency=low
+
+ * New upstream release
+ * drop patches 07_ofximport_ldflags and 08_remove_deprecated_miniicon
+ (included upstream)
+ * drop patch 10_fix_gcc4.3 (obsolete, builds without errors using GCC 4.3)
+ * regenerate patch 98_buildprep by running 'quilt refresh'
+
+ -- Micha Lenk <[EMAIL PROTECTED]> Thu, 27 Mar 2008 22:58:22 +0100
+
kmymoney2 (0.8.8-2) unstable; urgency=low
[ Ana Beatriz Guerrero Lopez ]
signature.asc
Description: Digital signature
_______________________________________________ pkg-kde-extras mailing list pkg-kde-extras@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras
