[Pkg-amule-commits] [amule] 04/06: refreshed, removed patches merged upstream

Sandro Tosi morph at moszumanska.debian.org
Sat Aug 30 18:57:40 UTC 2014


This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository amule.

commit 576a07209648215d1e458bc46956cd6943981010
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Aug 30 19:49:40 2014 +0100

    refreshed, removed patches merged upstream
---
 debian/changelog                                   |  4 +-
 .../cas_configfile.c_good_default_paths.diff       | 10 ++---
 .../configure_ignore_gdlib-config_garbage.diff     | 16 +++-----
 debian/patches/fallocate.diff                      |  2 +-
 debian/patches/fix_FTBFS_ld_as-needed.patch        | 25 ------------
 debian/patches/fix_desktop_mispell.patch           | 15 --------
 debian/patches/gcc_4.7.diff                        | 23 -----------
 debian/patches/handle_empty_statistics_file.patch  | 44 ----------------------
 debian/patches/libupnp-fix-publisherurl.patch      | 42 ---------------------
 debian/patches/mime-ed2k-protocol.patch            |  4 +-
 debian/patches/series                              |  5 ---
 .../patches/use_xdg-open_as_preview_default.diff   |  2 +-
 debian/patches/version_check.diff                  |  8 ++--
 13 files changed, 20 insertions(+), 180 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3d554e..f767404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 amule (2.3.1+git1a369e47-1) UNRELEASED; urgency=medium
 
   * New upsteam GIT snapshot repository; add support to WX 3.0; Closes: #751241
