[med-svn] r7172 - in trunk/packages/adun.app/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Tue Jun 28 09:12:30 UTC 2011
Author: tille
Date: 2011-06-28 09:12:30 +0000 (Tue, 28 Jun 2011)
New Revision: 7172
Added:
trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.patch
trunk/packages/adun.app/trunk/debian/patches/15_link-properly.patch
trunk/packages/adun.app/trunk/debian/patches/20_paths.patch
trunk/packages/adun.app/trunk/debian/patches/fix-implicit-pointer.patch
trunk/packages/adun.app/trunk/debian/patches/series
Removed:
trunk/packages/adun.app/trunk/debian/patches/00list
trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.dpatch
trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch
trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch
Modified:
trunk/packages/adun.app/trunk/debian/changelog
trunk/packages/adun.app/trunk/debian/compat
trunk/packages/adun.app/trunk/debian/control
trunk/packages/adun.app/trunk/debian/rules
Log:
Use dpatch instead of quilt; fix FTBFS bug with patch from Ubuntu
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/changelog 2011-06-28 09:12:30 UTC (rev 7172)
@@ -1,3 +1,15 @@
+adun.app (0.81-5) unstable; urgency=low
+
+ * Use quilt instead of dpatch
+ * Apply patch provided by Andreas Moog <amoog at ubuntu.com> (Thanks
+ to Andreas) to fix a build failure
+ Closes: 631641 (LP: 771041)
+ * Standards-Version: 3.9.2 (no changes needed)
+ * Debhelper 8 (control+compat)
+ * Corrected Vcs-URLs
+
+ -- Andreas Tille <tille at debian.org> Tue, 28 Jun 2011 10:38:55 +0200
+
adun.app (0.81-4) unstable; urgency=low
* debian/rules (mipsen-flags): New variable, conditionally define only
Modified: trunk/packages/adun.app/trunk/debian/compat
===================================================================
--- trunk/packages/adun.app/trunk/debian/compat 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/compat 2011-06-28 09:12:30 UTC (rev 7172)
@@ -1 +1 @@
-7
+8
Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/control 2011-06-28 09:12:30 UTC (rev 7172)
@@ -5,15 +5,15 @@
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
Yavor Doganov <yavor at gnu.org>
-Build-Depends: debhelper (>= 7),
- dpatch,
+Build-Depends: debhelper (>= 8),
+ quilt,
libgnustep-gui-dev,
libgsl0-dev,
imagemagick
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://diana.imim.es/Adun
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/adun.app/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/adun.app/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/adun.app/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/adun.app/trunk/
Package: adun.app
Architecture: any
Deleted: trunk/packages/adun.app/trunk/debian/patches/00list
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/00list 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/patches/00list 2011-06-28 09:12:30 UTC (rev 7172)
@@ -1,3 +0,0 @@
-05_no-plugin-script
-15_link-properly
-20_paths
Deleted: trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.dpatch 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.dpatch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_no-plugin-script.dpatch by Yavor Doganov <yavor at gnu.org>
-## Forwarded: no
-## This patch is specific to Debian.
-## DP: Do not install the script for plugin installation.
-
- at DPATCH@
-diff -urNad adun.app-0.8.2~/GNUmakefile.postamble adun.app-0.8.2/GNUmakefile.postamble
---- adun.app-0.8.2~/GNUmakefile.postamble 2007-06-04 14:11:12.000000000 +0300
-+++ adun.app-0.8.2/GNUmakefile.postamble 2007-12-17 23:09:18.000000000 +0200
-@@ -16,7 +16,6 @@
- # ResultsConverter depends on EnergyConverter & ConformationConverter plugins.
- # Things to do after installing
- after-install::
-- cp Tools/InstallPlugin.py $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_TOOLS)
-
- # Things to do before uninstalling
- # before-uninstall::
Added: trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.patch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.patch (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/05_no-plugin-script.patch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -0,0 +1,15 @@
+Name: 05_no-plugin-script.patch
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Description: This patch is specific to Debian.
+
+--- Adun-0.81.orig/GNUmakefile.postamble
++++ Adun-0.81/GNUmakefile.postamble
+@@ -16,7 +16,6 @@
+ # ResultsConverter depends on EnergyConverter & ConformationConverter plugins.
+ # Things to do after installing
+ after-install::
+- cp Tools/InstallPlugin.py $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_TOOLS)
+
+ # Things to do before uninstalling
+ # before-uninstall::
Deleted: trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -1,116 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_build.dpatch by Yavor Doganov <yavor at gnu.org>
-## Forwarded: not yet
-## DP: Link all objects with the libs they use symbols from.
-
- at DPATCH@
-diff -urNad adun.app-0.8.2~/Kernel/AdunKernel/GNUmakefile adun.app-0.8.2/Kernel/AdunKernel/GNUmakefile
---- adun.app-0.8.2~/Kernel/AdunKernel/GNUmakefile 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/Kernel/AdunKernel/GNUmakefile 2008-01-17 12:38:28.000000000 +0200
-@@ -9,7 +9,7 @@
- VERSION = 0.13
- FRAMEWORK_NAME =AdunKernel
- AdunKernel_LIB_DIRS = -L../Base/$(GNUSTEP_OBJ_DIR) -L$(GSL_LIB_DIR)
--AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgnustep-base -lgsl -lgslcblas
-+AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgsl -lgslcblas -lm $(FND_LIBS) $(OBJC_LIBS)
- endif
-
- export KERNEL_COMPILER ?= gcc
-diff -urNad adun.app-0.8.2~/Kernel/GNUmakefile adun.app-0.8.2/Kernel/GNUmakefile
---- adun.app-0.8.2~/Kernel/GNUmakefile 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/Kernel/GNUmakefile 2008-01-17 12:38:28.000000000 +0200
-@@ -10,7 +10,7 @@
- ifeq ($(ADUN_LIBRARY_COMPILER), icc)
- AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base -lgsl -lgslcblas -lfl -limf -lsvml -lm -ladun_base
- else
-- AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base -lgsl -lgslcblas
-+ AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base
- endif
-
- GNUSTEP_INSTALLATION_DOMAIN=USER
-diff -urNad adun.app-0.8.2~/MolTalk/GNUmakefile.preamble adun.app-0.8.2/MolTalk/GNUmakefile.preamble
---- adun.app-0.8.2~/MolTalk/GNUmakefile.preamble 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/MolTalk/GNUmakefile.preamble 2008-01-17 12:38:28.000000000 +0200
-@@ -63,7 +63,7 @@
- ifeq ($(GNUSTEP_TARGET_OS),mingw32)
- LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
- endif
--LIBRARIES_DEPEND_UPON +=
-+LIBRARIES_DEPEND_UPON += -lm $(FND_LIBS) $(OBJC_LIBS)
-
- #
- # Flags dealing with installing and uninstalling
-diff -urNad adun.app-0.8.2~/UL/AdunServer/GNUmakefile adun.app-0.8.2/UL/AdunServer/GNUmakefile
---- adun.app-0.8.2~/UL/AdunServer/GNUmakefile 2007-05-30 20:36:59.000000000 +0300
-+++ adun.app-0.8.2/UL/AdunServer/GNUmakefile 2008-01-17 12:39:12.000000000 +0200
-@@ -18,7 +18,7 @@
- #
-
- AdunServer_LIB_DIRS += -L../ULFramework/ULFramework.framework/Versions/Current -L../XMLLib/obj
--AdunServer_TOOL_LIBS += -lXMLLib -lULFramework
-+AdunServer_TOOL_LIBS += -lXMLLib -lULFramework -ladun_base -lAdunKernel -lMolTalk
-
- #
- # Resource files
-diff -urNad adun.app-0.8.2~/UL/AdunServer/GNUmakefile.preamble adun.app-0.8.2/UL/AdunServer/GNUmakefile.preamble
---- adun.app-0.8.2~/UL/AdunServer/GNUmakefile.preamble 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/UL/AdunServer/GNUmakefile.preamble 2008-01-17 12:38:28.000000000 +0200
-@@ -15,9 +15,7 @@
- ADDITIONAL_CFLAGS +=
-
- # Additional flags to pass to the linker
--ifeq ($(MAKELEVEL), 3)
--ADDITIONAL_LDFLAGS += -ladun_base -lAdunKernel -lMolTalk
--endif
-+ADDITIONAL_LDFLAGS +=
-
- # Additional include directories the compiler should search
- ifeq ($(MAKELEVEL),3)
-diff -urNad adun.app-0.8.2~/UL/GNUmakefile adun.app-0.8.2/UL/GNUmakefile
---- adun.app-0.8.2~/UL/GNUmakefile 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/UL/GNUmakefile 2008-01-17 12:38:28.000000000 +0200
-@@ -25,7 +25,7 @@
-
- UL_LIB_DIRS += -L./XMLLib/obj -L. -L./ULFramework/ULFramework.framework/Versions/Current
- UL_HEADER_FILES_INSTALL_DIR = UL/
--UL_OBJC_LIBS = -lXMLLib -lULFramework -lAdunKernel -lMolTalk -ladun_base -lgsl -lgslcblas
-+UL_GUI_LIBS = -lXMLLib -lULFramework -lAdunKernel -lMolTalk -ladun_base
-
- GNUSTEP_INSTALLATION_DOMAIN = USER
- #
-diff -urNad adun.app-0.8.2~/UL/ULFramework/GNUmakefile adun.app-0.8.2/UL/ULFramework/GNUmakefile
---- adun.app-0.8.2~/UL/ULFramework/GNUmakefile 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/UL/ULFramework/GNUmakefile 2008-01-17 12:38:28.000000000 +0200
-@@ -14,7 +14,7 @@
- #
- # Libraries
- #
--ULFramework_LIBRARIES_DEPEND_UPON += -lAdunKernel -lMolTalk -lXMLLib
-+ULFramework_LIBRARIES_DEPEND_UPON += -lAdunKernel -lMolTalk -lXMLLib -lgsl -lgslcblas -lm $(FND_LIBS) $(OBJC_LIBS)
-
- ifeq ($(MAKELEVEL),3)
- ULFramework_LIB_DIRS = -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current -L$(ADUN_SOURCE_DIR)/MolTalk/MolTalk.framework/Versions/Current
-diff -urNad adun.app-0.8.2~/UL/XMLLib/GNUmakefile.preamble adun.app-0.8.2/UL/XMLLib/GNUmakefile.preamble
---- adun.app-0.8.2~/UL/XMLLib/GNUmakefile.preamble 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/UL/XMLLib/GNUmakefile.preamble 2008-01-17 12:38:28.000000000 +0200
-@@ -18,5 +18,6 @@
- ADDITIONAL_INCLUDE_DIRS += -I../ -I../../Kernel -I../../Kernel/AdunKernel/Headers -I$(HOME)/GNUstep/Library/Headers
-
- # Additional library directories the linker should search
--ADDITIONAL_LIB_DIRS +=
-+ADDITIONAL_LIB_DIRS += -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current
-
-+LIBRARIES_DEPEND_UPON += -lAdunKernel $(FND_LIBS) $(OBJC_LIBS)
-diff -urNad adun.app-0.8.2~/Kernel/Base/GNUmakefile.preamble adun.app-0.8.2/Kernel/Base/GNUmakefile.preamble
---- adun.app-0.8.2~/Kernel/Base/GNUmakefile.preamble 2008-01-17 12:37:12.000000000 +0200
-+++ adun.app-0.8.2/Kernel/Base/GNUmakefile.preamble 2008-01-17 12:38:28.000000000 +0200
-@@ -17,7 +17,8 @@
- ADDITIONAL_CFLAGS +=
-
- # Additional flags to pass to the linker
--ADDITIONAL_LDFLAGS += -lgsl -lgslcblas
-+ADDITIONAL_LDFLAGS +=
-+LIBRARIES_DEPEND_UPON += -lgsl -lm
-
- # Additional include directories the compiler should search
- ADDITIONAL_INCLUDE_DIRS += -I$(GSL_INCLUDE_DIR)
Added: trunk/packages/adun.app/trunk/debian/patches/15_link-properly.patch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/15_link-properly.patch (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/15_link-properly.patch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -0,0 +1,105 @@
+Name: 15_build.patch
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: not yet
+
+--- Adun-0.81.orig/Kernel/AdunKernel/GNUmakefile
++++ Adun-0.81/Kernel/AdunKernel/GNUmakefile
+@@ -10,7 +10,7 @@
+ VERSION = 0.13
+ FRAMEWORK_NAME =AdunKernel
+ AdunKernel_LIB_DIRS = -L../Base/$(GNUSTEP_OBJ_DIR) -L$(GSL_LIB_DIR)
+-AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgnustep-base -lgsl -lgslcblas
++AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgsl -lgslcblas -lm $(FND_LIBS) $(OBJC_LIBS)
+ endif
+
+ export KERNEL_COMPILER ?= gcc
+--- Adun-0.81.orig/Kernel/GNUmakefile
++++ Adun-0.81/Kernel/GNUmakefile
+@@ -22,7 +22,7 @@
+ ifeq ($(ADUN_LIBRARY_COMPILER), icc)
+ AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base -lgsl -lgslcblas -lfl -limf -lsvml -lm -ladun_base
+ else
+- AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base -lgsl -lgslcblas
++ AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base
+ endif
+
+ GNUSTEP_INSTALLATION_DOMAIN=USER
+--- Adun-0.81.orig/MolTalk/GNUmakefile.preamble
++++ Adun-0.81/MolTalk/GNUmakefile.preamble
+@@ -63,7 +63,7 @@
+ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
+ LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
+ endif
+-LIBRARIES_DEPEND_UPON +=
++LIBRARIES_DEPEND_UPON += -lm $(FND_LIBS) $(OBJC_LIBS)
+
+ #
+ # Flags dealing with installing and uninstalling
+--- Adun-0.81.orig/UL/AdunServer/GNUmakefile
++++ Adun-0.81/UL/AdunServer/GNUmakefile
+@@ -18,7 +18,7 @@
+ #
+
+ AdunServer_LIB_DIRS += -L../ULFramework/ULFramework.framework/Versions/Current -L../XMLLib/obj
+-AdunServer_TOOL_LIBS += -lXMLLib -lULFramework
++AdunServer_TOOL_LIBS += -lXMLLib -lULFramework -ladun_base -lAdunKernel -lMolTalk
+
+ #
+ # Resource files
+--- Adun-0.81.orig/UL/AdunServer/GNUmakefile.preamble
++++ Adun-0.81/UL/AdunServer/GNUmakefile.preamble
+@@ -15,9 +15,7 @@
+ ADDITIONAL_CFLAGS +=
+
+ # Additional flags to pass to the linker
+-ifeq ($(MAKELEVEL), 3)
+-ADDITIONAL_LDFLAGS += -ladun_base -lAdunKernel -lMolTalk
+-endif
++ADDITIONAL_LDFLAGS +=
+
+ # Additional include directories the compiler should search
+ ifeq ($(MAKELEVEL),3)
+--- Adun-0.81.orig/UL/GNUmakefile
++++ Adun-0.81/UL/GNUmakefile
+@@ -25,7 +25,7 @@
+
+ UL_LIB_DIRS += -L./XMLLib/obj -L. -L./ULFramework/ULFramework.framework/Versions/Current
+ UL_HEADER_FILES_INSTALL_DIR = UL/
+-UL_OBJC_LIBS = -lXMLLib -lULFramework -lAdunKernel -lMolTalk -ladun_base -lgsl -lgslcblas
++UL_GUI_LIBS = -lXMLLib -lULFramework -lAdunKernel -lMolTalk -ladun_base
+
+ GNUSTEP_INSTALLATION_DOMAIN = USER
+ #
+--- Adun-0.81.orig/UL/ULFramework/GNUmakefile
++++ Adun-0.81/UL/ULFramework/GNUmakefile
+@@ -14,7 +14,7 @@
+ #
+ # Libraries
+ #
+-ULFramework_LIBRARIES_DEPEND_UPON += -lAdunKernel -lMolTalk -lXMLLib
++ULFramework_LIBRARIES_DEPEND_UPON += -lAdunKernel -lMolTalk -lXMLLib -lgsl -lgslcblas -lm $(FND_LIBS) $(OBJC_LIBS)
+
+ ifeq ($(MAKELEVEL),3)
+ ULFramework_LIB_DIRS = -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current -L$(ADUN_SOURCE_DIR)/MolTalk/MolTalk.framework/Versions/Current
+--- Adun-0.81.orig/UL/XMLLib/GNUmakefile.preamble
++++ Adun-0.81/UL/XMLLib/GNUmakefile.preamble
+@@ -18,5 +18,6 @@
+ ADDITIONAL_INCLUDE_DIRS += -I../ -I../../Kernel -I../../Kernel/AdunKernel/Headers
+
+ # Additional library directories the linker should search
+-ADDITIONAL_LIB_DIRS +=
++ADDITIONAL_LIB_DIRS += -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current
+
++LIBRARIES_DEPEND_UPON += -lAdunKernel $(FND_LIBS) $(OBJC_LIBS)
+--- Adun-0.81.orig/Kernel/Base/GNUmakefile.preamble
++++ Adun-0.81/Kernel/Base/GNUmakefile.preamble
+@@ -17,7 +17,8 @@
+ ADDITIONAL_CFLAGS +=
+
+ # Additional flags to pass to the linker
+-ADDITIONAL_LDFLAGS += -lgsl -lgslcblas
++ADDITIONAL_LDFLAGS +=
++LIBRARIES_DEPEND_UPON += -lgsl -lm
+
+ # Additional include directories the compiler should search
+ ADDITIONAL_INCLUDE_DIRS += -I$(GSL_INCLUDE_DIR)
Deleted: trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_paths.dpatch by Yavor Doganov <yavor at gnu.org>
-## Forwarded: no
-## This patch contains `x-terminal-emulator', which is specific to Debian.
-## DP: Adjust some essential paths.
-
- at DPATCH@
-diff -urNad adun.app-0.8.2~/UL/AdunServer/main.m adun.app-0.8.2/UL/AdunServer/main.m
---- adun.app-0.8.2~/UL/AdunServer/main.m 2007-07-31 16:28:35.000000000 +0300
-+++ adun.app-0.8.2/UL/AdunServer/main.m 2008-01-14 00:35:16.000000000 +0200
-@@ -39,7 +39,7 @@
- [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @".adun/AdunServer.log"]
- forKey: @"LogFile"];
- #else
-- adunCorePath = [NSHomeDirectory() stringByAppendingPathComponent: @"GNUstep/Tools"];
-+ adunCorePath = @"/usr/bin";
- [defaults setObject: adunCorePath forKey: @"AdunCorePath"];
- [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @"adun/AdunServer.log"]
- forKey: @"LogFile"];
-diff -urNad adun.app-0.8.2~/UL/AdunServer/ViewController.m adun.app-0.8.2/UL/AdunServer/ViewController.m
---- adun.app-0.8.2~/UL/ViewController.m 2008-01-14 00:31:57.000000000 +0200
-+++ adun.app-0.8.2/UL/ViewController.m 2008-01-14 00:32:09.000000000 +0200
-@@ -84,7 +84,7 @@
- #ifdef GNUSTEP
- [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @"adun/UL.log"]
- forKey: @"LogFile"];
-- [defaults setObject: @"gedit" forKey: @"Editor"];
-+ [defaults setObject: @"x-terminal-emulator -e editor" forKey: @"Editor"];
- #else
- [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @".adun/UL.log"]
- forKey: @"LogFile"];
-@@ -434,8 +433,7 @@
- stringForKey: @"AdunServerPath"];
- launchPath = [launchPath stringByAppendingPathComponent: @"AdunServer"];
- #else
-- launchPath = [NSHomeDirectory()
-- stringByAppendingPathComponent: @"GNUstep/Tools/AdunServer"];
-+ launchPath = @"/usr/bin/AdunServer";
- #endif
- NS_DURING
- {
Added: trunk/packages/adun.app/trunk/debian/patches/20_paths.patch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/20_paths.patch (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/20_paths.patch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -0,0 +1,38 @@
+Name: 20_paths.patch
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Description: This patch contains x-terminal-emulator, which is specific to Debian.
+ Adjust some essential paths.
+
+--- Adun-0.81.orig/UL/AdunServer/main.m
++++ Adun-0.81/UL/AdunServer/main.m
+@@ -39,7 +39,7 @@
+ [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @".adun/AdunServer.log"]
+ forKey: @"LogFile"];
+ #else
+- adunCorePath = [NSHomeDirectory() stringByAppendingPathComponent: @"GNUstep/Tools"];
++ adunCorePath = @"/usr/bin";
+ [defaults setObject: adunCorePath forKey: @"AdunCorePath"];
+ [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @"adun/AdunServer.log"]
+ forKey: @"LogFile"];
+--- Adun-0.81.orig/UL/ViewController.m
++++ Adun-0.81/UL/ViewController.m
+@@ -82,7 +82,7 @@
+ #ifdef GNUSTEP
+ [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @"adun/UL.log"]
+ forKey: @"LogFile"];
+- [defaults setObject: @"gedit" forKey: @"Editor"];
++ [defaults setObject: @"x-terminal-emulator -e editor" forKey: @"Editor"];
+ #else
+ [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent: @".adun/UL.log"]
+ forKey: @"LogFile"];
+@@ -444,8 +444,7 @@
+ stringForKey: @"AdunServerPath"];
+ launchPath = [launchPath stringByAppendingPathComponent: @"AdunServer"];
+ #else
+- launchPath = [NSHomeDirectory()
+- stringByAppendingPathComponent: @"GNUstep/Tools/AdunServer"];
++ launchPath = @"/usr/bin/AdunServer";
+ #endif
+ NS_DURING
+ {
Added: trunk/packages/adun.app/trunk/debian/patches/fix-implicit-pointer.patch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/fix-implicit-pointer.patch (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/fix-implicit-pointer.patch 2011-06-28 09:12:30 UTC (rev 7172)
@@ -0,0 +1,19 @@
+Description: AdunCellListHandler.m was missing a include for the function
+ AdCreateError, resulting in a forced-FTBFS on 64 bit archs. See
+ http://wiki.debian.org/ImplicitPointerConversions for more information.
+Origin: Upstream CVS
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/771041
+Name: fix-implicit-pointer.patch
+Author: Andreas Moog <amoog at ubuntu.com>
+Bug: 631641
+
+--- Adun-0.81.orig/Kernel/AdunKernel/Framework/AdunCellListHandler.m
++++ Adun-0.81/Kernel/AdunKernel/Framework/AdunCellListHandler.m
+@@ -22,6 +22,7 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ */
+ #include "AdunKernel/AdunCellListHandler.h"
++#include "AdunKernel/AdFrameworkFunctions.h"
+
+ /*
+ Category containing methods for creating and
Added: trunk/packages/adun.app/trunk/debian/patches/series
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/series (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/series 2011-06-28 09:12:30 UTC (rev 7172)
@@ -0,0 +1,4 @@
+05_no-plugin-script.patch
+15_link-properly.patch
+20_paths.patch
+fix-implicit-pointer.patch
Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules 2011-06-27 05:43:40 UTC (rev 7171)
+++ trunk/packages/adun.app/trunk/debian/rules 2011-06-28 09:12:30 UTC (rev 7172)
@@ -2,7 +2,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-include /usr/share/GNUstep/debian/config.mk
export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
More information about the debian-med-commit
mailing list