rev 12193 - in kde-extras/kvirc/trunk/debian: . patches

Raúl Sánchez Siles kebianizao-guest at alioth.debian.org
Thu Sep 18 19:13:33 UTC 2008


Author: kebianizao-guest
Date: 2008-09-18 19:13:33 +0000 (Thu, 18 Sep 2008)
New Revision: 12193

Added:
   kde-extras/kvirc/trunk/debian/patches/series
Modified:
   kde-extras/kvirc/trunk/debian/changelog
   kde-extras/kvirc/trunk/debian/patches/02_rpath.patch
   kde-extras/kvirc/trunk/debian/patches/09_plugin_dir.patch
   kde-extras/kvirc/trunk/debian/patches/10_gcc4.3_fix.patch
   kde-extras/kvirc/trunk/debian/patches/13_eula.patch
   kde-extras/kvirc/trunk/debian/patches/17_awaybackaction.patch
   kde-extras/kvirc/trunk/debian/patches/20_fixman.patch
   kde-extras/kvirc/trunk/debian/patches/30_security-cipherlist-bad-order_r1990.patch
   kde-extras/kvirc/trunk/debian/patches/52_windowmenu-crashes_r1991.patch
   kde-extras/kvirc/trunk/debian/rules
Log:
Moved patches to quilt since double compilation fails (see: #414305).

Modified: kde-extras/kvirc/trunk/debian/changelog
===================================================================
--- kde-extras/kvirc/trunk/debian/changelog	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/changelog	2008-09-18 19:13:33 UTC (rev 12193)
@@ -8,8 +8,7 @@
     file according to Copyright Holder license additions.
   * Adding 52_windowmenu-crashes_r1991.patch taken upstream to fix Window menu
     options crashing.
-  * Removed 98_buildprep.patch since double compilation fails (see: #414305).
-    Whole GNU toolchain is invoked now on building.
+  * Moved patches to quilt since double compilation fails (see: #414305).
   * Tighten build-depends for automake >= 1.10
 
  -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Tue, 26 Aug 2008 15:20:00 +0200

Modified: kde-extras/kvirc/trunk/debian/patches/02_rpath.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/02_rpath.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/02_rpath.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,6 +1,6 @@
-diff -u admin/acinclude.m4.in.2 admin/acinclude.m4.in
---- admin/acinclude.m4.in.2	2008-03-30 18:39:06.000000000 +0200
-+++ admin/acinclude.m4.in	2008-04-15 09:48:33.000000000 +0200
+diff -u kvirc/admin/acinclude.m4.in.2 kvirc/admin/acinclude.m4.in
+--- kvirc/admin/acinclude.m4.in.2	2008-03-30 18:39:06.000000000 +0200
++++ kvirc/admin/acinclude.m4.in	2008-04-15 09:48:33.000000000 +0200
 @@ -1105,7 +1105,7 @@
  			ss_save_LIBS="$LIBS"
  			CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"

Modified: kde-extras/kvirc/trunk/debian/patches/09_plugin_dir.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/09_plugin_dir.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/09_plugin_dir.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,6 +1,6 @@
-diff -Nru admin/acinclude.m4.in.org admin/acinclude.m4.in
---- admin/acinclude.m4.in.org	2008-04-17 00:52:30.000000000 +0200
-+++ admin/acinclude.m4.in	2008-04-17 00:56:45.000000000 +0200
+diff -Nru kvirc/admin/acinclude.m4.in.org kvirc/admin/acinclude.m4.in
+--- kvirc/admin/acinclude.m4.in.org	2008-04-17 00:52:30.000000000 +0200
++++ kvirc/admin/acinclude.m4.in	2008-04-17 00:56:45.000000000 +0200
 @@ -2562,10 +2563,10 @@
  	helpdir="\${globalkvircdir}/help/en"
  	AC_SUBST(helpdir)
@@ -14,9 +14,9 @@
  	AC_SUBST(modulelibdir)
  
  	defscriptdir="\${globalkvircdir}/defscript"
-diff -Nru src/kvirc/kernel/kvi_app_fs.cpp src/kvirc/kernel/kvi_app_fs.cpp.2
---- src/kvirc/kernel/kvi_app_fs.cpp	2008-03-30 22:02:35.000000000 +0200
-+++ src/kvirc/kernel/kvi_app_fs.cpp.2	2008-03-30 22:05:15.000000000 +0200
+diff -Nru kvirc/src/kvirc/kernel/kvi_app_fs.cpp kvirc/src/kvirc/kernel/kvi_app_fs.cpp.2
+--- kvirc/src/kvirc/kernel/kvi_app_fs.cpp	2008-03-30 22:02:35.000000000 +0200
++++ kvirc/src/kvirc/kernel/kvi_app_fs.cpp.2	2008-03-30 22:05:15.000000000 +0200
 @@ -52,8 +52,11 @@
  	{
  		case None          :                                                                           break;
@@ -30,9 +30,9 @@
  		case EasyPlugins   : szData.append("easyplugins");                                             break;
  		case ConfigPlugins : KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
  		case ConfigScripts : KviQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); break;
-diff -Nru src/kvirc/kernel/kvi_app_setup.cpp src/kvirc/kernel/kvi_app_setup.cpp
---- src/kvirc/kernel/kvi_app_setup.cpp	2006-07-28 14:51:38.000000000 +0200
-+++ src/kvirc/kernel/kvi_app_setup.cpp	2006-11-02 02:35:01.000000000 +0100
+diff -Nru kvirc/src/kvirc/kernel/kvi_app_setup.cpp kvirc/src/kvirc/kernel/kvi_app_setup.cpp
+--- kvirc/src/kvirc/kernel/kvi_app_setup.cpp	2006-07-28 14:51:38.000000000 +0200
++++ kvirc/src/kvirc/kernel/kvi_app_setup.cpp	2006-11-02 02:35:01.000000000 +0100
 @@ -79,7 +79,7 @@
  {
  	//First check if the help subdir exists

Modified: kde-extras/kvirc/trunk/debian/patches/10_gcc4.3_fix.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/10_gcc4.3_fix.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/10_gcc4.3_fix.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,6 +1,6 @@
-diff -Nru src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
---- src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp	2006-07-28 14:51:38.000000000 +0200
-+++ src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp	2008-01-28 09:43:06.293187308 +0100
+diff -Nru kvirc/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp kvirc/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+--- kvirc/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp	2006-07-28 14:51:38.000000000 +0200
++++ kvirc/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp	2008-01-28 09:43:06.293187308 +0100
 @@ -38,6 +38,7 @@
  #include "kvi_netutils.h"
  #include "kvi_menubar.h"

Modified: kde-extras/kvirc/trunk/debian/patches/13_eula.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/13_eula.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/13_eula.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,6 +1,6 @@
 unchanged:
---- src/modules/about/aboutdialog.cpp	2008-03-30 18:49:51.000000000 +0200
-+++ src/modules/about/aboutdialog.cpp.2	2008-03-30 18:49:46.000000000 +0200
+--- kvirc/src/modules/about/aboutdialog.cpp	2008-03-30 18:49:51.000000000 +0200
++++ kvirc/src/modules/about/aboutdialog.cpp.2	2008-03-30 18:49:46.000000000 +0200
 @@ -130,7 +130,7 @@
  	QString szLicense;
  
@@ -12,8 +12,8 @@
  	{
 only in patch2:
 unchanged:
---- src/modules/setup/setupwizard.cpp	2008-03-30 18:49:51.000000000 +0200
-+++ src/modules/setup/setupwizard.cpp.2	2008-03-30 18:47:49.000000000 +0200
+--- kvirc/src/modules/setup/setupwizard.cpp	2008-03-30 18:49:51.000000000 +0200
++++ kvirc/src/modules/setup/setupwizard.cpp.2	2008-03-30 18:47:49.000000000 +0200
 @@ -197,7 +197,7 @@
  	ed->setWordWrap(KviTalTextEdit::NoWrap);
  	QString szLicense;

Modified: kde-extras/kvirc/trunk/debian/patches/17_awaybackaction.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/17_awaybackaction.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/17_awaybackaction.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,5 +1,5 @@
---- src/kvirc/kernel/kvi_coreactions.cpp.orig	2006-07-25 13:10:28.000000000 +0000
-+++ src/kvirc/kernel/kvi_coreactions.cpp	2006-07-25 13:11:20.000000000 +0000
+--- kvirc/src/kvirc/kernel/kvi_coreactions.cpp.orig	2006-07-25 13:10:28.000000000 +0000
++++ kvirc/src/kvirc/kernel/kvi_coreactions.cpp	2006-07-25 13:11:20.000000000 +0000
 @@ -1011,12 +1011,14 @@
  			b->setTextLabel(txt);
  		}

Modified: kde-extras/kvirc/trunk/debian/patches/20_fixman.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/20_fixman.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/20_fixman.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,5 +1,5 @@
---- data/man/kvirc.1~	2007-07-01 05:29:03.000000000 +0200
-+++ data/man/kvirc.1	2008-04-18 00:28:16.000000000 +0200
+--- kvirc/data/man/kvirc.1~	2007-07-01 05:29:03.000000000 +0200
++++ kvirc/data/man/kvirc.1	2008-04-18 00:28:16.000000000 +0200
 @@ -11,7 +11,7 @@
  It is intended to be an "user friendly" interface to the IRC protocol (see \fIRFC1459\fP)
  and its extensions.

Modified: kde-extras/kvirc/trunk/debian/patches/30_security-cipherlist-bad-order_r1990.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/30_security-cipherlist-bad-order_r1990.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/30_security-cipherlist-bad-order_r1990.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,7 +1,7 @@
-Index: src/kvilib/net/kvi_ssl.cpp
+Index: kvirc/src/kvilib/net/kvi_ssl.cpp
 ===================================================================
---- src/kvilib/net/kvi_ssl.cpp	(revisión: 1989)
-+++ src/kvilib/net/kvi_ssl.cpp	(revisión: 1990)
+--- kvirc/src/kvilib/net/kvi_ssl.cpp	(revisión: 1989)
++++ kvirc/src/kvilib/net/kvi_ssl.cpp	(revisión: 1990)
 @@ -305,7 +305,8 @@
  	m_pSSLCtx = SSL_CTX_new(m == Client ? SSLv23_client_method() : SSLv23_server_method());
  	if(!m_pSSLCtx)return false;

Modified: kde-extras/kvirc/trunk/debian/patches/52_windowmenu-crashes_r1991.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/52_windowmenu-crashes_r1991.patch	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/patches/52_windowmenu-crashes_r1991.patch	2008-09-18 19:13:33 UTC (rev 12193)
@@ -1,7 +1,7 @@
-Index: src/kvirc/ui/kvi_mdimanager.cpp
+Index: kvirc/src/kvirc/ui/kvi_mdimanager.cpp
 ===================================================================
---- src/kvirc/ui/kvi_mdimanager.cpp	(revisión: 1990)
-+++ src/kvirc/ui/kvi_mdimanager.cpp	(revisión: 1991)
+--- kvirc/src/kvirc/ui/kvi_mdimanager.cpp	(revisión: 1990)
++++ kvirc/src/kvirc/ui/kvi_mdimanager.cpp	(revisión: 1991)
 @@ -805,7 +805,9 @@
  	if(g_pApp->closingDown())return;
  

Added: kde-extras/kvirc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kvirc/trunk/debian/patches/series	2008-09-18 19:13:33 UTC (rev 12193)
@@ -0,0 +1,12 @@
+01_am_maintainer_mode.patch
+02_rpath.patch
+05_xpmicon.patch
+09_plugin_dir.patch
+10_gcc4.3_fix.patch
+13_eula.patch
+17_awaybackaction.patch
+20_fixman.patch
+30_security-cipherlist-bad-order_r1990.patch
+51_PERL_SYS_INIT3_r2271-bug495064.patch
+52_windowmenu-crashes_r1991.patch
+98_buildprep.diff -p0

Modified: kde-extras/kvirc/trunk/debian/rules
===================================================================
--- kde-extras/kvirc/trunk/debian/rules	2008-09-18 16:23:47 UTC (rev 12192)
+++ kde-extras/kvirc/trunk/debian/rules	2008-09-18 19:13:33 UTC (rev 12193)
@@ -10,12 +10,12 @@
 	# This is done outside of debian/rules now, so that Debian autobuilders
 	# will all be building the same source, with no deviation because they
 	# might have an outdated autotools-dev version.
-common-configure-impl::
-	./autogen.sh
+#common-configure-impl::
+#	./autogen.sh
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 	#
 	#	Specify extra configure options:




More information about the pkg-kde-commits mailing list