rev 4367 - in kde-extras/kmymoney2/trunk/debian: . patches

Fathi Boudra fboudra-guest at costa.debian.org
Mon Aug 21 12:46:10 UTC 2006 

Author: fboudra-guest
Date: 2006-08-21 12:46:08 +0000 (Mon, 21 Aug 2006)
New Revision: 4367

Added:
   kde-extras/kmymoney2/trunk/debian/kmymoney2.lintian-overrides
   kde-extras/kmymoney2/trunk/debian/patches/10_add_autconf2.60_support.diff
   kde-extras/kmymoney2/trunk/debian/patches/11_fix_bug_374881.diff
Removed:
   kde-extras/kmymoney2/trunk/debian/dirs
   kde-extras/kmymoney2/trunk/debian/override
   kde-extras/kmymoney2/trunk/debian/patches/dbug374881.diff
Modified:
   kde-extras/kmymoney2/trunk/debian/changelog
   kde-extras/kmymoney2/trunk/debian/compat
   kde-extras/kmymoney2/trunk/debian/control
   kde-extras/kmymoney2/trunk/debian/rules
   kde-extras/kmymoney2/trunk/debian/watch
Log:
fix bug #378181 and #383795, update package (see changelog for more informations), add myself in uploaders

Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2006-08-21 12:46:08 UTC (rev 4367)
@@ -1,8 +1,21 @@
-kmymoney2 (0.8.4-5) UNRELEASED; urgency=low
+kmymoney2 (0.8.4-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Renamed dbug374881.diff to 10_fix_bug_374881.diff
+  * Add autoconf2.60 support patch
+  * Renamed override to kmymoney2.lintian-overrides and use it
+  * compat: bumped to 5
+  * control:
+    * add myself in uploaders
+    * cleanup build-depends
+    * bumped standards version to current 3.7.2
+  * dirs: removed, not needed
+  * rules:
+    * cleanup
+    * replace DEB_CONFIGURE_USER_FLAG by DEB_CONFIGURE_EXTRA_FLAG
+    * remove autools.mk, not needed
+    * remove --disable-shared (Closes: #378181, #383795)
 
- -- Mark Purcell <msp at debian.org>  Tue, 27 Jun 2006 22:45:47 +0100
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 27 Jun 2006 22:45:47 +0100
 
 kmymoney2 (0.8.4-4) unstable; urgency=low
 
@@ -294,6 +307,3 @@
 
  -- Martin F. Krafft <madduck at debian.org>  Tue, 26 Mar 2002 14:47:31 +0100
 
-Local variables:
-mode: debian-changelog
-End:

Modified: kde-extras/kmymoney2/trunk/debian/compat
===================================================================
--- kde-extras/kmymoney2/trunk/debian/compat	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/compat	2006-08-21 12:46:08 UTC (rev 4367)
@@ -1 +1 @@
-4
+5

Modified: kde-extras/kmymoney2/trunk/debian/control
===================================================================
--- kde-extras/kmymoney2/trunk/debian/control	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/control	2006-08-21 12:46:08 UTC (rev 4367)
@@ -2,17 +2,18 @@
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>> 4.0.0), gawk, gettext, kdelibs4-dev, libxml2-dev (>= 2.0), libxml++-dev, automake1.9 | automake, html2ps, gs-common, libofx-dev, cdbs, libaqbanking16-dev | libaqbanking-dev
-Standards-Version: 3.5.8.0
+Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fboudra at free.fr>
+Build-Depends: cdbs, debhelper (>= 5), automake1.9, gs-common, html2ps,
+ gs-common, kdelibs4-dev, libaqbanking16-dev, libofx-dev
+Standards-Version: 3.7.2
 
 Package: kmymoney2
 Architecture: any
 Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}
-Description: Personal finance manager
+Description: personal finance manager for KDE
  KMyMoney is the Personal Finance Manager for KDE. It operates similar
  to MS-Money and Quicken, supports different account types, categorisation
  of expenses, QIF import/export, multiple currencies and initial online 
  banking support. 
  .
- Website: http://kmymoney2.sf.net
+  Homepage: http://kmymoney2.sourceforge.net

