--- geotranz-2.4.2.orig/Makefile +++ geotranz-2.4.2/Makefile @@ -0,0 +1,22 @@ + +DIRS=geotrans2 engine dt_cc +FLAVOURS=unix suse_linux redhat_linux + +all: + +makefile-build-indep-target: + make -C geotrans2/java_gui all + +makefile-build-arch-target: + for dir in $(DIRS); do \ + make -C $$dir/redhat_linux all || exit 1; \ + done; + +clean distclean: + for dir in $(DIRS); do \ + for flavour in $(FLAVOURS); do \ + make -C $$dir/$$flavour clean; \ + done; \ + done; + -make -C geotrans2/java_gui clean + --- geotranz-2.4.2.orig/geotrans2/java_gui/Makefile +++ geotranz-2.4.2/geotrans2/java_gui/Makefile @@ -0,0 +1,32 @@ +ICONS=geotrans/gui/icons + +all: jar + +jar: compile + test -f Geotrans_orig.gif || { \ + cp $(ICONS)/Geotrans.gif Geotrans_orig.gif; \ + giftrans -t '#ced0ce' -o $(ICONS)/Geotrans.gif Geotrans_orig.gif; \ + } + test -f Icon_orig.gif || { \ + cp $(ICONS)/Icon.gif Icon_orig.gif; \ + giftrans -t '#fcfefc' -o $(ICONS)/Icon.gif Icon_orig.gif; \ + } + test -f NGA_orig.gif || { \ + cp $(ICONS)/NGA.gif NGA_orig.gif; \ + giftrans -t '#ffffff' -o $(ICONS)/NGA.gif NGA_orig.gif; \ + } + jar cfm geotrans2.jar MANIFEST.MF geotrans/* + +compile: + find geotrans -type f -name '*.java' > files + /usr/lib/jvm/java-6-openjdk/bin/javac @files + +clean distclean: + rm -f geotrans2.jar files + find geotrans -type f -name '*.class' -print0 | xargs -r0 rm + for i in Geotrans Icon NGA; do \ + if [ -f $${i}_orig.gif ]; then \ + cp $${i}_orig.gif $(ICONS)/$$i.gif && \ + rm -f $${i}_orig.gif ; \ + fi ; \ + done --- geotranz-2.4.2.orig/geotrans2/redhat_linux/makefile +++ geotranz-2.4.2/geotrans2/redhat_linux/makefile @@ -8,6 +8,7 @@ #posic = -G -K pic #COMPILER_BOOLS = -DCOMPILER_HAS_NO_BOOLEAN #COMPILER_ISSUES = $(COMPILER_BOOLS) $(COMPILER_CASTS) +BINARY=geotrans2.jar libgeotrans.so.1 libjnigeotrans.so #Gnu cc = gcc --- geotranz-2.4.2.orig/debian/compat +++ geotranz-2.4.2/debian/compat @@ -0,0 +1 @@ +7 --- geotranz-2.4.2.orig/debian/changelog +++ geotranz-2.4.2/debian/changelog @@ -0,0 +1,25 @@ +geotranz (2.4.2-3build1) lucid; urgency=low + + * No-change upload to get a build in lucid. + + -- Michael Bienia Mon, 01 Feb 2010 23:41:05 +0100 + +geotranz (2.4.2-3) unstable; urgency=low + + * Move all Build-Depends-Indep to Build-Depends. + Fix makefile dependencies. (Closes: #507243) + + -- Roberto Lumbreras Sun, 30 Nov 2008 21:52:59 +0100 + +geotranz (2.4.2-2) unstable; urgency=low + + * Fix makefile to build also the libjnigeotrans.so library. + + -- Roberto Lumbreras Fri, 17 Oct 2008 14:43:09 +0200 + +geotranz (2.4.2-1) unstable; urgency=low + + * Initial release. (Closes: #468918) + + -- Roberto Lumbreras Wed, 15 Oct 2008 16:03:52 +0200 + --- geotranz-2.4.2.orig/debian/geotranz.install +++ geotranz-2.4.2/debian/geotranz.install @@ -0,0 +1,4 @@ +geotrans2/data /usr/share/geotranz +geotrans2/java_gui/geotrans2.jar /usr/share/geotranz/java_gui +debian/bin /usr +debian/geotranz.desktop /usr/share/applications --- geotranz-2.4.2.orig/debian/watch +++ geotranz-2.4.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://earth-info.nga.mil/GandG/geotrans ../geotrans/geotrans-?_?([\w+\d+\.]+|\d+)/unix_dev(?:\.tar|\.tgz)(?:\.gz|\.bz2|) --- geotranz-2.4.2.orig/debian/geotranz.menu +++ geotranz-2.4.2/debian/geotranz.menu @@ -0,0 +1,6 @@ +?package(geotranz):\ +needs="X11"\ +section="Applications/Science/Geoscience"\ +title="Geotranz"\ +command="/usr/bin/geotranz"\ +icon="/usr/share/pixmaps/geotrans.xpm" --- geotranz-2.4.2.orig/debian/geotranz.manpages +++ geotranz-2.4.2/debian/geotranz.manpages @@ -0,0 +1 @@ +debian/geotranz.1 --- geotranz-2.4.2.orig/debian/copyright +++ geotranz-2.4.2/debian/copyright @@ -0,0 +1,120 @@ +This package was Debianized by Roberto Lumbreras on +Sun, 02 Mar 2008 17:16:08 +0100 + + +It was downloaded from http://earth-info.nga.mil/GandG/geotrans/ + + +The package GEOTRANZ is derived from GEOTRANS: + +"The product was developed using GEOTRANS, a product of the National +Geospatial-Intelligence Agency (NGA) and U.S. Army Engineering Research and +Development Center." + +"Do not use the name GEOTRANS for any derived work." + +Debian modifications are the following: add makefiles to compile it with +openjdk; modify some icons so they have a transparent background; use +x-www-browser to lunch help instead of netscape; modify directory where help +files are; add missing includes in C files to fix implicit declaration +warnings. + +Debian package GEOTRANZ is DFSG free because: + +-Everyone is allowed to use and distribute the software (see terms of use). +-Everyone is allowed to modify the software "develop derivative works" + (see terms of use). +-Everyone is allowed to make and distribute derived works if the "GEOTRANS" + name is not used. (see terms of use and clarification mail from authors). +-The package is compiled with and depends on free packages only (thanks to + openjdk). + + +GEOTRANS upstream author: + +National Geospatial Intelligence Agency (NGA) +Department of Defense +United States of America + +Point of Contact: Coordinate Systems Analysis Team +phone (314) 263-4171, DSN 693-4171 +coordsys@nga.mil + +GEOTRANS Project Managers: +Brian Akers (St. Louis) and Dan Mullaney (Bethesda) + +Please contact the JMTK Help Desk (jmtkhelp@jmtk.org, 1-888-549-JMTK) if you +have any problems, questions, or comments. + + +Copyright: (C) 1999-2008 National Geospatial Intelligence Agency (NGA) + +"Although NGA makes no copyright claim under Title 17 U.S.C., NGA +claims copyrights in the source code under other legal regimes." + + +I wrote NGA asking for permission to distribute derived works of geotrans, and +they sent me the following mail: + +------------------------------------------------------------------------------ + +From: "Mullaney, Dan F." +To: +Cc: "Spaunhorst, Scott" +Subject: RE: geotrans license clarification +Date: Wed, 1 Oct 2008 10:53:25 -0400 + +Sir, + +Please find an updated "Terms of Use" for GEOTRANS. Our position is that +derivative works may be distributed, if they adhere to these "Terms." A +new version (GEOTRANS 2.4.2) will be made available shortly. + +Thank You, +Dan Mullaney +NGA/SNAC +Coordinate System Analysis + +------------------------------------------------------------------------------ + +GEOTRANS Terms of Use: + +1. The GEOTRANS source code ("the software") is provided free of charge by the +National Geospatial-Intelligence Agency (NGA) of the United States Department +of Defense. Although NGA makes no copyright claim under Title 17 U.S.C., NGA +claims copyrights in the source code under other legal regimes. NGA hereby +grants to each user of the software a license to use and distribute the +software, and develop derivative works. + +2. NGA requests that products developed using the software credit the source of +the software with the following statement, "The product was developed using +GEOTRANS, a product of the National Geospatial-Intelligence Agency (NGA) and +U.S. Army Engineering Research and Development Center." Do not use the name +GEOTRANS for any derived work. + +3. Warranty Disclaimer: The software was developed to meet only the internal +requirements of the National Geospatial-Intelligence Agency (NGA). The software +is provided "as is," and no warranty, express or implied, including but not +limited to the implied warranties of merchantability and fitness for particular +purpose or arising by statute or otherwise in law or from a course of dealing +or usage in trade, is made by NGA as to the accuracy and functioning of the +software. + +4. NGA and its personnel are not required to provide technical support or +general assistance with respect to public use of the software. Government +customers may contact NGA. + +5. Neither NGA nor its personnel will be liable for any claims, losses, or +damages arising from or connected with the use of the software. The user agrees +to hold harmless the United States National Geospatial-Intelligence Agency +(NGA). The user's sole and exclusive remedy is to stop using the software. + +6. Please be advised that pursuant to the United States Code, 10 U.S.C. 425, +the name of the National Geospatial-Intelligence Agency, the initials "NGA", +the seal of the National Geospatial-Intelligence Agency, or any colorable +imitation thereof shall not be used to imply approval, endorsement, or +authorization of a product without prior written permission from United States +Secretary of Defense. Do not create the impression that NGA, the Secretary of +Defense or the Director of National Intelligence has endorsed any product +derived from GEOTRANS. + --- geotranz-2.4.2.orig/debian/rules +++ geotranz-2.4.2/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/makefile.mk + +DEB_INSTALL_CHANGELOGS_ALL := releasenotes.txt +DEB_DH_SHLIBDEPS_ARGS_geotranz-libs := -l`pwd`/debian/geotranz-libs/usr/lib/geotranz + +build-indep: + make makefile-build-indep-target + +build-arch: + make makefile-build-arch-target + +install/geotranz:: + convert geotrans2/java_gui/geotrans/gui/icons/Geotrans.gif debian/geotranz/usr/share/pixmaps/geotrans.xpm + +binary-fixup/geotranz:: + chmod a-x debian/geotranz/usr/share/geotranz/data/* + +binary-fixup/geotranz-doc:: + chmod a-x debian/geotranz-doc/usr/share/doc/geotranz/examples/* + --- geotranz-2.4.2.orig/debian/control +++ geotranz-2.4.2/debian/control @@ -0,0 +1,65 @@ +Source: geotranz +Section: utils +Priority: optional +Maintainer: Roberto Lumbreras +Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, giftrans, imagemagick +Build-Depends-Indep: +Standards-Version: 3.8.0 +Homepage: http://earth-info.nga.mil/GandG/geotrans/ + +Package: geotranz +Architecture: all +Section: utils +Depends: openjdk-6-jre, geotranz-libs (>= 2.4.2), geotranz-libs (<< 2.4.3), + ${shlibs:Depends} +Recommends: geotranz-doc +Description: GEOgraphic coordinates TRANslator + GEOTRANZ (Geographic Translator) is an application program which allows + you to easily convert geographic coordinates among a wide variety of + coordinate systems, map projections, and datums. Currently, twenty-five + different coordinate systems, map projections, grids, and coding + schemes, and over two hundred different datums, are supported. + . + The user interface of GEOTRANZ is similar to that of a calculator, but + can also be used to efficiently convert large numbers of coordinates + contained in text files. + . + GEOTRANZ is the Debian version of GEOTRANS, a product of the National + Geospatial-Intelligence Agency (NGA) and U.S. Army Engineering Research + and Development Center. + . + This package contains the geotranz java graphical interface. + +Package: geotranz-libs +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: GEOgraphic coordinates TRANslator (runtime libraries) + GEOTRANZ (Geographic Translator) is an application program which allows + you to easily convert geographic coordinates among a wide variety of + coordinate systems, map projections, and datums. Currently, twenty-five + different coordinate systems, map projections, grids, and coding + schemes, and over two hundred different datums, are supported. + . + GEOTRANZ is the Debian version of GEOTRANS, a product of the National + Geospatial-Intelligence Agency (NGA) and U.S. Army Engineering Research + and Development Center. + . + This package contains the geotranz runtime libraries. + +Package: geotranz-doc +Architecture: all +Section: doc +Depends: ${shlibs:Depends} +Description: GEOgraphic coordinates TRANslator (help files and documentation) + GEOTRANZ (Geographic Translator) is an application program which allows + you to easily convert geographic coordinates among a wide variety of + coordinate systems, map projections, and datums. Currently, twenty-five + different coordinate systems, map projections, grids, and coding + schemes, and over two hundred different datums, are supported. + . + GEOTRANZ is the Debian version of GEOTRANS, a product of the National + Geospatial-Intelligence Agency (NGA) and U.S. Army Engineering Research + and Development Center. + . + This package contains the geotranz help files, examples and documentation. --- geotranz-2.4.2.orig/debian/geotranz-doc.install +++ geotranz-2.4.2/debian/geotranz-doc.install @@ -0,0 +1,3 @@ +geotrans2/help/* /usr/share/doc/geotranz/html +geotrans2/docs/* /usr/share/doc/geotranz +examples/* /usr/share/doc/geotranz/examples --- geotranz-2.4.2.orig/debian/geotranz.1 +++ geotranz-2.4.2/debian/geotranz.1 @@ -0,0 +1,20 @@ +.TH GEOTRANZ "1" "MARCH 2007" +.SH NAME +geotranz \- GEOgraphic coordinates TRANslator +.SH SYNOPSIS +.B geotranz +.SH DESCRIPTION +.PP +GEOTRANZ (Geographic Translator) is an application program which allows +you to easily convert geographic coordinates among a wide variety of +coordinate systems, map projections, and datums. Currently, twenty-five +different coordinate systems, map projections, grids, and coding +schemes, and over two hundred different datums, are supported. +.PP +The user interface of GEOTRANZ is similar to that of a calculator, but +can also be used to efficiently convert large numbers of coordinates +contained in text files. +.SH AUTHOR +.PP +This manual page was written by Roberto Lumbreras , for +the Debian GNU/Linux system (but may be used by others). --- geotranz-2.4.2.orig/debian/geotranz.desktop +++ geotranz-2.4.2/debian/geotranz.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Geotranz +Comment=Geographic coordinates translator +Exec=geotranz +Icon=geotrans +Terminal=false +Type=Application +Categories=Education;Science;Geography; --- geotranz-2.4.2.orig/debian/geotranz-libs.install +++ geotranz-2.4.2/debian/geotranz-libs.install @@ -0,0 +1 @@ +geotrans2/redhat_linux/lib* /usr/lib/geotranz --- geotranz-2.4.2.orig/debian/geotranz.dirs +++ geotranz-2.4.2/debian/geotranz.dirs @@ -0,0 +1 @@ +/usr/share/pixmaps --- geotranz-2.4.2.orig/debian/patches/002-warnings.diff +++ geotranz-2.4.2/debian/patches/002-warnings.diff @@ -0,0 +1,30 @@ +--- a/geotrans2/src/fiomeths.c ++++ b/geotrans2/src/fiomeths.c +@@ -63,6 +63,7 @@ + /* INCLUDES */ + #include + #include ++#include + #include + #include + #include "fiomeths.h" +--- a/dt_cc/geoid/geoid.c ++++ b/dt_cc/geoid/geoid.c +@@ -67,6 +67,7 @@ + */ + #include /* standard C input/output library */ + #include /* standard C library */ ++#include + #include "geoid.h" + #include "threads.h" + +--- a/dt_cc/ellipse/ellipse.c ++++ b/dt_cc/ellipse/ellipse.c +@@ -96,6 +96,7 @@ + #include + #include + #include ++#include + #include "datum.h" + #include "ellipse.h" + #include "threads.h" --- geotranz-2.4.2.orig/debian/patches/004-name.diff +++ geotranz-2.4.2/debian/patches/004-name.diff @@ -0,0 +1,133 @@ +--- a/geotrans2/java_gui/geotrans/jni/JNIEngine.c ++++ b/geotrans2/java_gui/geotrans/jni/JNIEngine.c +@@ -236,7 +236,7 @@ + + JNIEXPORT void JNICALL Java_geotrans_jni_JNIEngine_JNIInitializeEngine(JNIEnv *env, jobject obj) + { +- char error_str[256] = "Error initializing GEOTRANS engine:"; ++ char error_str[256] = "Error initializing GEOTRANZ engine:"; + long error_code = Initialize_Engine(); + + // Check for ellipsoid file errors +--- a/geotrans2/java_gui/geotrans/gui/AboutDlg.java ++++ b/geotrans2/java_gui/geotrans/gui/AboutDlg.java +@@ -66,7 +66,7 @@ + iconPanel = new javax.swing.JPanel(); + tempPanel = new javax.swing.JPanel(); + +- setTitle("About GEOTRANS V2.4.2"); ++ setTitle("About GEOTRANZ V2.4.2"); + setEnabled(false); + setResizable(false); + addWindowListener(new java.awt.event.WindowAdapter() { +--- a/geotrans2/java_gui/geotrans/gui/AboutDlg.form ++++ b/geotrans2/java_gui/geotrans/gui/AboutDlg.form +@@ -2,7 +2,7 @@ + +
+ +- ++ + + + +--- a/geotrans2/java_gui/geotrans/gui/FileDlg.form ++++ b/geotrans2/java_gui/geotrans/gui/FileDlg.form +@@ -2,7 +2,7 @@ + + + +- ++ + + + +--- a/geotrans2/java_gui/geotrans/gui/FileDlg.java ++++ b/geotrans2/java_gui/geotrans/gui/FileDlg.java +@@ -66,7 +66,7 @@ + + getContentPane().setLayout(new java.awt.GridBagLayout()); + +- setTitle("GEOTRANS File Processing"); ++ setTitle("GEOTRANZ File Processing"); + setResizable(false); + addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent evt) { +--- a/geotrans2/java_gui/geotrans/gui/Geotrans.form ++++ b/geotrans2/java_gui/geotrans/gui/Geotrans.form +@@ -411,7 +411,7 @@ + + + +- ++ + + + +@@ -423,7 +423,7 @@ + + + +- ++ + + + +--- a/geotrans2/java_gui/geotrans/gui/ProgressDlg.form ++++ b/geotrans2/java_gui/geotrans/gui/ProgressDlg.form +@@ -2,7 +2,7 @@ + + + +- ++ + + + +--- a/geotrans2/java_gui/geotrans/gui/ProgressDlg.java ++++ b/geotrans2/java_gui/geotrans/gui/ProgressDlg.java +@@ -56,7 +56,7 @@ + numErrorsLabel = new javax.swing.JLabel(); + elapsedTimeLabel = new javax.swing.JLabel(); + +- setTitle("GEOTRANS File Processing"); ++ setTitle("GEOTRANZ File Processing"); + setResizable(false); + addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent evt) { +--- a/geotrans2/java_gui/geotrans/gui/Geotrans.java ++++ b/geotrans2/java_gui/geotrans/gui/Geotrans.java +@@ -150,7 +150,7 @@ + + getContentPane().setLayout(new java.awt.GridBagLayout()); + +- setTitle("GEOTRANS V2.4.2 - Geographic Translator V2.4.2"); ++ setTitle("GEOTRANZ V2.4.2 - Geographic Translator V2.4.2"); + setResizable(false); + addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent evt) { +@@ -603,7 +603,7 @@ + + aboutMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_MASK)); + aboutMenuItem.setMnemonic(java.awt.event.KeyEvent.VK_A); +- aboutMenuItem.setText("About GEOTRANS..."); ++ aboutMenuItem.setText("About GEOTRANZ..."); + aboutMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + aboutMenuItemActionPerformed(evt); +@@ -1030,14 +1030,14 @@ + upperMasterPanel = new MasterPanel(ConversionState.INTERACTIVE, SourceOrTarget.SOURCE, options); + if (upperMasterPanel == null) + { +- jniStrtoval.displayErrorMsg(this, "Unable to initialize GEOTRANS"); ++ jniStrtoval.displayErrorMsg(this, "Unable to initialize GEOTRANZ"); + System.exit (0); + } + + lowerMasterPanel = new MasterPanel(ConversionState.INTERACTIVE, SourceOrTarget.TARGET, options); + if (lowerMasterPanel == null) + { +- jniStrtoval.displayErrorMsg(this, "Unable to initialize GEOTRANS"); ++ jniStrtoval.displayErrorMsg(this, "Unable to initialize GEOTRANZ"); + System.exit (0); + } --- geotranz-2.4.2.orig/debian/patches/003-help.diff +++ geotranz-2.4.2/debian/patches/003-help.diff @@ -0,0 +1,22 @@ +--- a/geotrans2/java_gui/geotrans/utility/StartBrowser.java ++++ b/geotrans2/java_gui/geotrans/utility/StartBrowser.java +@@ -72,6 +72,6 @@ + private static final String WIN_FLAG = "url.dll,FileProtocolHandler"; + + // Default browser under unix. +- private static final String UNIX_PATH = "netscape"; ++ private static final String UNIX_PATH = "x-www-browser"; + + } + +--- a/geotrans2/java_gui/geotrans/gui/Geotrans.java ++++ b/geotrans2/java_gui/geotrans/gui/Geotrans.java +@@ -669,7 +669,7 @@ + if (StartBrowser.isWindowsPlatform()) + StartBrowser.displayURL(this, "file:" + helpFile.getCanonicalPath() + "\\help\\contents.htm"); + else +- StartBrowser.displayURL(this, "file:" + helpFile.getCanonicalPath() + "/help/contents.htm"); ++ StartBrowser.displayURL(this, "file:/usr/share/doc/geotranz/html/contents.htm"); + } + catch(Exception e) + { --- geotranz-2.4.2.orig/debian/patches/005-openjdk_bug.diff +++ geotranz-2.4.2/debian/patches/005-openjdk_bug.diff @@ -0,0 +1,98 @@ +--- a/geotrans2/java_gui/geotrans/gui/CoordPanel.form ++++ b/geotrans2/java_gui/geotrans/gui/CoordPanel.form +@@ -408,13 +408,13 @@ + + + +- ++ + + +- ++ + + +- ++ + + + +@@ -428,13 +428,13 @@ + + + +- ++ + + +- ++ + + +- ++ + + + +@@ -448,13 +448,13 @@ + + + +- ++ + + +- ++ + + +- ++ + + + +--- a/geotrans2/java_gui/geotrans/gui/CoordPanel.java ++++ b/geotrans2/java_gui/geotrans/gui/CoordPanel.java +@@ -312,30 +312,30 @@ + outputErrorPanel.setMinimumSize(new java.awt.Dimension(170, 40)); + outputErrorPanel.setPreferredSize(new java.awt.Dimension(170, 40)); + outputErrorPanel.setOpaque(false); +- ce90Label.setText("90% CE:"); +- ce90Label.setMaximumSize(new java.awt.Dimension(48, 16)); +- ce90Label.setMinimumSize(new java.awt.Dimension(48, 16)); +- ce90Label.setPreferredSize(new java.awt.Dimension(48, 16)); ++ ce90Label.setText("90%CE:"); ++ ce90Label.setMaximumSize(new java.awt.Dimension(54, 16)); ++ ce90Label.setMinimumSize(new java.awt.Dimension(54, 16)); ++ ce90Label.setPreferredSize(new java.awt.Dimension(54, 16)); + ce90Label.setOpaque(true); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 6); + outputErrorPanel.add(ce90Label, gridBagConstraints); + +- le90Label.setText("90% LE:"); +- le90Label.setMaximumSize(new java.awt.Dimension(48, 16)); +- le90Label.setMinimumSize(new java.awt.Dimension(48, 16)); +- le90Label.setPreferredSize(new java.awt.Dimension(48, 16)); ++ le90Label.setText("90%LE:"); ++ le90Label.setMaximumSize(new java.awt.Dimension(49, 16)); ++ le90Label.setMinimumSize(new java.awt.Dimension(49, 16)); ++ le90Label.setPreferredSize(new java.awt.Dimension(49, 16)); + le90Label.setOpaque(true); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(0, 6, 0, 6); + outputErrorPanel.add(le90Label, gridBagConstraints); + +- se90Label.setText("90% SE:"); +- se90Label.setMaximumSize(new java.awt.Dimension(48, 16)); +- se90Label.setMinimumSize(new java.awt.Dimension(48, 16)); +- se90Label.setPreferredSize(new java.awt.Dimension(48, 16)); ++ se90Label.setText("90%SE:"); ++ se90Label.setMaximumSize(new java.awt.Dimension(50, 16)); ++ se90Label.setMinimumSize(new java.awt.Dimension(50, 16)); ++ se90Label.setPreferredSize(new java.awt.Dimension(50, 16)); + se90Label.setOpaque(true); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; --- geotranz-2.4.2.orig/debian/patches/001-compile.diff +++ geotranz-2.4.2/debian/patches/001-compile.diff @@ -0,0 +1,70 @@ +--- a/geotrans2/redhat_linux/makefile ++++ b/geotrans2/redhat_linux/makefile +@@ -19,7 +20,7 @@ + # Support declarations + #### + +-DEBUG = -g ++DEBUG = + + CFLAGS = $(DEBUG) + CCFLAGS = $(CFLAGS) $(COMPILER_ISSUES) +@@ -32,7 +33,7 @@ + ENGINEDIR = ../../engine + SRCDIR = ../../geotrans2/src + JNIDIR = ../../geotrans2/java_gui/geotrans/jni +-JAVADIR = /usr/local/j2sdk1_3_1#Note: Change this for your system ++JAVADIR = /usr/lib/jvm/java-6-openjdk + + #### + # Libraries +@@ -156,11 +157,12 @@ + + JAVAINCS = \ + -I$(JAVADIR)/include \ +- -I$(JAVADIR)/include/solaris ++ -I$(JAVADIR)/include/linux + + #### + # Targets + #### ++all: $(LIBGEOTRANS) $(LIBJNI) + + #GEOTRANS shared object library + # make libgeotrans.so.1 +@@ -171,7 +173,7 @@ + #JNI shared object library + # make libjnigeotrans.so + $(LIBJNI): posic_sources $(JNISRCS) $(JNISRCS:.c=.o) +- $(cc) -dy -o $(LIBJNI) $(posic) -h $(LIBJNI) $(LIBGEOTRANS) $(JNISRCS:.c=.o) $(SRCS:.c=.o) -lm ++ $(cc) -dy -o $(LIBJNI) $(posic) $(LIBGEOTRANS) $(JNISRCS:.c=.o) $(SRCS:.c=.o) -lm + + #### + # Supporting Rules +--- a/geotrans2/java_gui/MANIFEST.MF ++++ b/geotrans2/java_gui/MANIFEST.MF +@@ -0,0 +1,2 @@ ++Manifest-Version: 1.0 ++Main-Class: geotrans/gui/Geotrans +--- a/engine/redhat_linux/makefile ++++ b/engine/redhat_linux/makefile +@@ -13,7 +13,7 @@ + # Support declarations + #### + +-DEBUG = -g ++DEBUG = + + CFLAGS = $(DEBUG) + +--- a/dt_cc/redhat_linux/makefile ++++ b/dt_cc/redhat_linux/makefile +@@ -13,7 +13,7 @@ + # Support declarations + #### + +-DEBUG = -g ++DEBUG = + + CFLAGS = $(DEBUG) + --- geotranz-2.4.2.orig/debian/bin/geotranz +++ geotranz-2.4.2/debian/bin/geotranz @@ -0,0 +1,10 @@ +#!/bin/bash + +JAVA=/usr/lib/jvm/java-6-openjdk/bin/java +JAR=/usr/share/geotranz/java_gui/geotrans2.jar + +test -x $JAVA || exit 1 +test -f $JAR || exit 1 + +LD_LIBRARY_PATH=/usr/lib/geotranz GEOTRANS_DATA=/usr/share/geotranz/data exec $JAVA -jar $JAR +