+  * debian/patches/*
+    - refreshed, removed patches merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sat, 30 Aug 2014 19:47:14 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 30 Aug 2014 19:49:20 +0100
 
 amule (2.3.1-11) unstable; urgency=low
 
diff --git a/debian/patches/cas_configfile.c_good_default_paths.diff b/debian/patches/cas_configfile.c_good_default_paths.diff
index 989b03f..1ea785c 100644
--- a/debian/patches/cas_configfile.c_good_default_paths.diff
+++ b/debian/patches/cas_configfile.c_good_default_paths.diff
@@ -1,10 +1,8 @@
-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 @@
+--- a/src/utils/cas/configfile.c
++++ b/src/utils/cas/configfile.c
+@@ -52,7 +52,7 @@ int writeconfig(void)
  		"# font_size - size the font\n",
- 		"# source_image - image where the text will be writen\n",
+ 		"# source_image - image where the text will be written\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",
diff --git a/debian/patches/configure_ignore_gdlib-config_garbage.diff b/debian/patches/configure_ignore_gdlib-config_garbage.diff
index faeec09..c872cef 100644
--- a/debian/patches/configure_ignore_gdlib-config_garbage.diff
+++ b/debian/patches/configure_ignore_gdlib-config_garbage.diff
@@ -1,8 +1,6 @@
-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 @@
+--- a/configure.in
++++ b/configure.in
+@@ -110,7 +110,7 @@ MULE_IF_ENABLED([cas], [
  	# Check for gd
  	MULE_CHECK_GDLIB([2.0.0], [
  		CAS_DEFS="-D__GD__"
@@ -11,11 +9,9 @@ Index: amule/configure.in
  	], [CAS_DEFS=])
  	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 @@
+--- a/configure
++++ b/configure
+@@ -7355,7 +7355,7 @@ fi
  	if test -n "$GDLIB_VERSION"; then :
  
  		CAS_DEFS="-D__GD__"
diff --git a/debian/patches/fallocate.diff b/debian/patches/fallocate.diff
index 1e9e2d8..7d21d2d 100644
--- a/debian/patches/fallocate.diff
+++ b/debian/patches/fallocate.diff
@@ -5,7 +5,7 @@ http://www.amule.org/abugs/view.php?id=1572
 
 --- a/src/ThreadTasks.cpp
 +++ b/src/ThreadTasks.cpp
-@@ -506,6 +506,15 @@ void CCompletionTask::OnExit()
+@@ -531,6 +531,15 @@ void CCompletionTask::OnExit()
  #include <stdlib.h>
  #include <errno.h>
  
diff --git a/debian/patches/fix_FTBFS_ld_as-needed.patch b/debian/patches/fix_FTBFS_ld_as-needed.patch
deleted file mode 100644
index 917c630..0000000
--- a/debian/patches/fix_FTBFS_ld_as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: fix build with --as-needed linker option
-Author: Ilya Barygin <randomaction at ubuntu.com>
-
---- amule-2.3.1.orig/src/utils/plasmamule/Makefile.am
-+++ amule-2.3.1/src/utils/plasmamule/Makefile.am
-@@ -31,7 +31,7 @@ plasma_engine_plasmamule_so_CXXFLAGS = -
- plasma_applet_plasmamule_so_CXXFLAGS = -shared -D__IMG_PATH__=\"${KDE_ICON_PATH}\" -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
- plasmamule_engine_feeder_CXXFLAGS = -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} ${DEBUGFLAG}
- 
--plasmamule_engine_feeder_LDFLAGS = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
-+plasmamule_engine_feeder_LDADD = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
- 
- noinst_HEADERS = plasma-engine-plasmamule.h plasma-applet-plasmamule.h plasmamule-dbus.h qt-emc.h
- 
---- amule-2.3.1.orig/src/utils/plasmamule/Makefile.in
-+++ amule-2.3.1/src/utils/plasmamule/Makefile.in
-@@ -402,7 +402,7 @@ nodist_plasma_applet_plasmamule_so_SOURC
- plasma_engine_plasmamule_so_CXXFLAGS = -shared -I${KDE_HEADER_DIR} ${QT_CORE_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
- plasma_applet_plasmamule_so_CXXFLAGS = -shared -D__IMG_PATH__=\"${KDE_ICON_PATH}\" -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
- plasmamule_engine_feeder_CXXFLAGS = -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} ${DEBUGFLAG}
--plasmamule_engine_feeder_LDFLAGS = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
-+plasmamule_engine_feeder_LDADD = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
- noinst_HEADERS = plasma-engine-plasmamule.h plasma-applet-plasmamule.h plasmamule-dbus.h qt-emc.h
- CLEANFILES = *.moc
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/debian/patches/fix_desktop_mispell.patch b/debian/patches/fix_desktop_mispell.patch
deleted file mode 100644
index 6e36b84..0000000
--- a/debian/patches/fix_desktop_mispell.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix mispelled StartupWMClass
-Author: Sandro Tosi <morph at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2014-01-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/utils/plasmamule/plasmamule-engine-feeder.desktop
-+++ b/src/utils/plasmamule/plasmamule-engine-feeder.desktop
-@@ -13,4 +13,4 @@ Icon=application-x-emulecollection
- MimeType=application/x-emulecollection;
- NoDisplay=true
- StartupNotify=false
--StartupWMClas=false
-+StartupWMClass=false
diff --git a/debian/patches/gcc_4.7.diff b/debian/patches/gcc_4.7.diff
deleted file mode 100644
index 0959f7b..0000000
--- a/debian/patches/gcc_4.7.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fixed compilation with gcc 4.7
-Origin: http://code.google.com/p/amule/source/detail?r=10772
-Index: amule/src/ObservableQueue.h
-===================================================================
---- amule.orig/src/ObservableQueue.h	2011-04-12 00:27:40.915973489 +0200
-+++ amule/src/ObservableQueue.h	2012-06-16 15:35:15.822669062 +0200
-@@ -331,14 +331,14 @@
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STARTING ), o );
-+	this->NotifyObservers( EventType( EventType::STARTING ), o );
- }
- 
- 
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STOPPING ), o );
-+	this->NotifyObservers( EventType( EventType::STOPPING ), o );
- }
- 
- 
diff --git a/debian/patches/handle_empty_statistics_file.patch b/debian/patches/handle_empty_statistics_file.patch
deleted file mode 100644
index f215b09..0000000
--- a/debian/patches/handle_empty_statistics_file.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Cope with empty statistics.dat file
- If, for some reason (corruption), the ~/.aMule/statistics.dat is empty, aMule
- will refuse to start until the file is deleted. This patch catches the
- occuring exception, logs the problem, and then continues as if the file did
- not exist in the first place.
-Bug-Debian: http://bugs.debian.org/683680
-Last-Update: 2012-02-11
-Origin: upstream, http://www.amule.org/abugs/view.php?id=1704
-Forwarded: not-needed
-
-Index: amule/src/Statistics.cpp
-===================================================================
---- amule.orig/src/Statistics.cpp	2012-08-04 10:44:30.564102710 +0200
-+++ amule/src/Statistics.cpp	2012-08-04 10:44:39.708219780 +0200
-@@ -50,6 +50,7 @@
- #endif
- 
- #include "amule.h"		// Needed for theApp
-+#include "Logger.h"
- #include <wx/intl.h>
- 
- #ifdef __BSD__
-@@ -311,12 +312,16 @@
- 
- 	s_totalSent = 0;
- 	s_totalReceived = 0;
--	if (f.Open(JoinPaths(theApp->ConfigDir, wxT("statistics.dat")))) {
--		uint8_t version = f.ReadUInt8();
--		if (version == 0) {
--			s_totalSent = f.ReadUInt64();
--			s_totalReceived = f.ReadUInt64();
-+	try {
-+		if (f.Open(JoinPaths(theApp->ConfigDir, wxT("statistics.dat")))) {
-+			uint8_t version = f.ReadUInt8();
-+			if (version == 0) {
-+				s_totalSent = f.ReadUInt64();
-+				s_totalReceived = f.ReadUInt64();
-+			}
- 		}
-+	} catch (CSafeIOException e) {
-+		AddLogLineN(e.what());
- 	}
- 
- 	// Load old values from config
diff --git a/debian/patches/libupnp-fix-publisherurl.patch b/debian/patches/libupnp-fix-publisherurl.patch
deleted file mode 100644
index ac9efc6..0000000
--- a/debian/patches/libupnp-fix-publisherurl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Handle libupnp3->libupnp6 transition
-Author: Nick Leverton <nick at leverton.org>
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670962
-Index: amule/src/UPnPBase.cpp
-===================================================================
---- amule.orig/src/UPnPBase.cpp	2011-04-12 00:27:41.647976495 +0200
-+++ amule/src/UPnPBase.cpp	2012-05-03 19:44:43.141922709 +0200
-@@ -1299,7 +1299,7 @@
- 		} else {
- #if 0
- 			TvCtrlPointHandleSubscribeUpdate(
--				es_event->PublisherUrl,
-+				UpnpString_get_String(es_event->PublisherUrl),
- 				es_event->Sid,
- 				es_event->TimeOut );
- #endif
-@@ -1324,7 +1324,7 @@
- 		int TimeOut = 1801;
- 		int ret = UpnpSubscribe(
- 			upnpCP->m_UPnPClientHandle,
--			es_event->PublisherUrl,
-+			UpnpString_get_String(es_event->PublisherUrl),
- 			&TimeOut,
- 			newSID);
- 		if (ret != UPNP_E_SUCCESS) {
-@@ -1333,13 +1333,13 @@
- 				msg.str(), es_event->ErrCode, NULL, NULL);
- 		} else {
- 			ServiceMap::iterator it =
--				upnpCP->m_ServiceMap.find(es_event->PublisherUrl);
-+				upnpCP->m_ServiceMap.find(UpnpString_get_String(es_event->PublisherUrl));
- 			if (it != upnpCP->m_ServiceMap.end()) {
- 				CUPnPService &service = *(it->second);
- 				service.SetTimeout(TimeOut);
- 				service.SetSID(newSID);
- 				msg2 << "Re-subscribed to EventURL '" <<
--					es_event->PublisherUrl <<
-+					UpnpString_get_String(es_event->PublisherUrl) <<
- 					"' with SID == '" <<
- 					newSID << "'.";
- 				AddDebugLogLineC(logUPnP, msg2);
diff --git a/debian/patches/mime-ed2k-protocol.patch b/debian/patches/mime-ed2k-protocol.patch
index 3bff75c..c6663e3 100644
--- a/debian/patches/mime-ed2k-protocol.patch
+++ b/debian/patches/mime-ed2k-protocol.patch
@@ -6,7 +6,7 @@ Description: provides MIME ed2k:// protocol handler registration
 
 --- a/amule.desktop
 +++ b/amule.desktop
-@@ -1,10 +1,11 @@
+@@ -1,6 +1,6 @@
  [Desktop Entry]
  Name=aMule
 -Exec=amule
@@ -14,7 +14,7 @@ Description: provides MIME ed2k:// protocol handler registration
  Icon=amule
  Terminal=false
  Type=Application
- Categories=Network;P2P;
+@@ -8,3 +8,4 @@ Categories=Network;P2P;
  Comment=A client for the eD2k network
  Comment[fr]=Un client pour le réseau eD2k
  Comment[tr]=eD2k ağı için istemci
diff --git a/debian/patches/series b/debian/patches/series
index 1f74b4f..ecc516b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,3 @@ cas_configfile.c_good_default_paths.diff
 use_xdg-open_as_preview_default.diff
 fallocate.diff
 version_check.diff
-libupnp-fix-publisherurl.patch
-gcc_4.7.diff
-handle_empty_statistics_file.patch
-fix_FTBFS_ld_as-needed.patch
-fix_desktop_mispell.patch
diff --git a/debian/patches/use_xdg-open_as_preview_default.diff b/debian/patches/use_xdg-open_as_preview_default.diff
index afcac67..816f44f 100644
--- a/debian/patches/use_xdg-open_as_preview_default.diff
+++ b/debian/patches/use_xdg-open_as_preview_default.diff
@@ -6,7 +6,7 @@ Date:   Sun Mar 1 14:10:15 2009 +0100
 
 --- a/src/DownloadListCtrl.cpp
 +++ b/src/DownloadListCtrl.cpp
-@@ -2276,7 +2276,7 @@ void CDownloadListCtrl::PreviewFile(CPar
+@@ -1429,7 +1429,7 @@ void CDownloadListCtrl::PreviewFile(CPar
  			_("File preview"), wxOK, this);
  		// Since newer versions for some reason mplayer does not automatically
  		// select video output device and needs a parameter, go figure...
diff --git a/debian/patches/version_check.diff b/debian/patches/version_check.diff
index 4a63da1..0d19e90 100644
--- a/debian/patches/version_check.diff
+++ b/debian/patches/version_check.diff
@@ -1,9 +1,7 @@
 Disable NewVersionCheck by Default (Closes: #554623)
-Index: amule/src/Preferences.cpp
-===================================================================
---- amule.orig/src/Preferences.cpp	2011-11-12 17:52:00.000000000 +0100
-+++ amule/src/Preferences.cpp	2011-11-12 18:33:43.999852356 +0100
-@@ -1210,7 +1210,7 @@
+--- a/src/Preferences.cpp
++++ b/src/Preferences.cpp
+@@ -1213,7 +1213,7 @@ void CPreferences::BuildItemList( const
  	/**
  	 * Version check
  	 **/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-amule/amule.git



More information about the Pkg-amule-commits mailing list