View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0001463 | Virtual Planets Atlas | General | public | 15-12-05 19:24 | 15-12-22 10:15 |
| Reporter | Mattia Verga | Assigned To | Patrick Chevalley | ||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | resolved | Resolution | fixed | ||
| Product Version | 1.0 | ||||
| Summary | 0001463: Packaging RPMs for Fedora | ||||
| Description | I'm starting to package VPA for inclusion in Fedora and while working on it I found many issues. I've already fixed some of them (you can download my .src.rpm from http://www.coolbits.it/fedora/virtualplanet-1.0-1.fc23.src.rpm and use my patches), but for some other I need your help. - First of all, RPMs provided by you from sourceforge are not installing because they have conflicting files. - In the software source code (virtualplanet-1.0-src.tar.xz) there are Textures/, overlay/ and Bumpmap/ directories that are useless, because you pull them from external source files. Cleaning those directories from source would save a lot of space. - The .desktop file provided does not validate (patch provided in my .src.rpm) - Lacks icons in /usr/share/icons (patch provided in my .src.rpm) - License text not provided (patch provided in my .src.rpm) - Not all translations are installed (patch provided in my .src.rpm) - Library file libplan404.so should be executable (patch provided in my .src.rpm) - Incorrect FSF address in source files (patch provided in my .src.rpm) I need your help to fix another issue with libplan404: since it is a private library I need to move it in a subdirectory, like specified in https://fedoraproject.org/wiki/Common_Rpmlint_issues#invalid-soname but I don't know how to do that. I also have a couple of questions: what's the licensing of the provided documentation? And on VPA homepage you say that "Textures, overlays and databases informations are copyrighted and can only be used with Virtual Planets Atlas." but you also say "We have used datas and pictures from NASA which are in the public domain. But we have also obtained the authorization to use textures realized by Phil Stooke from the Lunar and Planetary Institute and the support of Emily Lakdawalla of the Planetary Society". Is it correct if I mark the data as "Public domain"? Thanks. | ||||
| Tags | No tags attached. | ||||
|
|
Hi Mattia, Lot of points for a single report! I will give my opinion here, then fix the trivial points so we can continue to discuss the others. For clarity I respond below each point. - First of all, RPMs provided by you from sourceforge are not installing because they have conflicting files. It only conflict on directory /usr/share/virtualplanet so it is safe to use --force. But I agree to move this few files to the "data" package to remove the conflict. - In the software source code (virtualplanet-1.0-src.tar.xz) there are Textures/, overlay/ and Bumpmap/ directories that are useless, because you pull them from external source files. Cleaning those directories from source would save a lot of space. This is not the same files. The external download are the ready to use texture made of thousand of small jpeg files. The files in source are the way to build this texture using the original data from JPL or other. If the data are available online they are not included, only the build script is. But for some other I have to include the original picture because they are not easily available. What I can do is a different top level svn repo for this data. - The .desktop file provided does not validate (patch provided in my .src.rpm) OK - Lacks icons in /usr/share/icons (patch provided in my .src.rpm) OK, no problem if icons are now required at this location. - License text not provided (patch provided in my .src.rpm) OK - Not all translations are installed (patch provided in my .src.rpm) This is intentional because the translation other than French and English are not ready. The other language are directly copied from VMA, this is a good basis but they miss a lot of text. - Library file libplan404.so should be executable (patch provided in my .src.rpm) I think this is libvpa404.so Why not? but why should a library be executable? it work on any system without that. - Incorrect FSF address in source files (patch provided in my .src.rpm) OK I need your help to fix another issue with libplan404: since it is a private library I need to move it in a subdirectory, like specified in https://fedoraproject.org/wiki/Common_Rpmlint_issues#invalid-soname [^] but I don't know how to do that. Do you want I add versioning, like libvpa404.so.1 ? I also have a couple of questions: what's the licensing of the provided documentation? I will add a GNU FDL license text in the doc directory. And on VPA homepage you say that "Textures, overlays and databases informations are copyrighted and can only be used with Virtual Planets Atlas." but you also say "We have used datas and pictures from NASA which are in the public domain. But we have also obtained the authorization to use textures realized by Phil Stooke from the Lunar and Planetary Institute and the support of Emily Lakdawalla of the Planetary Society". Is it correct if I mark the data as "Public domain"? Yes, you can mark all as "Public domain". I have one more question about your patch virtualplanet-fix-debuginfo.patch Do you do that for testing or you really want to distribute debug files ? Patrick |
|
|
Yep, sorry for having bloated all the problems in a single report... About libvpa404.so : the executable bit on libraries is a Fedora specific requirement, so no need for you to change in the sources (I can easily patch it when building on Fedora build system like I do for your other project). Also the versioning problem is Fedora specific requirement, but if you can add versioning (like on ccdciel) it would be better. The virtualplanet-fix-debuginfo.patch is again Fedora specific, because Fedora requires debug files to be present. Again, you don't need to change anything, I know you apply better optimization on your binaries, so I can change settings only on Fedora to have better debug compatibility. Thanks for the info on license stuff, Fedora guys are very restrictive to what can be included in the distribution, but if all goes under Public Domain there's no problem to include VPA in main repositories! Mattia |
|
|
OK, I already fix the following: Avoid conflict between binary and data RPM: http://sourceforge.net/p/virtualplanet/code/86/ Fix desktop file: http://sourceforge.net/p/virtualplanet/code/87/ Add missing icons: http://sourceforge.net/p/virtualplanet/code/88/ Add license files: http://sourceforge.net/p/virtualplanet/code/89/ Fix FSF address: http://sourceforge.net/p/virtualplanet/code/90/ Add documentation license: http://sourceforge.net/p/virtualplanet/code/91/ |
|
|
rev. 96 suppress the folders textures, Bumpmap and Overlay. They are now in branches/vpadata |
|
|
Now about the library. I think it is time to really fix that and not just make small adjustment as I do up to now. There is three libraries I need in my different software : plan404, getdss and wcs. This libraries provide a Pascal language friendly interface to C or C++ code written by other people. This is not a private library as the same code is used in all my projects, but at the moment I give them different name to avoid conflict between packages. The good solution is to remove all this libraries from each software and make a new package to provide them with a full versioned name. I can open a new Sourceforge project to home this libraries, something like pasastrolib. You have to package it in Fedora, add pasastrolib.rpm, containing libpasplan404.so.1.0, libpasgetdss.so.1.0 and libpaswcs.so.1.0 in /usr/lib/. This package is a new requirement for skychart, virtualmoon, virtualplanet, ccdciel. Is this OK for you? The problem I have to solve: - Windows version require a dll in each application directory. Maybe I have to keep a copy of the library source with each project. - Look for the best option on Mac OS X. - This is more complicated for people downloading the binary packages from Sourceforge. They need clear explanation how to get the requirement. - Make some test on every platform to be sure the old .so are removed when the new package is installed. |
|
|
>> >>The good solution is to remove all this libraries from each software and >>make a new package to provide them with a full versioned name. >> Yes, this would be the best and cleanest solution, but I really have no idea on how things can become complicated for you with Mac and Windows port (and that's why I didn't suggested that before). About Fedora, there would be no problems on packaging a new separate project containing the libraries. Thank you for you great willingness. |
|
|
I separate the linux library for all the projects. The solution for Mac and Windows is to let the source library to build them as in previous version. Only the makefile is changed to not compile the lib on linux. The new prerequisite package is available here: http://sourceforge.net/projects/libpasastro/ It install libpasgetdss.so.1.0 libpasplan404.so.1.0 libpaswcs.so.1.0 when installing the package, ldconfig make the symbolic link used in the program: libpasgetdss.so.1 libpasplan404.so.1 libpaswcs.so.1 For virtualplanet the change is 97: http://sourceforge.net/p/virtualplanet/code/97/ For ccdciel 112: http://sourceforge.net/p/ccdciel/code/112/ For skychart 3155: http://sourceforge.net/p/skychart/code/3155/ For virtualmoon 599: http://sourceforge.net/p/virtualmoon/code/599/ |
|
|
I made the new package locally, there are few problems pointed out by rpmlint: - symbolic link should be included in package and not rely on ldconfig automation to make sure that will be deleted upon package uninstallation (since this is pointed out by rpmlint to be an "Error" and not as a "Warning", I think it will block inclusion on Fedora) - wcs sources have incorrect FSF address (patch attached) - some sources have unneeded executable bit set: getdss/getdss_lib.cpp , getdss/getdss_dll.cpp , plan404/plan404.c , plan404/plan404.h , plan404/plantbl.h Also, libraries should be installed in /usr/lib/ or /usr/lib64/ coherently with the build architecture. Can the install.sh script be modified to achieve that? |
|
|
libpasastro-1.0-fix-FSF.patch (36,308 bytes)
diff -U 3 -H -d -r -N -- b/wcs/COPYING c/wcs/COPYING
--- b/wcs/COPYING 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/COPYING 2015-12-18 19:21:21.069021109 +0100
@@ -3,7 +3,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff -U 3 -H -d -r -N -- b/wcs/actread.c c/wcs/actread.c
--- b/wcs/actread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/actread.c 2015-12-18 19:21:21.041017555 +0100
@@ -16,7 +16,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/binread.c c/wcs/binread.c
--- b/wcs/binread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/binread.c 2015-12-18 19:21:21.049018571 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/caphot.c c/wcs/caphot.c
--- b/wcs/caphot.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/caphot.c 2015-12-18 19:21:21.051018825 +0100
@@ -16,7 +16,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/catutil.c c/wcs/catutil.c
--- b/wcs/catutil.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/catutil.c 2015-12-18 19:21:21.063020348 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/cel.c c/wcs/cel.c
--- b/wcs/cel.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/cel.c 2015-12-18 19:21:21.067020855 +0100
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/ctgread.c c/wcs/ctgread.c
--- b/wcs/ctgread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/ctgread.c 2015-12-18 19:21:21.076021998 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/daoread.c c/wcs/daoread.c
--- b/wcs/daoread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/daoread.c 2015-12-18 19:21:21.078022251 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/dateutil.c c/wcs/dateutil.c
--- b/wcs/dateutil.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/dateutil.c 2015-12-18 19:21:21.093024155 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/distort.c c/wcs/distort.c
--- b/wcs/distort.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/distort.c 2015-12-18 19:21:21.095024409 +0100
@@ -18,7 +18,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/dsspos.c c/wcs/dsspos.c
--- b/wcs/dsspos.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/dsspos.c 2015-12-18 19:21:21.097024663 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fileutil.c c/wcs/fileutil.c
--- b/wcs/fileutil.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fileutil.c 2015-12-18 19:21:21.101025171 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/findstar.c c/wcs/findstar.c
--- b/wcs/findstar.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/findstar.c 2015-12-18 19:21:21.105025678 +0100
@@ -16,7 +16,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fitsfile.c c/wcs/fitsfile.c
--- b/wcs/fitsfile.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fitsfile.c 2015-12-18 19:21:21.113026694 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fitsfile.h c/wcs/fitsfile.h
--- b/wcs/fitsfile.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fitsfile.h 2015-12-18 19:21:21.118027328 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fitshead.h c/wcs/fitshead.h
--- b/wcs/fitshead.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fitshead.h 2015-12-18 19:21:21.119027455 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fitswcs.c c/wcs/fitswcs.c
--- b/wcs/fitswcs.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fitswcs.c 2015-12-18 19:21:21.122027836 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fortcat.c c/wcs/fortcat.c
--- b/wcs/fortcat.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fortcat.c 2015-12-18 19:21:21.123027963 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/fortwcs.c c/wcs/fortwcs.c
--- b/wcs/fortwcs.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/fortwcs.c 2015-12-18 19:21:21.125028217 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/gsc2read.c c/wcs/gsc2read.c
--- b/wcs/gsc2read.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/gsc2read.c 2015-12-18 19:21:21.127028470 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/gscread.c c/wcs/gscread.c
--- b/wcs/gscread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/gscread.c 2015-12-18 19:21:21.133029232 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/hget.c c/wcs/hget.c
--- b/wcs/hget.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/hget.c 2015-12-18 19:21:21.141030247 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/hput.c c/wcs/hput.c
--- b/wcs/hput.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/hput.c 2015-12-18 19:21:21.146030882 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/iget.c c/wcs/iget.c
--- b/wcs/iget.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/iget.c 2015-12-18 19:21:21.149031263 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/imgetwcs.c c/wcs/imgetwcs.c
--- b/wcs/imgetwcs.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/imgetwcs.c 2015-12-18 19:21:21.152031643 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/imhfile.c c/wcs/imhfile.c
--- b/wcs/imhfile.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/imhfile.c 2015-12-18 19:21:21.159032532 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/imio.c c/wcs/imio.c
--- b/wcs/imio.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/imio.c 2015-12-18 19:21:21.164033166 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/imio.h c/wcs/imio.h
--- b/wcs/imio.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/imio.h 2015-12-18 19:21:21.165033293 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/imrotate.c c/wcs/imrotate.c
--- b/wcs/imrotate.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/imrotate.c 2015-12-18 19:21:21.168033674 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/imsetwcs.c c/wcs/imsetwcs.c
--- b/wcs/imsetwcs.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/imsetwcs.c 2015-12-18 19:21:21.173034309 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/lin.c c/wcs/lin.c
--- b/wcs/lin.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/lin.c 2015-12-18 19:21:21.185035832 +0100
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/lwcs.h c/wcs/lwcs.h
--- b/wcs/lwcs.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/lwcs.h 2015-12-18 19:21:21.187036086 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/matchstar.c c/wcs/matchstar.c
--- b/wcs/matchstar.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/matchstar.c 2015-12-18 19:21:21.196037228 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/platefit.c c/wcs/platefit.c
--- b/wcs/platefit.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/platefit.c 2015-12-18 19:21:21.204038243 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/platepos.c c/wcs/platepos.c
--- b/wcs/platepos.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/platepos.c 2015-12-18 19:21:21.206038497 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/proj.c c/wcs/proj.c
--- b/wcs/proj.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/proj.c 2015-12-18 19:21:21.227041162 +0100
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/sdssread.c c/wcs/sdssread.c
--- b/wcs/sdssread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/sdssread.c 2015-12-18 19:21:21.230041543 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/skybotread.c c/wcs/skybotread.c
--- b/wcs/skybotread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/skybotread.c 2015-12-18 19:21:21.233041924 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/sortstar.c c/wcs/sortstar.c
--- b/wcs/sortstar.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/sortstar.c 2015-12-18 19:21:21.237042432 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/sph.c c/wcs/sph.c
--- b/wcs/sph.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/sph.c 2015-12-18 19:21:21.238042558 +0100
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/tabread.c c/wcs/tabread.c
--- b/wcs/tabread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/tabread.c 2015-12-18 19:21:21.252044335 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/tmcread.c c/wcs/tmcread.c
--- b/wcs/tmcread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/tmcread.c 2015-12-18 19:21:21.259045224 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/tnxpos.c c/wcs/tnxpos.c
--- b/wcs/tnxpos.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/tnxpos.c 2015-12-18 19:21:21.264045858 +0100
@@ -18,7 +18,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/ty2read.c c/wcs/ty2read.c
--- b/wcs/ty2read.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/ty2read.c 2015-12-18 19:21:21.270046620 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/uacread.c c/wcs/uacread.c
--- b/wcs/uacread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/uacread.c 2015-12-18 19:21:21.276047381 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/ubcread.c c/wcs/ubcread.c
--- b/wcs/ubcread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/ubcread.c 2015-12-18 19:21:21.282048143 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/ucacread.c c/wcs/ucacread.c
--- b/wcs/ucacread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/ucacread.c 2015-12-18 19:21:21.289049031 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/ujcread.c c/wcs/ujcread.c
--- b/wcs/ujcread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/ujcread.c 2015-12-18 19:21:21.294049666 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/wcs.c c/wcs/wcs.c
--- b/wcs/wcs.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcs.c 2015-12-18 19:21:21.305051062 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/wcs.h c/wcs/wcs.h
--- b/wcs/wcs.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcs.h 2015-12-18 19:21:21.326053727 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/wcscat.h c/wcs/wcscat.h
--- b/wcs/wcscat.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcscat.h 2015-12-18 19:21:21.312051950 +0100
@@ -16,7 +16,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/wcscon.c c/wcs/wcscon.c
--- b/wcs/wcscon.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcscon.c 2015-12-18 19:21:21.322053220 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/wcsinit.c c/wcs/wcsinit.c
--- b/wcs/wcsinit.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcsinit.c 2015-12-18 19:21:21.333054616 +0100
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/wcslib.c c/wcs/wcslib.c
--- b/wcs/wcslib.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcslib.c 2015-12-18 19:21:21.338055250 +0100
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/wcslib.h c/wcs/wcslib.h
--- b/wcs/wcslib.h 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcslib.h 2015-12-18 19:21:21.341055631 +0100
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/wcstrig.c c/wcs/wcstrig.c
--- b/wcs/wcstrig.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/wcstrig.c 2015-12-18 19:21:21.342055758 +0100
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Correspondence concerning WCSLIB may be directed to:
* Internet email: mcalabre@atnf.csiro.au
diff -U 3 -H -d -r -N -- b/wcs/webread.c c/wcs/webread.c
--- b/wcs/webread.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/webread.c 2015-12-18 19:21:21.346056266 +0100
@@ -18,7 +18,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
diff -U 3 -H -d -r -N -- b/wcs/worldpos.c c/wcs/worldpos.c
--- b/wcs/worldpos.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/worldpos.c 2015-12-18 19:21:21.349056646 +0100
@@ -25,7 +25,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning AIPS should be addressed as follows:
Internet email: aipsmail@nrao.edu
diff -U 3 -H -d -r -N -- b/wcs/zpxpos.c c/wcs/zpxpos.c
--- b/wcs/zpxpos.c 2015-12-18 10:26:19.000000000 +0100
+++ c/wcs/zpxpos.c 2015-12-18 19:21:21.352057027 +0100
@@ -19,7 +19,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Correspondence concerning WCSTools should be addressed as follows:
Internet email: dmink@cfa.harvard.edu
|
|
|
- symbolic link should be included in package and not rely on ldconfig automation to make sure that will be deleted upon package uninstallation (since this is pointed out by rpmlint to be an "Error" and not as a "Warning", I think it will block inclusion on Fedora) My SPEC files include %post and %postun as specified here: https://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries ldconfig make and remove the symbolic link according to the lib SONAME and I think it is very bad to force other link again that. I let you make a patch to the SPEC or install file for Fedora if this is really required. - wcs sources have incorrect FSF address (patch attached) Thank you, fixed. - some sources have unneeded executable bit set: getdss/getdss_lib.cpp , getdss/getdss_dll.cpp , plan404/plan404.c , plan404/plan404.h , plan404/plantbl.h Also fixed by rev 5 http://sourceforge.net/p/libpasastro/code/5/ - Also, libraries should be installed in /usr/lib/ or /usr/lib64/ coherently with the build architecture. Can the install.sh script be modified to achieve that? At the moment I do that in the buildpkg.sh script just before to make the rpm because other distrib do not use lib64. If I want to do it in install.sh I need to test for x86_64 and for fedora/redhat. Is the presence of the file /etc/redhat-release a good way to test that? Note that in this case I can also include the symlink in install.sh only for fedora, and add the link to the SPEC file. |
|
|
Mattia, Can you tell me if the following install.sh is OK? #!/bin/bash destdir=$1 if [ -z "$destdir" ]; then export destdir=/tmp/libpasastro fi echo Install LibPasAstro to $destdir install -m 755 -d $destdir install -m 755 -d $destdir/lib install -m 755 -d $destdir/share install -m 755 -d $destdir/share/doc install -m 755 -d $destdir/share/doc/libpasastro if [ -f /etc/redhat-release ]; then if [ $(arch) = 'x86_64' ]; then install -v -m 644 -s getdss/libpasgetdss.so.1.0 $destdir/lib64/ install -v -m 644 -s plan404/libpasplan404.so.1.0 $destdir/lib64/ install -v -m 644 -s wcs/libpaswcs.so.1.0 $destdir/lib64/ ln -s $destdir/lib64/libpasgetdss.so.1.0 $destdir/lib64/libpasgetdss.so.1 ln -s $destdir/lib64/libpasplan404.so.1.0 $destdir/lib64/libpasplan404.so.1 ln -s $destdir/lib64/libpaswcs.so.1.0 $destdir/lib64/libpaswcs.so.1 else install -v -m 644 -s getdss/libpasgetdss.so.1.0 $destdir/lib/ install -v -m 644 -s plan404/libpasplan404.so.1.0 $destdir/lib/ install -v -m 644 -s wcs/libpaswcs.so.1.0 $destdir/lib/ ln -s $destdir/lib/libpasgetdss.so.1.0 $destdir/lib/libpasgetdss.so.1 ln -s $destdir/lib/libpasplan404.so.1.0 $destdir/lib/libpasplan404.so.1 ln -s $destdir/lib/libpaswcs.so.1.0 $destdir/lib/libpaswcs.so.1 fi else install -v -m 644 -s getdss/libpasgetdss.so.* $destdir/lib/ install -v -m 644 -s plan404/libpasplan404.so.* $destdir/lib/ install -v -m 644 -s wcs/libpaswcs.so.* $destdir/lib/ fi install -v -m 644 changelog $destdir/share/doc/libpasastro/changelog install -v -m 644 copyright $destdir/share/doc/libpasastro/copyright |
|
|
> At the moment I do that in the buildpkg.sh script just before to make the rpm because other distrib do not use lib64. Oh, I thought that every linux distrib was using lib64 on 64bit architectures, now I see. Ok, don't make any change upstream, I will do the change in my .spec file in the %prep section with: sed -i 's/\$destdir\/lib/\$destdir\/%{_lib}/g' ./install.sh That will change '$destdir/lib' in '$destdir/lib64' on 64bit systems. About the symlinks, I will try to include the package in Fedora without them, if they absolutely want to have symlinks generated by the package I will apply the change to the install.sh script as you suggested. Thank you. Mattia |
|
|
Thank you Mattia. I close this issue now, but open another one in the case I can make some other change to simplify the packaging. |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 15-12-05 19:24 | Mattia Verga | New Issue | |
| 15-12-16 15:57 | Patrick Chevalley | Note Added: 0003126 | |
| 15-12-16 15:57 | Patrick Chevalley | Assigned To | => Patrick Chevalley |
| 15-12-16 15:57 | Patrick Chevalley | Status | new => feedback |
| 15-12-16 15:57 | Patrick Chevalley | Fixed in Version | 0.3.0 => |
| 15-12-16 15:57 | Patrick Chevalley | Target Version | 0.3.0 => |
| 15-12-16 19:58 | Mattia Verga | Note Added: 0003128 | |
| 15-12-16 19:58 | Mattia Verga | Status | feedback => assigned |
| 15-12-17 11:43 | Patrick Chevalley | Note Added: 0003129 | |
| 15-12-17 12:12 | Patrick Chevalley | Note Added: 0003130 | |
| 15-12-17 14:06 | Patrick Chevalley | Note Added: 0003131 | |
| 15-12-17 14:06 | Patrick Chevalley | Status | assigned => feedback |
| 15-12-17 14:15 | Patrick Chevalley | Note Edited: 0003131 | |
| 15-12-17 17:34 | Mattia Verga | Note Added: 0003132 | |
| 15-12-17 17:34 | Mattia Verga | Status | feedback => assigned |
| 15-12-18 13:56 | Patrick Chevalley | Note Added: 0003133 | |
| 15-12-18 13:56 | Patrick Chevalley | Status | assigned => feedback |
| 15-12-19 09:15 | Mattia Verga | Note Added: 0003134 | |
| 15-12-19 09:15 | Mattia Verga | Status | feedback => assigned |
| 15-12-19 09:16 | Mattia Verga | File Added: libpasastro-1.0-fix-FSF.patch | |
| 15-12-19 10:01 | Patrick Chevalley | Note Added: 0003135 | |
| 15-12-19 10:04 | Patrick Chevalley | Status | assigned => feedback |
| 15-12-19 11:08 | Patrick Chevalley | Note Added: 0003136 | |
| 15-12-19 13:49 | Mattia Verga | Note Added: 0003137 | |
| 15-12-19 13:49 | Mattia Verga | Status | feedback => assigned |
| 15-12-22 10:15 | Patrick Chevalley | Note Added: 0003139 | |
| 15-12-22 10:15 | Patrick Chevalley | Status | assigned => resolved |
| 15-12-22 10:15 | Patrick Chevalley | Resolution | open => fixed |
| 15-12-22 10:15 | Patrick Chevalley | Fixed in Version | => 1.1 |
| 15-12-22 10:15 | Patrick Chevalley | Target Version | => 1.1 |
