User: pere
Date: 06/03/12 12:28:15
Modified: debian control rules
Removed: debian buoy.jar.uu
Log:
* Remove buoy.jar hack, and depend on libbuoy-java instead.
Revision Changes Path
1.8 +2 -2 openjump/debian/control
CVSWEB Options: -------------------
CVSWeb: Annotate this file:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?annotate=1.8&cvsroot=
CVSWeb: View this file:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?rev=1.8&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control.diff?r1=1.8&r2=1.7&cvsroot=
-----------------------------------
Index: control
===================================================================
RCS file: /cvsroot/pkg-grass/openjump/debian/control,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- control 11 Mar 2006 22:29:50 -0000 1.7
+++ control 12 Mar 2006 12:28:14 -0000 1.8
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe, ant, libjts-java,
liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, junit, bsh,
libbatik-java
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe, ant, libjts-java,
liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, junit, bsh,
libbatik-java, libbuoy-java
Standards-Version: 3.6.2
Package: openjump
Architecture: all
-Depends: j2re1.4 | j2re1.5 | java2-runtime, libjts-java, libjama-java,
libjdom0-java, libxerces2-java, bsh, liblog4j1.2-java, junit, libbatik-java
+Depends: j2re1.4 | j2re1.5 | java2-runtime, libjts-java, libjama-java,
libjdom0-java, libxerces2-java, bsh, liblog4j1.2-java, junit, libbatik-java,
libbuoy-java
Suggests: java-virtual-machine
Description: Open Java Unified Mapping Platform JUMP
The Open Java Unified Mapping Platform (JUMP) is a GUI-based application
1.13 +3 -13 openjump/debian/rules
CVSWEB Options: -------------------
CVSWeb: Annotate this file:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?annotate=1.13&cvsroot=
CVSWeb: View this file:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?rev=1.13&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules.diff?r1=1.13&r2=1.12&cvsroot=
-----------------------------------
Index: rules
===================================================================
RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rules 11 Mar 2006 22:53:15 -0000 1.12
+++ rules 12 Mar 2006 12:28:14 -0000 1.13
@@ -13,8 +13,7 @@
DEB_ANT_BUILDFILE := debian/openjump-build.xml
DEB_ANT_BUILD_TARGET := jar
DEB_JARS = $(ANT_HOME)/lib/ant-launcher.jar jts log4j-1.2 \
- `pwd`/debian/buoy.jar \
- xercesImpl jdom0 jama junit bsh batik # buoy
+ xercesImpl jdom0 jama junit bsh batik buoy
# Make sure the jars are built using the upstream version number
# instead of the source release date.
@@ -26,25 +25,16 @@
DEB_ANT_COMPILER := org.eclipse.jdt.core.JDTCompilerAdapter
DEB_JARS := $(DEB_JARS) ecj
-pre-build:: debian/buoy.jar
-
clean::
rm -rf build lib
- rm -f debian/buoy.jar
-
-debian/buoy.jar: debian/buoy.jar.uu
- cd debian; uudecode buoy.jar.uu
DESTDIR=debian/openjump
-install/openjump:: debian/buoy.jar
+install/openjump::
install -m644 build/jump-api-$(UPSTREAM_VERSION).jar
$(DESTDIR)/usr/share/java/jump-api-$(UPSTREAM_VERSION).jar
ln -s jump-api-$(UPSTREAM_VERSION).jar
$(DESTDIR)/usr/share/java/jump-api.jar
install -m644 build/jump-workbench-$(UPSTREAM_VERSION).jar
$(DESTDIR)/usr/share/java/jump-workbench-$(UPSTREAM_VERSION).jar
ln -s jump-workbench-$(UPSTREAM_VERSION).jar
$(DESTDIR)/usr/share/java/jump-workbench.jar
- install -m755 $(DESTDIR).sh $(DESTDIR)/usr/bin/openjump
+ install -m755 debian/openjump.sh $(DESTDIR)/usr/bin/openjump
install -m644 debian/log4j.xml $(DESTDIR)/usr/share/openjump/
-
- # This is a hack until a buoy debian package is available (bug #356355)
- install -m644 debian/buoy.jar $(DESTDIR)/usr/share/java/buoy.jar
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
