[pkg-xmule-commits] CVS xmule/debian/patches

[CVS User dleidert-guest]

Update of /cvsroot/pkg-xmule/xmule/debian/patches
In directory haydn:/tmp/cvs-serv17317/debian/patches

Modified Files:
	00list 99_fix_general_build_issues.dpatch 
Added Files:
	06_update_German_translation.dpatch 
Log Message:
xmule (1.10.0b-2) unstable; urgency=low

  * added: 06_update_German_translation.dpatch - German translation fixes
    contributed by Jens Seidel (Closes: #313864)
  * fixed: 99_fix_general_build_issues - minor additions to fix a compilation
    problem and really use CFLAGS as determined in debian/rules to compile the
    xMule binary
  * minor fixes in debian/control and debian/rules
  
 -- xMule Package Maintainers <pkg-xmule-maintainers@lists.alioth.debian.org>  Wed, 15 Jun 2005 15:09:39 +0200


--- /cvsroot/pkg-xmule/xmule/debian/patches/00list	2005/05/14 19:32:02	1.3
+++ /cvsroot/pkg-xmule/xmule/debian/patches/00list	2005/06/15 13:16:26	1.4
@@ -2,4 +2,5 @@
 02_avoid_cryptopp_redefining_variables
 03_use_debian_zlib_and_wx-xrc
 05_fix_exit_segfault
+06_update_German_translation
 99_fix_general_build_issues
--- /cvsroot/pkg-xmule/xmule/debian/patches/99_fix_general_build_issues.dpatch	2005/05/14 17:01:00	1.1
+++ /cvsroot/pkg-xmule/xmule/debian/patches/99_fix_general_build_issues.dpatch	2005/06/15 13:16:26	1.2
@@ -4,11 +4,12 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix configure.ac to properly detect libcrypto++ and encrease gettext version to
 ## DP: workaround buggy 0.11.5.
+## DP: Compile-process should be more verbose, so we need to add our CFLAGS
 
 @DPATCH@
-diff -urNad xmule-1.10.0b/configure.ac /tmp/dpep.9N17iX/xmule-1.10.0b/configure.ac
---- xmule-1.10.0b/configure.ac	2005-05-14 18:51:44.000000000 +0200
-+++ /tmp/dpep.9N17iX/xmule-1.10.0b/configure.ac	2005-05-14 18:56:01.541878648 +0200
+diff -urNad xmule-1.10.0b/configure.ac /tmp/dpep.l0aeu4/xmule-1.10.0b/configure.ac
+--- xmule-1.10.0b/configure.ac	2005-05-24 02:21:49.661877152 +0200
++++ /tmp/dpep.l0aeu4/xmule-1.10.0b/configure.ac	2005-05-24 02:31:48.101900440 +0200
 @@ -1,6 +1,7 @@
  # Process this file with autoconf to produce a configure script.
  AC_PREREQ(2.53)
@@ -66,3 +67,27 @@
      echo "Cryp name: -$cryp_name-"
    AC_DEFINE_UNQUOTED(HAVE_CRYPTOPP, 1, [Define if you have the Crypto++ development headers and libraries.])
      if test -n "$cryptopp_prefix"; then
+diff -urNad xmule-1.10.0b/src/xmule.make.in /tmp/dpep.l0aeu4/xmule-1.10.0b/src/xmule.make.in
+--- xmule-1.10.0b/src/xmule.make.in	2005-05-24 02:31:47.717958808 +0200
++++ /tmp/dpep.l0aeu4/xmule-1.10.0b/src/xmule.make.in	2005-05-24 02:31:48.101900440 +0200
+@@ -4,7 +4,7 @@
+ LIBDIR = ../xLibs
+ HAVE_XRC = @HAVE_XRC@
+ 
+-CFLAGS =
++CFLAGS = @CFLAGS@
+ LDFLAGS = -L$(BINDIR)
+ TARGET =
+
+diff -urNad xmule-1.10.0b/src/BaseClient.cpp /tmp/dpep.4Drb4r/xmule-1.10.0b/src/BaseClient.cpp
+--- xmule-1.10.0b/src/BaseClient.cpp    2005-05-24 02:45:44.654725080 +0200
++++ /tmp/dpep.4Drb4r/xmule-1.10.0b/src/BaseClient.cpp   2005-05-24 02:46:13.457346416 +0200
+@@ -371,7 +371,7 @@
+                                     }
+                                     else if(temptag->tag->type == 3)
+                                     {
+-                                        m_strModVersion.Printf("%ModID=%u", temptag->tag->intvalue);
++                                        m_strModVersion.Printf("ModID=%u", temptag->tag->intvalue);
+                                     }
+                                     else
+                                     {