rev 3370 - in kde-extras/klibido/trunk/debian: . patches
Fathi Boudra
fboudra-guest at costa.debian.org
Tue Mar 28 12:46:07 UTC 2006
Author: fboudra-guest
Date: 2006-03-28 12:46:06 +0000 (Tue, 28 Mar 2006)
New Revision: 3370
Added:
kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff
kde-extras/klibido/trunk/debian/patches/11_desktop_path.diff
kde-extras/klibido/trunk/debian/patches/12_ftbfs_with_gcc_4_1.diff
Removed:
kde-extras/klibido/trunk/debian/patches/001_fix_build_with_gcc4_1.patch
kde-extras/klibido/trunk/debian/patches/00list
Modified:
kde-extras/klibido/trunk/debian/changelog
kde-extras/klibido/trunk/debian/control
kde-extras/klibido/trunk/debian/rules
Log:
Cleanup klibido patches
Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog 2006-03-28 09:41:36 UTC (rev 3369)
+++ kde-extras/klibido/trunk/debian/changelog 2006-03-28 12:46:06 UTC (rev 3370)
@@ -1,6 +1,6 @@
klibido (0.2.5-1) unstable; urgency=low
- * New upstream release (closes: #329439)
+ * New upstream release
* Added dirs, docs, watch files
* Converted to cdbs
* Updated compat, control, copyright files
@@ -8,13 +8,9 @@
* Renamed klibido.menu to menu
* Clean up rules
* Fixed common kde doc link
- * Change from libdb4.3++dev to libdb4.2++dev for bug #329439
- * DEB_BUILD_OPTIONS can now be use to enable debug mode
- export DEB_BUILD_OPTIONS=debug before starting the build process
- * Build with config.guess and config.sub from Debian's autotools-dev
- (closes: #329439)
- * Maintainer changed to Debian KDE Extras Team
+ * Updated config.guess and config.sub (closes: #329439)
* Fixed FTBFS with gcc4.1 thanks to Martin Michlmayr (closes: #355986)
+ * Maintainer changed to Debian KDE Extras Team
-- Gonéri Le Bouder <goneri at rulezlan.org> Wed, 8 Mar 2006 12:33:30 +0100
Modified: kde-extras/klibido/trunk/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control 2006-03-28 09:41:36 UTC (rev 3369)
+++ kde-extras/klibido/trunk/debian/control 2006-03-28 12:46:06 UTC (rev 3370)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, kdelibs4-dev, libuu-dev, libdb4.3++-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), automake1.9, kdelibs4-dev, libdb4.3++-dev, libuu-dev
Standards-Version: 3.6.2
Package: klibido
Deleted: kde-extras/klibido/trunk/debian/patches/001_fix_build_with_gcc4_1.patch
Deleted: kde-extras/klibido/trunk/debian/patches/00list
Added: kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff 2006-03-28 09:41:36 UTC (rev 3369)
+++ kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff 2006-03-28 12:46:06 UTC (rev 3370)
@@ -0,0 +1,47 @@
+diff -Nur klibido-0.2.5/admin/debianrules klibido-0.2.5.new/admin/debianrules
+--- klibido-0.2.5/admin/debianrules 1970-01-01 01:00:00.000000000 +0100
++++ klibido-0.2.5.new/admin/debianrules 2006-03-28 11:58:26.000000000 +0200
+@@ -0,0 +1,43 @@
++#!/usr/bin/perl -w
++
++use Shell qw(mv cp mkdir rm) ;
++use File::Find;
++use Cwd;
++
++$origPwd = `pwd`;
++chomp $origPwd;
++
++$kde_prefix = "/usr";
++$sysconfdir = "/etc";
++$kde_includedir = "$kde_prefix/include/kde";
++$infodir = "$kde_prefix/share/info";
++$mandir = "$kde_prefix/share/man";
++$qtdir = "/usr/share/qt3";
++
++$kde_cgidir = "$kde_prefix/lib/cgi-bin";
++$kde_confdir = "$sysconfdir/kde3";
++$kde_htmldir = "$kde_prefix/share/doc/kde/HTML";
++
++if (defined $ENV{DEB_BUILD_OPTIONS} &&
++ $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
++ $enable_debug="--enable-debug=full";
++} else {
++ $enable_debug="--disable-debug";
++}
++
++if (@ARGV && $ARGV[0] eq 'echodirs') {
++ print STDOUT "export kde_prefix=$kde_prefix\n";
++ print STDOUT "export sysconfdir=$sysconfdir\n";
++ print STDOUT "export kde_includedir=$kde_includedir\n";
++ print STDOUT "export infodir=$infodir\n";
++ print STDOUT "export mandir=$mandir\n";
++ print STDOUT "export qtdir=$qtdir\n";
++
++ print STDOUT "export kde_cgidir=$kde_cgidir\n";
++ print STDOUT "export kde_confdir=$kde_confdir\n";
++ print STDOUT "export kde_htmldir=$kde_htmldir\n";
++
++ print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
++
++ exit
++}
Added: kde-extras/klibido/trunk/debian/patches/11_desktop_path.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/11_desktop_path.diff 2006-03-28 09:41:36 UTC (rev 3369)
+++ kde-extras/klibido/trunk/debian/patches/11_desktop_path.diff 2006-03-28 12:46:06 UTC (rev 3370)
@@ -0,0 +1,48 @@
+diff -Nur klibido-0.2.5/acinclude.m4 klibido-0.2.5.new/acinclude.m4
+--- klibido-0.2.5/acinclude.m4 2006-03-04 08:59:59.000000000 +0100
++++ klibido-0.2.5.new/acinclude.m4 2006-03-28 12:01:09.000000000 +0200
+@@ -420,7 +420,7 @@
+ kde_htmldir='\${datadir}/doc/HTML'
+ fi
+ if test -z "$kde_appsdir"; then
+- kde_appsdir='\${datadir}/applnk'
++ kde_appsdir='\${datadir}/applications'
+ fi
+ if test -z "$kde_icondir"; then
+ kde_icondir='\${datadir}/icons'
+diff -Nur klibido-0.2.5/admin/acinclude.m4.in klibido-0.2.5.new/admin/acinclude.m4.in
+--- klibido-0.2.5/admin/acinclude.m4.in 2004-07-23 16:25:49.000000000 +0200
++++ klibido-0.2.5.new/admin/acinclude.m4.in 2006-03-28 12:01:52.000000000 +0200
+@@ -420,7 +420,7 @@
+ kde_htmldir='\${datadir}/doc/HTML'
+ fi
+ if test -z "$kde_appsdir"; then
+- kde_appsdir='\${datadir}/applnk'
++ kde_appsdir='\${datadir}/applications'
+ fi
+ if test -z "$kde_icondir"; then
+ kde_icondir='\${datadir}/icons'
+diff -Nur klibido-0.2.5/src/Makefile.am klibido-0.2.5.new/src/Makefile.am
+--- klibido-0.2.5/src/Makefile.am 2006-01-06 16:44:19.000000000 +0100
++++ klibido-0.2.5.new/src/Makefile.am 2006-03-28 12:03:24.000000000 +0200
+@@ -39,7 +39,7 @@
+ klibido_LDADD = -lkmdi -ldb_cxx $(LIB_KDEUI)
+
+ # this is where the desktop file will go
+-shelldesktopdir = $(kde_appsdir)/Utilities
++shelldesktopdir = $(kde_appsdir)/kde
+ shelldesktop_DATA = klibido.desktop
+
+ # this is where the shell's XML-GUI resource file goes
+diff -Nur klibido-0.2.5/src/Makefile.in klibido-0.2.5.new/src/Makefile.in
+--- klibido-0.2.5/src/Makefile.in 2006-03-04 11:29:06.000000000 +0100
++++ klibido-0.2.5.new/src/Makefile.in 2006-03-28 12:04:00.000000000 +0200
+@@ -397,7 +397,7 @@
+ klibido_LDADD = -lkmdi -ldb_cxx $(LIB_KDEUI)
+
+ # this is where the desktop file will go
+-shelldesktopdir = $(kde_appsdir)/Utilities
++shelldesktopdir = $(kde_appsdir)/kde
+ shelldesktop_DATA = klibido.desktop
+
+ # this is where the shell's XML-GUI resource file goes
Added: kde-extras/klibido/trunk/debian/patches/12_ftbfs_with_gcc_4_1.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/12_ftbfs_with_gcc_4_1.diff 2006-03-28 09:41:36 UTC (rev 3369)
+++ kde-extras/klibido/trunk/debian/patches/12_ftbfs_with_gcc_4_1.diff 2006-03-28 12:46:06 UTC (rev 3370)
@@ -0,0 +1,24 @@
+diff -Nur klibido-0.2.5/src/nntpthreadsocket.h klibido-0.2.5.new/src/nntpthreadsocket.h
+--- klibido-0.2.5/src/nntpthreadsocket.h 2006-01-06 23:05:32.000000000 +0100
++++ klibido-0.2.5.new/src/nntpthreadsocket.h 2006-03-28 11:53:22.000000000 +0200
+@@ -234,7 +234,7 @@
+ bool getHead(QString group, int artnum); //Unimplemented
+ int m_getError() {return error;}
+ const char *m_getErrorDesc() {return (const char *) errorString;}
+- char * NntpThreadSocket::m_findEndLine( char * start, char * end );
++ char * m_findEndLine( char * start, char * end );
+ void setHost(NntpHost *nh);
+ bool m_sendCmd( QString& cmd, int response );
+ QTime prevTime, currentTime;
+diff -Nur klibido-0.2.5/src/yydecoder.h klibido-0.2.5.new/src/yydecoder.h
+--- klibido-0.2.5/src/yydecoder.h 2005-03-09 12:18:55.000000000 +0100
++++ klibido-0.2.5.new/src/yydecoder.h 2006-03-28 11:54:25.000000000 +0200
+@@ -87,7 +87,7 @@
+
+ private:
+
+- inline void yyDecoder::charCRC(const unsigned char *c);
++ inline void charCRC(const unsigned char *c);
+
+ QStringList m_fileParts;
+ QStringList::Iterator fileIterator;
Modified: kde-extras/klibido/trunk/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules 2006-03-28 09:41:36 UTC (rev 3369)
+++ kde-extras/klibido/trunk/debian/rules 2006-03-28 12:46:06 UTC (rev 3370)
@@ -2,13 +2,7 @@
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/rules/simple-patchsys.mk
DEB_INSTALL_MANPAGES_klibido := debian/klibido.1
-install/klibido::
- install -D -p -m0644 src/klibido.desktop debian/klibido/usr/share/applications/kde/klibido.desktop
-
-binary-post-install/klibido::
- rm -f debian/klibido/usr/share/applnk/Utilities/klibido.desktop
-
More information about the pkg-kde-commits
mailing list