Skip to content
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ f95145f4
adun.app (0.81-13) UNRELEASED; urgency=medium
adun.app (0.81-13) unstable; urgency=medium
* Fix FTBFS on powerpcspe
-- Yavor Doganov <yavor@gnu.org> Tue, 22 Jan 2019 12:57:14 +0100
* debian/patches/ftbfs-powerpcspe.patch: New; fixes FTBFS on powerpcspe.
* debian/patches/gcc-warnings.patch: Fix more warnings.
* debian/patches/series: Update.
* debian/control (Build-Depends): Bump gnustep-make requirement to >=
2.7.0-4 for "terse" support.
(Homepage): Replace with the GNUstep wiki page.
* debian/rules: Use dh_auto_* commands instead of $(MAKE). Strip
trailing whitespace. Support "terse" in DEB_BUILD_OPTIONS.
* debian/copyright: Add comment that the source is available only in
Debian. Update copyright years.
-- Yavor Doganov <yavor@gnu.org> Thu, 24 Jan 2019 12:45:35 +0200
adun.app (0.81-12) unstable; urgency=medium
......
debian/control
View file @ f95145f4
......@@ -5,7 +5,7 @@ Uploaders: Andreas Tille <tille@debian.org>,
Section: science
Priority: optional
Build-Depends: debhelper (>= 11),
gnustep-make (>= 2.7.0-3),
gnustep-make (>= 2.7.0-4),
libgnustep-gui-dev,
libsteptalk-dev,
libsqlclient-dev,
......@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11),
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/med-team/adun-app
Vcs-Git: https://salsa.debian.org/med-team/adun-app.git
Homepage: http://diana.imim.es/Adun
Homepage: http://wiki.gnustep.org/index.php/Adun
Package: adun.app
Architecture: any
......
debian/copyright
View file @ f95145f4
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Adun
Source: http://diana.imim.es/Adun
Comment: The source is only avaialble from Debian.
Files: *
Copyright: © 2003-2007 Alexander V. Diemand (MolTalk)
......@@ -76,8 +77,8 @@ License: MIT
Files: debian/*
Copyright: 2006-2014 Gürkan Myczko <gurkan@phys.ethz.ch>
2008-2018 Yavor Doganov <yavor@gnu.org>
2008-2017 Andreas Tille <tille@debian.org>
2008-2019 Yavor Doganov <yavor@gnu.org>
2008-2019 Andreas Tille <tille@debian.org>
2016 Gert Wollny <gw.fossdev@gmail.com>
License: GPL-3+
......
debian/patches/gcc-warnings.patch
View file @ f95145f4
......@@ -24,10 +24,11 @@ Description: Adapt to the new GNUstep API and fix few gcc warnings.
output truncated before the last format character [-Wformat-truncation=]
‘receiver’ may not respond to ‘-message’
multiple methods named ‘-foo’ found
operation on ‘foo’ may be undefined [-Wsequence-point]
Author: Yavor Doganov <yavor@gnu.org>
Bug-Debian: http://bugs.debian.org/749733
Forwarded: no
Last-Update: 2018-01-07
Last-Update: 2019-01-24
---
--- adun.app.orig/Kernel/AdunKernel/CoreAdditions/AdunTrajectory.m
......@@ -1540,7 +1541,7 @@ Last-Update: 2018-01-07
{
--- adun.app.orig/Kernel/AdunKernel/Framework/AdunSmoothedGBTerm.m
+++ adun.app/Kernel/AdunKernel/Framework/AdunSmoothedGBTerm.m
@@ -69,7 +69,7 @@
@@ -69,13 +69,13 @@
NSArray* array;
NSString* coefficientKey;
......@@ -1549,6 +1550,13 @@ Last-Update: 2018-01-07
{
//Initialise some ivars
integrationStartPoint = 0.5; //Following Im et al.
meshSize = 1.0; //Better for identifying complete overlaps
cutBuffer = 0.0;
- totalPairESTPotential = totalPairESTPotential = totalNonpolarPotential = 0;
+ totalPairESTPotential = totalNonpolarPotential = 0;
memoryManager = [AdMemoryManager appMemoryManager];
//Set arguments
@@ -240,8 +240,6 @@
- (void) calculateBornRadii
......@@ -3551,7 +3559,15 @@ Last-Update: 2018-01-07
if([NSStringFromSelector(aSelector) isEqual: @"insertNewline:"])
--- adun.app.orig/UL/ULExportController.m
+++ adun.app/UL/ULExportController.m
@@ -49,7 +49,7 @@
@@ -20,6 +20,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#include "ULExportController.h"
+#import "ULInterfaceFunctions.h"
#include <AdunKernel/AdunFileSystemSimulationStorage.h>
#include <MolTalk/MolTalk.h>
@@ -49,7 +50,7 @@
if(sharedExportController != nil)
return sharedExportController;
......@@ -3560,7 +3576,7 @@ Last-Update: 2018-01-07
{
if([NSBundle loadNibNamed: @"CreateAttributePanel" owner: self] == NO)
{
@@ -119,7 +119,6 @@
@@ -119,7 +120,6 @@
- (void) _exportObjectAsBinaryArchive: (id) anObject toFile: (NSString*) filename
{
BOOL retVal;
......@@ -3568,7 +3584,7 @@ Last-Update: 2018-01-07
NSError *error;
NSMutableData *data;
NSKeyedArchiver* archiver;
@@ -177,17 +176,17 @@
@@ -177,17 +177,17 @@
- (void) export: (id) sender
{
......@@ -3590,7 +3606,7 @@ Last-Update: 2018-01-07
format = [exportPanel choice];
if(result == NSOKButton)
@@ -204,7 +203,6 @@
@@ -204,7 +204,6 @@
{
//Take any extension off filename
//This just makes it easier to work with it later
......@@ -3598,7 +3614,7 @@ Last-Update: 2018-01-07
exportObject = [pasteboard objectForType: type];
[self exportObject: exportObject
toFile: filename
@@ -220,7 +218,7 @@
@@ -220,7 +219,7 @@
*/
- (void) exportObject: (id) anObject toFile: (NSString*) filename as: (ULExportType) type
{
......@@ -3607,7 +3623,7 @@ Last-Update: 2018-01-07
switch((int)type)
{
@@ -246,7 +244,6 @@
@@ -246,7 +245,6 @@
- (void) exportObject: (id) anObject toFile: (NSString*) filename format: (NSString*) format
{
......@@ -3615,7 +3631,7 @@ Last-Update: 2018-01-07
NSString* selectorString;
if([format isEqual: @"binary archive"])
@@ -324,7 +321,7 @@
@@ -324,7 +322,7 @@
- (void) exportCurrentPasteboardObjectAs: (ULExportType) type
{
int result;
......@@ -3624,7 +3640,7 @@ Last-Update: 2018-01-07
NSArray* availableTypes;
NSSavePanel* savePanel;
id exportObject;
@@ -349,7 +346,6 @@
@@ -349,7 +347,6 @@
{
//Take any extension off filename
//This just makes it easier to work with it later
......@@ -3632,7 +3648,27 @@ Last-Update: 2018-01-07
exportObject = [pasteboard objectForType: className];
[self exportObject: exportObject
toFile: filename
@@ -509,11 +505,10 @@
@@ -430,11 +427,6 @@
if(result == NSOKButton)
{
-//Gnustep base pre 0.16
-#if defined GNUSTEP && GS_API_VERSION(0, 011600)
- [string writeToFile: filename
- atomically: NO];
-#else
[string writeToFile: filename
atomically: NO
encoding: NSUTF8StringEncoding
@@ -442,7 +434,6 @@
if(error != nil)
ULRunErrorPanel(error);
-#endif
}
}
@@ -509,11 +500,10 @@
int i;
NSRange numRange;
NSMutableString* string = [NSMutableString new];
......@@ -3646,7 +3682,7 @@ Last-Update: 2018-01-07
matrixName = [matrixList titleOfSelectedItem];
@@ -565,7 +560,6 @@
@@ -565,7 +555,6 @@
{
useAtoms = YES;
[string appendString: @"recipient: atoms\n"];
......
debian/rules
View file @ f95145f4
......@@ -44,11 +44,11 @@ override_dh_auto_build:
# $(MAKE) -f GNUmakefile ...). This is the default mode of operation,
# even if no -j option is used. GNUSTEP_MAKE_PARALLEL_BUILDING=no
# prevents messing the MAKELEVEL again.
MAKELEVEL=0 $(MAKE) GNUSTEP_MAKE_PARALLEL_BUILDING=no $(optim) \
messages=yes $(shell dpkg-buildflags --export=cmdline)
MAKELEVEL=0 dh_auto_build -- GNUSTEP_MAKE_PARALLEL_BUILDING=no \
$(optim) $(verbose) $(shell dpkg-buildflags --export=cmdline)
override_dh_auto_install:
$(MAKE) install messages=yes DESTDIR=$(d_app) \
dh_auto_install -- $(verbose) DESTDIR=$(d_app) \
GNUSTEP_SYSTEM_LIBRARIES=/usr/lib/adun.app \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
mkdir -p $(d_app)/usr/share/GNUstep
......@@ -70,4 +70,3 @@ override_dh_link:
# We install the libraries at /usr/lib/adun.app.
override_dh_makeshlibs:
dh_makeshlibs -n