[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.2.6+debian0-9-5-ga5cb045

Sun Apr 17 21:30:50 UTC 2011

The following commit has been merged in the master branch:
commit 112af2436eec95c65d62ae2064a3ea4740ba0540
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 17 12:13:41 2011 +0200

    adapted (or removed) patches to new upstream code

diff --git a/debian/patches/alc_man_typo.diff b/debian/patches/alc_man_typo.diff
deleted file mode 100644
index e0a8da9..0000000
--- a/debian/patches/alc_man_typo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Typo #525264
---- a/src/utils/aLinkCreator/docs/alc.1
-+++ b/src/utils/aLinkCreator/docs/alc.1
-@@ -6,7 +6,7 @@ aLinkCreator \- the aMule ED2k link crea
- .SH DESCRIPTION
- \fBalc\fR is a graphical utility to create an ED2k link to any file on your computer.
- 
--This programm doesn't take any arguments.
-+This program doesn't take any arguments.
- .SH REPORTING BUGS
- Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
- Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
diff --git a/debian/patches/cas_configfile.c_good_default_paths.diff b/debian/patches/cas_configfile.c_good_default_paths.diff
index f87862c..989b03f 100644
--- a/debian/patches/cas_configfile.c_good_default_paths.diff
+++ b/debian/patches/cas_configfile.c_good_default_paths.diff
@@ -1,23 +1,13 @@
---- a/src/utils/cas/configfile.c
-+++ b/src/utils/cas/configfile.c
-@@ -44,9 +44,9 @@ int writeconfig(void)
+Index: amule/src/utils/cas/configfile.c
+===================================================================
+--- amule.orig/src/utils/cas/configfile.c	2011-04-12 00:27:42.000000000 +0200
++++ amule/src/utils/cas/configfile.c	2011-04-17 11:50:56.448061821 +0200
+@@ -44,7 +44,7 @@
  		"# font_size - size the font\n",
  		"# source_image - image where the text will be writen\n",
  		"# *_line - x,y,[1/0] enabled or disabled\n\n",
 -		"font /usr/share/fonts/corefonts/times.ttf\n",
 +		"font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf\n",
  		"font_size 10.5\n",
--		"source_image /usr/share/pixmaps/stat.png\n",
-+		"source_image /usr/share/cas/stat.png\n",
+ 		"source_image /usr/share/cas/stat.png\n",
  		"first_line 23,17,1\n",
- 		"second_line 23,34,1\n",
- 		"third_line 23,51,1\n",
-@@ -54,7 +54,7 @@ int writeconfig(void)
- 		"fifth_line 23,85,1\n",
- 		"sixth_line 23,102,1\n",
- 		"seventh_line 23,119,1\n",
--		"template /usr/share/pixmaps/tmp.html\n",
-+		"template /usr/share/cas/tmp.html\n"
- 		"img_type 0\n"
- 	};
- 
diff --git a/debian/patches/configure_ignore_gdlib-config_garbage.diff b/debian/patches/configure_ignore_gdlib-config_garbage.diff
index 5e43f52..faeec09 100644
--- a/debian/patches/configure_ignore_gdlib-config_garbage.diff
+++ b/debian/patches/configure_ignore_gdlib-config_garbage.diff
@@ -1,18 +1,22 @@
---- a/configure.in
-+++ b/configure.in
-@@ -169,7 +169,7 @@ AS_IF([test x$CAS = xyes], [
+Index: amule/configure.in
+===================================================================
+--- amule.orig/configure.in	2011-04-12 00:27:38.756227060 +0200
++++ amule/configure.in	2011-04-17 11:44:55.797303949 +0200
+@@ -108,7 +108,7 @@
  	# Check for gd
  	MULE_CHECK_GDLIB([2.0.0], [
  		CAS_DEFS="-D__GD__"
 -		MULE_PREPEND([GDLIB_LIBS], [-lgd])
 +		GDLIB_LIBS="-lgd"
  	], [CAS_DEFS=])
- 	AS_IF([test -z "$CAS_DEFS"], [
- 		AC_MSG_WARN([
---- a/configure
-+++ b/configure
-@@ -6315,7 +6315,7 @@ fi
- 	if test -n "$GDLIB_VERSION"; then
+ 	AS_IF([test -z "$CAS_DEFS"],
+ 		[MULE_WARNING(
+Index: amule/configure
+===================================================================
+--- amule.orig/configure	2011-04-12 00:27:38.756227060 +0200
++++ amule/configure	2011-04-17 11:44:55.804510955 +0200
+@@ -7192,7 +7192,7 @@
+ 	if test -n "$GDLIB_VERSION"; then :
  
  		CAS_DEFS="-D__GD__"
 -		GDLIB_LIBS="-lgd $GDLIB_LIBS"
diff --git a/debian/patches/ed2k_man_typo.diff b/debian/patches/ed2k_man_typo.diff
deleted file mode 100644
index f33aad3..0000000
--- a/debian/patches/ed2k_man_typo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Typo #525265
---- a/docs/man/ed2k.1
-+++ b/docs/man/ed2k.1
-@@ -20,7 +20,7 @@ Sends the given \fI<ED2k_link>\fR to aMu
- Prints a short usage description.
- .TP
- \fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR 
--Specifies the aMule configuration directory. This must be writeable by the user running \fBed2k\fR.
-+Specifies the aMule configuration directory. This must be writable by the user running \fBed2k\fR.
- .TP
- \fB\-e\fR, \fB\-\-emulecollection \fI<file>\fR
- Loads all links of the emulecollection passed as parameter.
diff --git a/debian/patches/fix_ftbfs_on_gcc45.diff b/debian/patches/fix_ftbfs_on_gcc45.diff
deleted file mode 100644
index e120ef2..0000000
--- a/debian/patches/fix_ftbfs_on_gcc45.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-# Subject: Fix FTBFS on gcc 4.5 (new in ubuntu natty)
-# Origin: other, http://bugs.amule.org/view.php?id=1624
-# Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/amule/+bug/685584
-# Forwarded: upstream claims it's in their current svn code
-Index: amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp
-===================================================================
---- amule-2.2.6+debian0.orig/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:46:18.435693002 +0000
-+++ amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:47:07.151693001 +0000
-@@ -285,11 +285,11 @@
- #ifdef __WXMSW__
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
- #else
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
- #endif
- 
- 	memdc.
diff --git a/debian/patches/series b/debian/patches/series
index e364479..e8ba385 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
 configure_ignore_gdlib-config_garbage.diff
 cas_configfile.c_good_default_paths.diff
 use_xdg-open_as_preview_default.diff
-alc_man_typo.diff
-ed2k_man_typo.diff
 fallocate.diff
-fix_ftbfs_on_gcc45.diff
 version_check.diff

-- 
Git repository for pkg-amule