Deleted: kde-extras/kmymoney2/trunk/debian/dirs

Added: kde-extras/kmymoney2/trunk/debian/kmymoney2.lintian-overrides
===================================================================
--- kde-extras/kmymoney2/trunk/debian/kmymoney2.lintian-overrides	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/kmymoney2.lintian-overrides	2006-08-21 12:46:08 UTC (rev 4367)
@@ -0,0 +1,3 @@
+kmymoney2: non-dev-pkg-with-shlib-symlink usr/lib/libkmm_mymoney.so.0.1.6 usr/lib/libkmm_mymoney.so
+kmymoney2: non-dev-pkg-with-shlib-symlink usr/lib/libkmm_plugin.so.0.0.0 usr/lib/libkmm_plugin.so
+kmymoney2: package-name-doesnt-match-sonames libkmm-mymoney0 libkmm-plugin0

Deleted: kde-extras/kmymoney2/trunk/debian/override

Added: kde-extras/kmymoney2/trunk/debian/patches/10_add_autconf2.60_support.diff
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/10_add_autconf2.60_support.diff	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/patches/10_add_autconf2.60_support.diff	2006-08-21 12:46:08 UTC (rev 4367)
@@ -0,0 +1,21 @@
+diff -Nur kmymoney2-0.8.4/admin/cvs.sh kmymoney2-0.8.4.new/admin/cvs.sh
+--- kmymoney2-0.8.4/admin/cvs.sh	2006-04-23 19:43:07.000000000 +0200
++++ kmymoney2-0.8.4.new/admin/cvs.sh	2006-08-21 13:44:12.000000000 +0200
+@@ -32,7 +32,7 @@
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -47,7 +47,7 @@
+ 
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader $required_autoconf_version"

Added: kde-extras/kmymoney2/trunk/debian/patches/11_fix_bug_374881.diff
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/11_fix_bug_374881.diff	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/patches/11_fix_bug_374881.diff	2006-08-21 12:46:08 UTC (rev 4367)
@@ -0,0 +1,12 @@
+--- kmymoney2-0.8.4.orig/kmymoney2/Makefile.in
++++ kmymoney2-0.8.4/kmymoney2/Makefile.in
+@@ -1098,10 +1098,8 @@
+	f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	echo "Creating symbolic link from kmymoney -> ./kmymoney2"; \
+	rm -f $(DESTDIR)$(bindir)/kmymoney; \
+-	curdir=`pwd`; \
+	cd $(DESTDIR)$(bindir); \
+	ln -s ./$$f kmymoney; \
+-	cd $(curdir); \
+	else :; fi; \
+	done

Deleted: kde-extras/kmymoney2/trunk/debian/patches/dbug374881.diff

Modified: kde-extras/kmymoney2/trunk/debian/rules
===================================================================
--- kde-extras/kmymoney2/trunk/debian/rules	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/rules	2006-08-21 12:46:08 UTC (rev 4367)
@@ -1,12 +1,14 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
-# This file is public domain.
-  
-# Add here any variable or target overrides you need
-export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -lkdeui
-DEB_CONFIGURE_USER_FLAGS = --enable-kbanking --enable-ofxbanking --enable-ofxplugin --enable-pdf-docs --disable-shared
-  
-include /usr/share/cdbs/1/class/autotools.mk
+
+export LDFLAGS = -lgwenhywfar -laqbanking -lqbanking -lkdeui
+
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/kde.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-kbanking --enable-ofxbanking --enable-pdf-docs
+
+install/kmymoney2::
+	install -D -p -m0644 debian/kmymoney2.lintian-overrides \
+	  debian/kmymoney2/usr/share/lintian/overrides/kmymoney2
+

Modified: kde-extras/kmymoney2/trunk/debian/watch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/watch	2006-08-21 08:57:56 UTC (rev 4366)
+++ kde-extras/kmymoney2/trunk/debian/watch	2006-08-21 12:46:08 UTC (rev 4367)
@@ -1,22 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
 http://sf.net/kmymoney2/kmymoney2-([0-9].*)\.tar\.bz2 debian svn-upgrade
-
-

More information about the pkg-kde-commits mailing list