[pkg-xmule-commits] CVS xmule/debian/patches
CVS User dleidert-guest
pkg-xmule-maintainers@lists.alioth.debian.org
Fri, 17 Jun 2005 19:57:14 +0000
Update of /cvsroot/pkg-xmule/xmule/debian/patches
In directory haydn:/tmp/cvs-serv31116/patches
Modified Files:
00list 01_fix_cryptopp_includes.dpatch
06_update_German_translation.dpatch
Log Message:
xmule (1.10.0b-2) unstable; urgency=low
[..]
* added: 07_fix_bug_314665_amd64_ftbfs - patch by Andreas Jochens to solve
'FTBFS (amd64/gcc-4.0): ISO C++ forbids declaration of 'CKnownFile' with
no type' bug (Closes: #314665)
fixed: 01_fix_cryptopp_includes - contains the samll fix from Andreas
patch
[..]
+ fix for German translation (06_update_German_translation.dpatch)
+ fix for patch-list (00list)
--- /cvsroot/pkg-xmule/xmule/debian/patches/00list 2005/06/15 13:16:26 1.4
+++ /cvsroot/pkg-xmule/xmule/debian/patches/00list 2005/06/17 19:57:14 1.5
@@ -3,4 +3,5 @@
03_use_debian_zlib_and_wx-xrc
05_fix_exit_segfault
06_update_German_translation
+07_fix_bug_314665_amd64_ftbfs
99_fix_general_build_issues
--- /cvsroot/pkg-xmule/xmule/debian/patches/01_fix_cryptopp_includes.dpatch 2005/03/16 22:55:20 1.1
+++ /cvsroot/pkg-xmule/xmule/debian/patches/01_fix_cryptopp_includes.dpatch 2005/06/17 19:57:14 1.2
@@ -8,10 +8,10 @@
## DP: We need to fix the include-path, which is <crypto++/..> at Debian.
@DPATCH@
-diff -urNad xmule-1.9.5/src/ClientCredits.cpp /tmp/dpep.vnPvRH/xmule-1.9.5/src/ClientCredits.cpp
---- xmule-1.9.5/src/ClientCredits.cpp 2005-03-16 21:19:50.652756832 +0100
-+++ /tmp/dpep.vnPvRH/xmule-1.9.5/src/ClientCredits.cpp 2005-03-16 21:21:08.862867088 +0100
-@@ -48,11 +48,11 @@
+diff -urNad --exclude=CVS --exclude=.svn ./src/ClientCredits.cpp /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/ClientCredits.cpp
+--- ./src/ClientCredits.cpp 2005-06-17 21:25:35.000000000 +0200
++++ /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/ClientCredits.cpp 2005-06-17 21:29:22.471646784 +0200
+@@ -48,11 +48,10 @@
#if !HAVE_CRYPTOPP
#include "CryptoXMpp.h"
#else
@@ -20,7 +20,6 @@
- #include <cryptopp/base64.h>
- #include <cryptopp/files.h>
- #include <cryptopp/sha.h>
-+ #include <crypto++/config.h>
+ #include <crypto++/osrng.h>
+ #include <crypto++/base64.h>
+ #include <crypto++/files.h>
@@ -28,9 +27,9 @@
#define CryptoXMpp CryptoPP
#endif
-diff -urNad xmule-1.9.5/src/ClientCredits.h /tmp/dpep.vnPvRH/xmule-1.9.5/src/ClientCredits.h
---- xmule-1.9.5/src/ClientCredits.h 2005-03-16 21:19:50.653756680 +0100
-+++ /tmp/dpep.vnPvRH/xmule-1.9.5/src/ClientCredits.h 2005-03-16 21:21:08.862867088 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./src/ClientCredits.h /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/ClientCredits.h
+--- ./src/ClientCredits.h 2005-06-17 21:25:35.000000000 +0200
++++ /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/ClientCredits.h 2005-06-17 21:28:57.223485088 +0200
@@ -35,8 +35,8 @@
#if !HAVE_CRYPTOPP
#include "CryptoXMpp.h"
@@ -42,10 +41,10 @@
#define CryptoXMpp CryptoPP
#endif
-diff -urNad xmule-1.9.5/src/packets.cpp /tmp/dpep.vnPvRH/xmule-1.9.5/src/packets.cpp
---- xmule-1.9.5/src/packets.cpp 2005-03-16 21:19:50.653756680 +0100
-+++ /tmp/dpep.vnPvRH/xmule-1.9.5/src/packets.cpp 2005-03-16 21:21:08.862867088 +0100
-@@ -33,8 +33,8 @@
+diff -urNad --exclude=CVS --exclude=.svn ./src/ServerList.cpp /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/ServerList.cpp
+--- ./src/ServerList.cpp 2005-06-17 21:25:36.000000000 +0200
++++ /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/ServerList.cpp 2005-06-17 21:28:57.224484936 +0200
+@@ -59,8 +59,8 @@
#if !HAVE_CRYPTOPP
#include "CryptoXMpp.h"
#else
@@ -56,10 +55,10 @@
#define CryptoXMpp CryptoPP
#endif
-diff -urNad xmule-1.9.5/src/ServerList.cpp /tmp/dpep.vnPvRH/xmule-1.9.5/src/ServerList.cpp
---- xmule-1.9.5/src/ServerList.cpp 2005-03-16 21:19:50.655756376 +0100
-+++ /tmp/dpep.vnPvRH/xmule-1.9.5/src/ServerList.cpp 2005-03-16 21:21:08.864866784 +0100
-@@ -59,8 +59,8 @@
+diff -urNad --exclude=CVS --exclude=.svn ./src/packets.cpp /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/packets.cpp
+--- ./src/packets.cpp 2005-06-17 21:25:36.000000000 +0200
++++ /tmp/dpep-work.r88ESl/xmule-1.10.0b/src/packets.cpp 2005-06-17 21:28:57.223485088 +0200
+@@ -33,8 +33,8 @@
#if !HAVE_CRYPTOPP
#include "CryptoXMpp.h"
#else
@@ -69,4 +68,4 @@
+ #include <crypto++/rsa.h>
#define CryptoXMpp CryptoPP
#endif
-
+
--- /cvsroot/pkg-xmule/xmule/debian/patches/06_update_German_translation.dpatch 2005/06/15 13:16:26 1.1
+++ /cvsroot/pkg-xmule/xmule/debian/patches/06_update_German_translation.dpatch 2005/06/17 19:57:14 1.2
@@ -5,9 +5,9 @@
## DP: Massive update to German translation (closes #313864).
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./po/de.po /tmp/dpep-work.Yy4oUV/xmule-1.10.0b/po/de.po
---- ./po/de.po 2005-01-06 11:58:36.000000000 +0100
-+++ /tmp/dpep-work.Yy4oUV/xmule-1.10.0b/po/de.po 2005-06-15 14:52:10.787143488 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./po/de.po /tmp/dpep-work.89vnZu/xmule-1.10.0b/po/de.po
+--- ./po/de.po 2005-06-17 21:39:23.000000000 +0200
++++ /tmp/dpep-work.89vnZu/xmule-1.10.0b/po/de.po 2005-06-17 21:40:04.985969760 +0200
@@ -150,9 +150,8 @@
msgstr "Aktive Downloads"
@@ -213,7 +213,7 @@
#: src/ServerWnd.cpp:68
msgid "This is "
-@@ -694,10 +676,9 @@
+@@ -694,25 +676,24 @@
msgstr " (basierend auf "
#: src/ServerWnd.cpp:69
@@ -221,11 +221,12 @@
msgid "Visit http://www.xmule.ws/ to check if a new version is available.\n"
msgstr ""
-"Besuchen Sie http://xmule.sf.net um zu sehen ob eine neuere Version "
+-"erhältlich ist."
+"Besuchen Sie http://www.xmule.ws um zu sehen ob eine neuere Version "
- "erhältlich ist."
++"erhältlich ist.\n"
#: src/SharedFilesCtrl.cpp:165
-@@ -705,14 +686,14 @@
+ msgid "Permissions"
msgstr "Zugriff"
#: src/SharedFilesCtrl.cpp:725