Author: yavor-guest
Date: 2009-10-07 21:36:36 +0000 (Wed, 07 Oct 2009)
New Revision: 4182
Added:
trunk/packages/adun.app/trunk/debian/README.source
Removed:
trunk/packages/adun.app/trunk/debian/patches/10_gcc-4.3-inline.dpatch
trunk/packages/adun.app/trunk/debian/patches/25_mipsel-ftbfs.dpatch
Modified:
trunk/packages/adun.app/trunk/debian/
trunk/packages/adun.app/trunk/debian/UL.desktop
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/copyright
trunk/packages/adun.app/trunk/debian/menu
trunk/packages/adun.app/trunk/debian/patches/00list
trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch
trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch
trunk/packages/adun.app/trunk/debian/rules
trunk/packages/adun.app/trunk/debian/watch
Log:
* New upstream release.
* debian/compat: Set to 7.
* debian/control (Uploaders): Reluctantly add myself.
(Build-Depends): Bump debhelper to >= 7. Add imagemagick for the icon
conversion.
(Standards-Version): Claim compliance with 3.8.3.
(Depends): Add ${gnustep:Depends}.
* debian/patches/10_gcc-4.3-inline.dpatch:
* debian/patches/25_mipsel-ftbfs.dpatch: Remove; fixed upstream.
* debian/patches/15_link-properly.dpatch: Update and remove the
workaround for the GSL linking issue; fixed in binutils
(http://sourceware.org/ml/binutils/2009-01/msg00413.html).
* debian/patches/20_paths.dpatch: Refresh.
* debian/patches/00list: Update.
* debian/rules (external): New variable.
(build-stamp): Convert the icon in XPM format.
(install): Use dh_prep instead of dh_clean -k. Install the XPM icon.
(clean-patched): Don't make the `clean' target, `distclean' is
sufficient. Delete the generated icon.
* debian/UL.desktop: Bump version, add Icon field.
* debian/menu: Add icon.
* debian/watch: Comment out the uversionmangle option, does harm with
the current state of affairs.
* debian/copyright: Update copyright years. Mention that the package is
distributed under GPLv3+.
* debian/README.source: New file.
Property changes on: trunk/packages/adun.app/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/packages/adun.app/trunk/debian/README.source
===================================================================
--- trunk/packages/adun.app/trunk/debian/README.source
(rev 0)
+++ trunk/packages/adun.app/trunk/debian/README.source 2009-10-07 21:36:36 UTC
(rev 4182)
@@ -0,0 +1,8 @@
+This package uses dpatch (in a fairly standard/straightforward way) to
+manage all modifications to the upstrean source. Please see
+
+ /usr/share/doc/dpatch/README.source.gz
+
+for further instructions.
+
+ -- Yavor Doganov <[email protected]>, Wed, 7 Oct 2009 23:42:15 +0300
Modified: trunk/packages/adun.app/trunk/debian/UL.desktop
===================================================================
--- trunk/packages/adun.app/trunk/debian/UL.desktop 2009-10-07 08:50:28 UTC
(rev 4181)
+++ trunk/packages/adun.app/trunk/debian/UL.desktop 2009-10-07 21:36:36 UTC
(rev 4182)
@@ -2,6 +2,7 @@
Type=Application
Name=Adun
Comment=Biomoleculal Simulator
-Version=0.8.2
+Version=0.81
+Icon=/usr/lib/GNUstep/Applications/UL.app/Resources/icon.tiff
Categories=Education;Science;Biology;
Exec=UL
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2009-10-07 08:50:28 UTC
(rev 4181)
+++ trunk/packages/adun.app/trunk/debian/changelog 2009-10-07 21:36:36 UTC
(rev 4182)
@@ -1,4 +1,4 @@
-adun.app (0.8.2-2) UNRELEASED; urgency=low
+adun.app (0.81-1) UNRELEASED; urgency=low
[ Andreas Tille ]
* Fixed watch file (Thanks to Daniel Leidert <[email protected]>)
@@ -9,8 +9,36 @@
* Using DM-Upload-Allowed instead of the XS- version.
* Fixing Vcs-* fields.
- -- Andreas Tille <[email protected]> Mon, 23 Mar 2009 21:30:11 +0100
+ [ Yavor Doganov ]
+ * New upstream release.
+ * debian/compat: Set to 7.
+ * debian/control (Uploaders): Reluctantly add myself.
+ (Build-Depends): Bump debhelper to >= 7. Add imagemagick for the icon
+ conversion.
+ (Standards-Version): Claim compliance with 3.8.3.
+ (Depends): Add ${gnustep:Depends}.
+ * debian/patches/10_gcc-4.3-inline.dpatch:
+ * debian/patches/25_mipsel-ftbfs.dpatch: Remove; fixed upstream.
+ * debian/patches/15_link-properly.dpatch: Update and remove the
+ workaround for the GSL linking issue; fixed in binutils
+ (http://sourceware.org/ml/binutils/2009-01/msg00413.html).
+ * debian/patches/20_paths.dpatch: Refresh.
+ * debian/patches/00list: Update.
+ * debian/rules (external): New variable.
+ (build-stamp): Convert the icon in XPM format.
+ (install): Use dh_prep instead of dh_clean -k. Install the XPM icon.
+ (clean-patched): Don't make the `clean' target, `distclean' is
+ sufficient. Delete the generated icon.
+ * debian/UL.desktop: Bump version, add Icon field.
+ * debian/menu: Add icon.
+ * debian/watch: Comment out the uversionmangle option, does harm with
+ the current state of affairs.
+ * debian/copyright: Update copyright years. Mention that the package is
+ distributed under GPLv3+.
+ * debian/README.source: New file.
+ -- Yavor Doganov <[email protected]> Thu, 08 Oct 2009 00:34:59 +0300
+
adun.app (0.8.2-1) unstable; urgency=low
* QA upload.
Modified: trunk/packages/adun.app/trunk/debian/compat
===================================================================
--- trunk/packages/adun.app/trunk/debian/compat 2009-10-07 08:50:28 UTC (rev
4181)
+++ trunk/packages/adun.app/trunk/debian/compat 2009-10-07 21:36:36 UTC (rev
4182)
@@ -1 +1 @@
-6
+7
Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control 2009-10-07 08:50:28 UTC
(rev 4181)
+++ trunk/packages/adun.app/trunk/debian/control 2009-10-07 21:36:36 UTC
(rev 4182)
@@ -3,19 +3,22 @@
Priority: optional
Maintainer: Debian-Med Packaging Team
<[email protected]>
DM-Upload-Allowed: yes
-Uploaders: Andreas Tille <[email protected]>
-Build-Depends: debhelper (>= 6),
+Uploaders: Andreas Tille <[email protected]>,
+ Yavor Doganov <[email protected]>
+Build-Depends: debhelper (>= 7),
dpatch,
libgnustep-gui-dev (>= 0.12.0),
- libgsl0-dev
-Standards-Version: 3.8.1
+ libgsl0-dev,
+ imagemagick
+Standards-Version: 3.8.3
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/
Package: adun.app
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${gnustep:Depends}
Recommends: gnuplot
Description: Molecular Simulator for GNUstep
This is a new extendible molecular simulation program that also
Modified: trunk/packages/adun.app/trunk/debian/copyright
===================================================================
--- trunk/packages/adun.app/trunk/debian/copyright 2009-10-07 08:50:28 UTC
(rev 4181)
+++ trunk/packages/adun.app/trunk/debian/copyright 2009-10-07 21:36:36 UTC
(rev 4182)
@@ -13,8 +13,8 @@
License:
Copyright (C) 2003-2007 Alexander V. Diemand (MolTalk)
- Copyright (C) 2005-2007 Michael A. Johnston
- Copyright (C) 2005-2007 Jordi Vill-Freixa
+ Copyright (C) 2005-2009 Michael A. Johnston
+ Copyright (C) 2005-2009 Jordi Vill-Freixa
Adun is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,8 +28,12 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301
USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+ 02110-1301 USA
+Note that because Adun dynamically links against a version of GSL that
+is under GPLv3+, Debian distributes the adun.app package under GPLv3+.
+
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL file.
Modified: trunk/packages/adun.app/trunk/debian/menu
===================================================================
--- trunk/packages/adun.app/trunk/debian/menu 2009-10-07 08:50:28 UTC (rev
4181)
+++ trunk/packages/adun.app/trunk/debian/menu 2009-10-07 21:36:36 UTC (rev
4182)
@@ -1,4 +1,5 @@
?package(adun.app):needs="X11" \
section="Applications/Science/Biology" \
title="Adun" command="/usr/bin/UL" \
- longtitle="Biomolecular Simulator"
+ longtitle="Biomolecular Simulator" \
+ icon="/usr/share/pixmaps/adun.xpm"
Modified: trunk/packages/adun.app/trunk/debian/patches/00list
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/00list 2009-10-07 08:50:28 UTC
(rev 4181)
+++ trunk/packages/adun.app/trunk/debian/patches/00list 2009-10-07 21:36:36 UTC
(rev 4182)
@@ -1,5 +1,3 @@
05_no-plugin-script
-10_gcc-4.3-inline
15_link-properly
20_paths
-25_mipsel-ftbfs
Deleted: trunk/packages/adun.app/trunk/debian/patches/10_gcc-4.3-inline.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/10_gcc-4.3-inline.dpatch
2009-10-07 08:50:28 UTC (rev 4181)
+++ trunk/packages/adun.app/trunk/debian/patches/10_gcc-4.3-inline.dpatch
2009-10-07 21:36:36 UTC (rev 4182)
@@ -1,404 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_gcc-4.3.dpatch by Yavor Doganov <[email protected]> and
-## Martin Michlmayr <[email protected]>
-## Forwarded: https://gna.org/bugs/index.php?12085
-## DP: Fixes FTBFS with GCC 4.3.
-
-...@dpatch@
-diff -urNad adun.app-0.8.2~/Kernel/Base/AdBaseFunctions.h
adun.app-0.8.2/Kernel/Base/AdBaseFunctions.h
---- adun.app-0.8.2~/Kernel/Base/AdBaseFunctions.h 2006-11-02
15:40:06.000000000 +0200
-+++ adun.app-0.8.2/Kernel/Base/AdBaseFunctions.h 2008-01-13
19:34:21.000000000 +0200
-@@ -9,6 +9,6 @@
- masses \e masses.
- */
-
--inline double AdCalculateKineticEnergy(DoubleMatrix* velocities, double*
masses);
-+extern double AdCalculateKineticEnergy(DoubleMatrix* velocities, double*
masses);
-
- #endif
-diff -urNad adun.app-0.8.2~/Kernel/Base/AdForceFieldFunctions.h
adun.app-0.8.2/Kernel/Base/AdForceFieldFunctions.h
---- adun.app-0.8.2~/Kernel/Base/AdForceFieldFunctions.h 2008-01-13
19:33:38.000000000 +0200
-+++ adun.app-0.8.2/Kernel/Base/AdForceFieldFunctions.h 2008-01-13
19:33:48.000000000 +0200
-@@ -64,10 +64,10 @@
- extern bool __GRFNonbondedEnergyDebug__;
- extern bool __GRFNonbondedForceDebug__;
-
--inline void AdNonbondedEnergyLog(char* cutType, char* ljType, int a1, int a2,
double ljA,
-+extern void AdNonbondedEnergyLog(char* cutType, char* ljType, int a1, int a2,
double ljA,
- double ljB, double charge, double sep, double estPot, double
ljPot,
- bool flag);
--inline void AdNonbondedForceLog(char* cutType, char* ljType, int a1, int a2,
double ljA,
-+extern void AdNonbondedForceLog(char* cutType, char* ljType, int a1, int a2,
double ljA,
- double ljB, double charge, double sep, double estPot, double
ljPot, double force,
- bool flag);
- /**
-@@ -93,78 +93,78 @@
- */
-
- /** Calculates the energy of a bond using a harmonic bond function */
--inline void AdHarmonicBondEnergy(double *bond, double **coordinates, double
*bnd_pot);
-+extern void AdHarmonicBondEnergy(double *bond, double **coordinates, double
*bnd_pot);
- /** Calculates the energy and force of a bond using a harmonic bond function
*/
--inline void AdHarmonicBondForce(double* bond, double **coordinates, double
**forces, double* bnd_pot);
-+extern void AdHarmonicBondForce(double* bond, double **coordinates, double
**forces, double* bnd_pot);
- /**
- Enzymix force field uses k*(x-x0)² instead of k/2*(x-xo)² like other force
fields
- */
--inline void AdEnzymixBondEnergy(double* bond, double **coordinates, double*
bnd_pot);
-+extern void AdEnzymixBondEnergy(double* bond, double **coordinates, double*
bnd_pot);
- /**
- As harmonic force except force magnitude is 2k*(x-x0) instead of k*(x-xo)
like other force fields
- */
--inline void AdEnzymixBondForce(double* bond, double **coordinates, double
**forces, double* bnd_pot);
-+extern void AdEnzymixBondForce(double* bond, double **coordinates, double
**forces, double* bnd_pot);
-
- /*
- * Harmonic Angle
- */
-
- /** Calculates the energy of an angle using a harmonic angle function */
--inline void AdHarmonicAngleEnergy(double *interaction, double **coordinates,
double *ang_pot);
--inline void AdHarmonicAngleForce(double *interaction, double **coordinates,
double **forces, double *ang_pot);
-+extern void AdHarmonicAngleEnergy(double *interaction, double **coordinates,
double *ang_pot);
-+extern void AdHarmonicAngleForce(double *interaction, double **coordinates,
double **forces, double *ang_pot);
- /**
- Enzymix force field uses k*(x-x0)² instead of k/2*(x-xo)² like other force
fields
- Where x is the angle.
- */
--inline void AdEnzymixAngleEnergy(double *interaction, double** coordinates,
double *ang_pot);
--inline void AdEnzymixAngleForce(double *interaction, double **coordinates,
double **forces, double *ang_pot);
-+extern void AdEnzymixAngleEnergy(double *interaction, double** coordinates,
double *ang_pot);
-+extern void AdEnzymixAngleForce(double *interaction, double **coordinates,
double **forces, double *ang_pot);
-
- /*
- * fourier torsion
- */
-
- /** calculates the energy of a proper torsion using a fourier torsion
function */
--inline void AdFourierTorsionEnergy(double *interaction, double **coordinates,
double *tor_pot);
--inline void AdFourierTorsionForce(double *interaction, double **coordinates,
double **forces, double *tor_pot);
-+extern void AdFourierTorsionEnergy(double *interaction, double **coordinates,
double *tor_pot);
-+extern void AdFourierTorsionForce(double *interaction, double **coordinates,
double **forces, double *tor_pot);
- /*
- Calculate the torsion angle for four atoms. Torsion 4 element array each
element an atom index. The
- atoms position must be given by the corresponding row in coordinates.
- */
--inline double AdCalculateTorsionAngle(int* torsion, double** coordinates);
-+extern double AdCalculateTorsionAngle(int* torsion, double** coordinates);
-
- /*
- * harmonic improper torsion
- */
-
- /** calculates the energy of an improper torsion using a harmonic function */
--inline void AdHarmonicImproperTorsionEnergy(double *interaction, double
**coordinates , double *itor_pot);
--inline void AdHarmonicImproperTorsionForce(double *interaction, double
**coordinates, double **forces, double *itor_pot);
-+extern void AdHarmonicImproperTorsionEnergy(double *interaction, double
**coordinates , double *itor_pot);
-+extern void AdHarmonicImproperTorsionForce(double *interaction, double
**coordinates, double **forces, double *itor_pot);
-
- /** Calculates the combined energy of a coloumb electrostatic and lennard
jones A term.
- Lennard Jones A uses parameters A and B. These functions are optimised for
use in
- Adun AdForceField obects.
- \todo Possibly move the separation and cutoff rejection code to AdunKernel
classes */
--inline void AdCoulombAndLennardJonesAEnergy(ListElement* interaction,
-+extern void AdCoulombAndLennardJonesAEnergy(ListElement* interaction,
- double** coordinates,
- double EPSILON_RP,
- double cutoff,
- double* vdw_pot,
- double* est_pot);
--inline void AdCoulombAndLennardJonesAForce(ListElement* interaction,
-+extern void AdCoulombAndLennardJonesAForce(ListElement* interaction,
- double** coordinates,
- double** forces,
- double EPSILON_RP,
- double cutoff,
- double* vdw_pot,
- double* est_pot);
--inline void AdShiftedCoulombAndLennardJonesAEnergy(ListElement* interaction,
-+extern void AdShiftedCoulombAndLennardJonesAEnergy(ListElement* interaction,
- double** coordinates,
- double EPSILON_RP,
- double cut,
- double r_cutoff2,
- double* vdw_pot,
- double* est_pot);
--inline void AdShiftedCoulombAndLennardJonesAForce(ListElement* interaction,
-+extern void AdShiftedCoulombAndLennardJonesAForce(ListElement* interaction,
- double** coordinates,
- double** forces,
- double EPSILON_RP,
-@@ -172,7 +172,7 @@
- double r_cutoff2,
- double* vdw_pot,
- double* est_pot);
--inline void AdGRFCoulombAndLennardJonesAEnergy(ListElement* interaction,
-+extern void AdGRFCoulombAndLennardJonesAEnergy(ListElement* interaction,
- double** coordinates,
- double EPSILON_RP,
- double cutoff,
-@@ -180,7 +180,7 @@
- double b1,
- double* vdw_pot,
- double* est_pot);
--inline void AdGRFCoulombAndLennardJonesAForce(ListElement* interaction,
-+extern void AdGRFCoulombAndLennardJonesAForce(ListElement* interaction,
- double** coordinates,
- double** forces,
- double EPSILON_RP,
-@@ -192,20 +192,20 @@
- /** Calculates the combined energy of a coloumb electrostatic and lennard
jones B term.
- Lennard Jones A uses parameters well depth and equilibrium separation.
- These functions are optimised for use in Adun AdForceField obects.*/
--inline void AdCoulombAndLennardJonesBEnergy(ListElement* interaction,
-+extern void AdCoulombAndLennardJonesBEnergy(ListElement* interaction,
- double** coordinates,
- double EPSILON_RP,
- double cutoff,
- double* vdw_pot,
- double* est_pot);
--inline void AdCoulombAndLennardJonesBForce(ListElement* interaction,
-+extern void AdCoulombAndLennardJonesBForce(ListElement* interaction,
- double** coordinates,
- double** forces,
- double EPSILON_RP,
- double cutoff,
- double* vdw_pot,
- double* est_pot);
--inline void AdShiftedCoulombAndLennardJonesBForce(ListElement* interaction,
-+extern void AdShiftedCoulombAndLennardJonesBForce(ListElement* interaction,
- double** coordinates,
- double** forces,
- double EPSILON_RP,
-@@ -213,14 +213,14 @@
- double r_cutoff2,
- double* vdw_pot,
- double* est_pot);
--inline void AdShiftedCoulombAndLennardJonesBEnergy(ListElement* interaction,
-+extern void AdShiftedCoulombAndLennardJonesBEnergy(ListElement* interaction,
- double** coordinates,
- double EPSILON_RP,
- double cut,
- double r_cutoff2,
- double* vdw_pot,
- double* est_pot);
--inline void AdGRFCoulombAndLennardJonesBEnergy(ListElement* interaction,
-+extern void AdGRFCoulombAndLennardJonesBEnergy(ListElement* interaction,
- double** coordinates,
- double EPSILON_RP,
- double cutoff,
-@@ -228,7 +228,7 @@
- double b1,
- double* vdw_pot,
- double* est_pot);
--inline void AdGRFCoulombAndLennardJonesBForce(ListElement* interaction,
-+extern void AdGRFCoulombAndLennardJonesBForce(ListElement* interaction,
- double** coordinates,
- double** forces,
- double EPSILON_RP,
-@@ -238,7 +238,7 @@
- double* vdw_pot,
- double* est_pot);
- //test
--inline void AdCoulombAndLennardJonesAForceTest(ListElement* interaction,
-+extern void AdCoulombAndLennardJonesAForceTest(ListElement* interaction,
- Vector3D* seperation_s,
- double** forces,
- double EPSILON_RP,
-diff -urNad adun.app-0.8.2~/Kernel/Base/AdLinkedList.h
adun.app-0.8.2/Kernel/Base/AdLinkedList.h
---- adun.app-0.8.2~/Kernel/Base/AdLinkedList.h 2008-01-13 19:33:38.000000000
+0200
-+++ adun.app-0.8.2/Kernel/Base/AdLinkedList.h 2008-01-13 19:33:48.000000000
+0200
-@@ -71,25 +71,25 @@
- \param index The index at which to insert the list. Currently not
implemented
- \return 0 on success, -1 on failure
- **/
--inline int AdSafeLinkedListAdd(ListElement*, ListElement*, int);
-+extern int AdSafeLinkedListAdd(ListElement*, ListElement*, int);
- /**
- Same as AdSafeLinkedListAdd but doesn't check if you've passed
- the last element.
- **/
--inline int AdUnsafeLinkedListAdd(ListElement*, ListElement*, int);
-+extern int AdUnsafeLinkedListAdd(ListElement*, ListElement*, int);
- /**
- Reinserts an element extracted with AdUnsafeLinkedListExtract
- Does not check that ListElement actually points to an element
- in a real list
- **/
--inline int AdUnsafeLinkedListReinsert(ListElement*);
-+extern int AdUnsafeLinkedListReinsert(ListElement*);
- /**
- Removes the element passed from the list. You CANNOT remove the first
and last
- element (big trouble if you do)
- \param list_el Pointer to the list element to be removed
- \returns 0 if succeds. -1 if you tried to remove the first or last list
elements.
- **/
--inline int AdSafeLinkedListRemove(ListElement*);
-+extern int AdSafeLinkedListRemove(ListElement*);
- /**
- The same as AdUnsafeLinkedListRemove except doesnt set the remove
- elements previous and next pointer to nil
-@@ -97,17 +97,17 @@
- \returns 0 if succeds. -1 if you tried to remove the first or last list
elements.
- **/
-
--inline int AdUnsafeLinkedListExtract(ListElement *list_el);
-+extern int AdUnsafeLinkedListExtract(ListElement *list_el);
- /**
- Same as safe_linked_list_remove() but doesn't check if the
- element is the first or last. Use with care.
- **/
--inline int AdUnsafeLinkedListRemove(ListElement*);
-+extern int AdUnsafeLinkedListRemove(ListElement*);
- /** Returns a pointer to the last element of the list. **/
--inline ListElement* AdLinkedListEnd(ListElement*);
-+extern ListElement* AdLinkedListEnd(ListElement*);
- /** Returns a pointer to the first element of the list **/
--inline ListElement* AdLinkedListStart(ListElement*);
--inline int AdLinkedListCount(ListElement*);
-+extern ListElement* AdLinkedListStart(ListElement*);
-+extern int AdLinkedListCount(ListElement*);
-
- /** \...@}**/
-
-diff -urNad adun.app-0.8.2~/Kernel/Base/AdMatrix.h
adun.app-0.8.2/Kernel/Base/AdMatrix.h
---- adun.app-0.8.2~/Kernel/Base/AdMatrix.h 2008-01-13 19:33:38.000000000
+0200
-+++ adun.app-0.8.2/Kernel/Base/AdMatrix.h 2008-01-13 19:33:48.000000000
+0200
-@@ -76,36 +76,36 @@
- @{
- **/
-
--inline void AdSetDoubleMatrixWithValue(DoubleMatrix *, double);
--inline void AdSetFloatMatrixWithValue(FloatMatrix *, float);
--inline void AdSetIntMatrixWithValue(IntMatrix *, int);
-+extern void AdSetDoubleMatrixWithValue(DoubleMatrix *, double);
-+extern void AdSetFloatMatrixWithValue(FloatMatrix *, float);
-+extern void AdSetIntMatrixWithValue(IntMatrix *, int);
-
--inline IntMatrix* AdIntMatrixFromRowSection(IntMatrix *, int , int);
--inline FloatMatrix* AdFloatMatrixFromRowSection(FloatMatrix *, int , int);
--inline DoubleMatrix* AdDoubleMatrixFromRowSection(DoubleMatrix *, int , int);
-+extern IntMatrix* AdIntMatrixFromRowSection(IntMatrix *, int , int);
-+extern FloatMatrix* AdFloatMatrixFromRowSection(FloatMatrix *, int , int);
-+extern DoubleMatrix* AdDoubleMatrixFromRowSection(DoubleMatrix *, int , int);
-
--inline IntMatrix* AdIntMatrixFromRowSelection(IntMatrix *, int* , int);
--inline FloatMatrix* AdFloatMatrixFromRowSelection(FloatMatrix *, int* , int);
--inline DoubleMatrix* AdDoubleMatrixFromRowSelection(DoubleMatrix *, int* ,
int);
-+extern IntMatrix* AdIntMatrixFromRowSelection(IntMatrix *, int* , int);
-+extern FloatMatrix* AdFloatMatrixFromRowSelection(FloatMatrix *, int* , int);
-+extern DoubleMatrix* AdDoubleMatrixFromRowSelection(DoubleMatrix *, int* ,
int);
-
--inline IntMatrix* AdIntMatrixFromColumnSection(IntMatrix *, int , int);
--inline FloatMatrix* AdFloatMatrixFromColumnSection(FloatMatrix *, int , int);
--inline DoubleMatrix* AdDoubleMatrixFromColumnSection(DoubleMatrix *, int ,
int);
-+extern IntMatrix* AdIntMatrixFromColumnSection(IntMatrix *, int , int);
-+extern FloatMatrix* AdFloatMatrixFromColumnSection(FloatMatrix *, int , int);
-+extern DoubleMatrix* AdDoubleMatrixFromColumnSection(DoubleMatrix *, int ,
int);
-
--inline IntMatrix* AdIntMatrixFromColumnSelection(IntMatrix *, int* , int);
--inline FloatMatrix* AdFloatMatrixFromColumnSelection(FloatMatrix *, int* ,
int);
--inline DoubleMatrix* AdDoubleMatrixFromColumnSelection(DoubleMatrix *, int* ,
int);
-+extern IntMatrix* AdIntMatrixFromColumnSelection(IntMatrix *, int* , int);
-+extern FloatMatrix* AdFloatMatrixFromColumnSelection(FloatMatrix *, int* ,
int);
-+extern DoubleMatrix* AdDoubleMatrixFromColumnSelection(DoubleMatrix *, int* ,
int);
-
--inline void AdFreeDoubleMatrix(DoubleMatrix*);
--inline void AdFreeIntMatrix(IntMatrix*);
--inline void AdFreeFloatMatrix(FloatMatrix*);
-+extern void AdFreeDoubleMatrix(DoubleMatrix*);
-+extern void AdFreeIntMatrix(IntMatrix*);
-+extern void AdFreeFloatMatrix(FloatMatrix*);
-
--inline IntMatrix* AdAllocateIntMatrix(int, int);
--inline FloatMatrix* AdAllocateFloatMatrix(int, int);
--inline DoubleMatrix* AdAllocateDoubleMatrix(int, int);
-+extern IntMatrix* AdAllocateIntMatrix(int, int);
-+extern FloatMatrix* AdAllocateFloatMatrix(int, int);
-+extern DoubleMatrix* AdAllocateDoubleMatrix(int, int);
-
- /**
- AdMatrix copy function.
- */
--inline void AdCopyAdMatrixToAdMatrix(DoubleMatrix*, DoubleMatrix*);
-+extern void AdCopyAdMatrixToAdMatrix(DoubleMatrix*, DoubleMatrix*);
- #endif
-diff -urNad adun.app-0.8.2~/Kernel/Base/AdSorter.h
adun.app-0.8.2/Kernel/Base/AdSorter.h
---- adun.app-0.8.2~/Kernel/Base/AdSorter.h 2008-01-13 19:33:38.000000000
+0200
-+++ adun.app-0.8.2/Kernel/Base/AdSorter.h 2008-01-13 19:33:48.000000000
+0200
-@@ -41,7 +41,7 @@
- @{
- */
-
--inline int AdIndexSorter(const void* el_one, const void* el_two);
-+extern int AdIndexSorter(const void* el_one, const void* el_two);
- int AdAscendingIntSort(const void* numberOne, const void* numberTwo);
-
- /** \...@}**/
-diff -urNad adun.app-0.8.2~/Kernel/Base/AdVector.h
adun.app-0.8.2/Kernel/Base/AdVector.h
---- adun.app-0.8.2~/Kernel/Base/AdVector.h 2008-01-13 19:33:38.000000000
+0200
-+++ adun.app-0.8.2/Kernel/Base/AdVector.h 2008-01-13 19:33:48.000000000
+0200
-@@ -73,26 +73,26 @@
- \param vector_two Pointer to a Vector3D structs
- \return The dot product of the two vectors
- **/
--inline double Ad3DDotProduct(Vector3D*, Vector3D*);
-+extern double Ad3DDotProduct(Vector3D*, Vector3D*);
- /**
- Calculates the cross product of two vectors.
- \param v_one Pointer to a Vector3D struct.
- \param v_two Pointer to a Vector3D struct.
- \param result Pointer to a Vector3D struct where the result vector will
be stored.
- **/
--inline void Ad3DCrossProduct(Vector3D*, Vector3D*, Vector3D*);
-+extern void Ad3DCrossProduct(Vector3D*, Vector3D*, Vector3D*);
- /**
- Calculates the length of the vector represented by Vector3D.
- struct vector and then assigns the result to vector->length.
- \param vector A pointer to a Vector3D struct.
- **/
--inline void Ad3DVectorLength(Vector3D*);
-+extern void Ad3DVectorLength(Vector3D*);
- /**
- Finds the unit vector related to a given vector.
- \param vector A pointer to a Vector3D struct.
- \param unit_vector Pointer to the Vector3D struct where the unit vector
is to be stored.
- **/
--inline void AdGet3DUnitVector(Vector3D*, Vector3D*);
-+extern void AdGet3DUnitVector(Vector3D*, Vector3D*);
- /**
- In essence generates uniformly distributed points on the unit sphere using \e
generator
- via the trig-method.
-@@ -100,25 +100,25 @@
- \param generator Pointer to a previously allocated gsl_rng instance which
will be used
- to generate the necessary random numbers.
- */
--inline void AdGetRandom3DUnitVector(Vector3D* vector, gsl_rng* generator);
--inline void Ad3DVectorLengthSquared(Vector3D*);
-+extern void AdGetRandom3DUnitVector(Vector3D* vector, gsl_rng* generator);
-+extern void Ad3DVectorLengthSquared(Vector3D*);
- /**
- Return the index of the minimium element in a standard double array.
- If there is more than one entry with the same value the smallest
- index is returned
- **/
--inline int AdDoubleArrayMin(double*, int);
-+extern int AdDoubleArrayMin(double*, int);
- /**
- Return the index of the maximum element in a standard double array.
- If there is more than one entry with the same value the smallest
- index is returned
- **/
--inline int AdDoubleArrayMax(double*, int);
-+extern int AdDoubleArrayMax(double*, int);
-
-
--inline void AdIntArrayIntersectionAndDifference(IntArrayStruct *prime,
IntArrayStruct *query, IntArrayStruct *intersection, IntArrayStruct
*complement);
--inline void AdIntArrayIntersection(IntArrayStruct *prime, IntArrayStruct
*query, IntArrayStruct *intersection);
--inline void AdIntArrayDifference(IntArrayStruct *prime, IntArrayStruct
*query, IntArrayStruct *difference);
-+extern void AdIntArrayIntersectionAndDifference(IntArrayStruct *prime,
IntArrayStruct *query, IntArrayStruct *intersection, IntArrayStruct
*complement);
-+extern void AdIntArrayIntersection(IntArrayStruct *prime, IntArrayStruct
*query, IntArrayStruct *intersection);
-+extern void AdIntArrayDifference(IntArrayStruct *prime, IntArrayStruct
*query, IntArrayStruct *difference);
-
- /** \...@}**/
-
Modified: trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch
2009-10-07 08:50:28 UTC (rev 4181)
+++ trunk/packages/adun.app/trunk/debian/patches/15_link-properly.dpatch
2009-10-07 21:36:36 UTC (rev 4182)
@@ -1,48 +1,21 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_build.dpatch by Yavor Doganov <[email protected]>
## Forwarded: not yet
-## DP: Link all objects with the libs they use symbols from. The
-## DP: `--no-as-needed' option is a workaround for #456898, which was
-## DP: incorrectly tagged `wontfix'.
+## DP: Link all objects with the libs they use symbols from.
@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.11
+ 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 -lgnustep-base -lgsl -lgslcblas
+AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgsl -lgslcblas -lm
$(FND_LIBS) $(OBJC_LIBS)
endif
- AdunKernel_OBJCFLAGS = -W -O3 -fconstant-string-class=NSConstantString
-diff -urNad adun.app-0.8.2~/Kernel/AdunKernel/GNUmakefile.preamble
adun.app-0.8.2/Kernel/AdunKernel/GNUmakefile.preamble
---- adun.app-0.8.2~/Kernel/AdunKernel/GNUmakefile.preamble 2008-01-17
12:37:12.000000000 +0200
-+++ adun.app-0.8.2/Kernel/AdunKernel/GNUmakefile.preamble 2008-01-17
12:38:28.000000000 +0200
-@@ -8,7 +8,7 @@
- ADDITIONAL_CFLAGS +=
-
- # Additional flags to pass to the linker
--ADDITIONAL_LDFLAGS +=
-+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lgsl -lgslcblas
-
- # Additional include directories the compiler should search
- ADDITIONAL_INCLUDE_DIRS +=
-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 += -Wl,--no-as-needed -lgsl -lgslcblas
-+LIBRARIES_DEPEND_UPON += -lgsl -lgslcblas -lm
-
- # Additional include directories the compiler should search
- ADDITIONAL_INCLUDE_DIRS += -I$(GSL_INCLUDE_DIR)
+ 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
@@ -117,18 +90,6 @@
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/ULFramework/GNUmakefile.preamble
adun.app-0.8.2/UL/ULFramework/GNUmakefile.preamble
---- adun.app-0.8.2~/UL/ULFramework/GNUmakefile.preamble 2008-01-17
12:37:12.000000000 +0200
-+++ adun.app-0.8.2/UL/ULFramework/GNUmakefile.preamble 2008-01-17
12:38:28.000000000 +0200
-@@ -12,7 +12,7 @@
- ADDITIONAL_CFLAGS +=
-
- # Additional flags to pass to the linker
--ADDITIONAL_LDFLAGS +=
-+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lgsl -lgslcblas -lm
-
- # Additional include directories the compiler should search
- ifeq ($(MAKELEVEL),3)
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
@@ -140,3 +101,16 @@
+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)
Modified: trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch
2009-10-07 08:50:28 UTC (rev 4181)
+++ trunk/packages/adun.app/trunk/debian/patches/20_paths.dpatch
2009-10-07 21:36:36 UTC (rev 4182)
@@ -17,28 +17,18 @@
[defaults setObject: adunCorePath forKey: @"AdunCorePath"];
[defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent:
@"adun/AdunServer.log"]
forKey: @"LogFile"];
-diff -urNad adun.app-0.8.2~/UL/ViewController.m
adun.app-0.8.2/UL/ViewController.m
+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 @@
- forKey: @"BuildOutput"];
+ #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/buildOutput"]
- forKey: @"BuildOutput"];
-@@ -95,8 +95,7 @@
- //This is because when installing from xcode its easier to install
locally.
- //While with PackageMaker the opposite is true.
- //We set a default to $HOME/bin which we override during the package
install process
-- [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent:
@"bin"]
-- forKey: @"AdunServerPath"];
-+ [defaults setObject: @"/usr/bin" forKey: @"AdunServerPath"];
- #endif
- [defaults setObject: [NSNumber numberWithDouble: 300] forKey:
@"AutoUpdateInterval"];
- [defaults setObject: [NSNumber numberWithBool: YES] forKey:
@"AutoUpdate"];
+ [defaults setObject: [NSHomeDirectory() stringByAppendingPathComponent:
@".adun/UL.log"]
+ forKey: @"LogFile"];
@@ -434,8 +433,7 @@
stringForKey: @"AdunServerPath"];
launchPath = [launchPath stringByAppendingPathComponent:
@"AdunServer"];
Deleted: trunk/packages/adun.app/trunk/debian/patches/25_mipsel-ftbfs.dpatch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/25_mipsel-ftbfs.dpatch
2009-10-07 08:50:28 UTC (rev 4181)
+++ trunk/packages/adun.app/trunk/debian/patches/25_mipsel-ftbfs.dpatch
2009-10-07 21:36:36 UTC (rev 4182)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_mipsel-ftbfs.dpatch by Yavor Doganov <[email protected]>
-## Forwarded: https://gna.org/bugs/index.php?12086
-## DP: Fixes FTBFS on mipsel where $HOME is not accessible.
-
-...@dpatch@
-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-18
23:08:33.000000000 +0200
-+++ adun.app-0.8.2/UL/XMLLib/GNUmakefile.preamble 2008-01-18
23:09:26.000000000 +0200
-@@ -15,7 +15,7 @@
- ADDITIONAL_LDFLAGS +=
-
- # Additional include directories the compiler should search
--ADDITIONAL_INCLUDE_DIRS += -I../ -I../../Kernel
-I../../Kernel/AdunKernel/Headers -I$(HOME)/GNUstep/Library/Headers
-+ADDITIONAL_INCLUDE_DIRS += -I../ -I../../Kernel
-I../../Kernel/AdunKernel/Headers
-
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS +=
-L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current
Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules 2009-10-07 08:50:28 UTC (rev
4181)
+++ trunk/packages/adun.app/trunk/debian/rules 2009-10-07 21:36:36 UTC (rev
4182)
@@ -8,6 +8,9 @@
d_app := $(CURDIR)/debian/adun.app
LDFLAGS := -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
+# Avoid building the bundled StepTalk framework.
+export external := no
+
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
OPTFLAG := -O0
else
@@ -20,6 +23,7 @@
dh_testdir
GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles MAKELEVEL=0 \
$(MAKE) OPTFLAG=$(OPTFLAG) LDFLAGS="$(LDFLAGS)" messages=yes
+ convert UL/Resources/icon.tiff -resize 32x32 adun.xpm
touch $@
clean: clean-patched unpatch
@@ -29,14 +33,14 @@
dh_testroot
$(RM) build-stamp
ifdef GS_MAKE_DIR
- gs_make clean distclean
+ gs_make distclean
endif
- dh_clean
+ dh_clean adun.xpm
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
# Install private libraries in /usr/lib/adun.app; fixes a Policy
# `SHOULD' violation (10.2).
dh_installdirs usr/lib/adun.app
@@ -54,6 +58,7 @@
rm
$(CURDIR)/debian/*.app/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop
install -D -m 644 debian/*.desktop \
$(d_app)/usr/share/applications/UL.desktop
+ dh_install adun.xpm usr/share/pixmaps/
# Build architecture-independent files here.
binary-indep: build install
Modified: trunk/packages/adun.app/trunk/debian/watch
===================================================================
--- trunk/packages/adun.app/trunk/debian/watch 2009-10-07 08:50:28 UTC (rev
4181)
+++ trunk/packages/adun.app/trunk/debian/watch 2009-10-07 21:36:36 UTC (rev
4182)
@@ -1,4 +1,7 @@
version=3
-opts=uversionmangle=s/^0\.([78])(\d)/0.$1.$2/, \
+# Upstream used a broken versioning scheme where a major release is
+# 0.7 and point releases are 0.71, 0.72, etc. Hopefully this is no
+# longer a concern, but if it turns out it is, uncommenting and
+# amending the line below should "fix" the watchfile accordingly.
+#opts=uversionmangle=s/^0\.([78])(\d)/0.$1.$2/, \
http://download.gna.org/adun/Adun-([\d.]+)\.tar\.gz
-
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
