Author: malat
Date: 2012-04-13 08:49:56 +0000 (Fri, 13 Apr 2012)
New Revision: 15943
Modified:
trunk/pirl/debian/patches/fixjcmloc.patch
trunk/pirl/debian/rules
Log:
Add clean rules. Fix PVL compilation
Modified: trunk/pirl/debian/patches/fixjcmloc.patch
===================================================================
--- trunk/pirl/debian/patches/fixjcmloc.patch 2012-04-13 08:27:49 UTC (rev
15942)
+++ trunk/pirl/debian/patches/fixjcmloc.patch 2012-04-13 08:49:56 UTC (rev
15943)
@@ -1,7 +1,7 @@
Index: PIRL-2.3.4/Build/Makefile
===================================================================
--- PIRL-2.3.4.orig/Build/Makefile 2011-07-27 04:51:29.000000000 +0000
-+++ PIRL-2.3.4/Build/Makefile 2012-04-13 08:25:38.593453477 +0000
++++ PIRL-2.3.4/Build/Makefile 2012-04-13 08:33:52.509438365 +0000
@@ -10,7 +10,7 @@
@@ -29,12 +29,8 @@
SwingX := $(SwingX_DIR)/$(SwingX_JAR)
# The location of the Apache Commons Comand Line Interface package.
-@@ -163,9 +163,10 @@
-
- # Application wrappers installation:
-
--install:
-+install: jar
+@@ -166,6 +166,7 @@
+ install:
@echo
@echo "=== Installing application wrappers in $(INSTALL_DIR)"
+ mkdir $(INSTALL_DIR)
@@ -122,8 +118,8 @@
Index: PIRL-2.3.4/PVL/Makefile
===================================================================
--- PIRL-2.3.4.orig/PVL/Makefile 2011-07-27 05:10:07.000000000 +0000
-+++ PIRL-2.3.4/PVL/Makefile 2012-04-13 08:23:09.917453084 +0000
-@@ -5,7 +5,7 @@
++++ PIRL-2.3.4/PVL/Makefile 2012-04-13 08:46:48.697453081 +0000
+@@ -5,13 +5,13 @@
# gmake syntax
# Location of the Java Classes for Mathematics.
@@ -131,4 +127,12 @@
+JCM ?= /usr/share/java/jcm.jar
# Location of SwingX Classes.
- SwingX ?= /opt/java/SwingX/swingx.jar
+-SwingX ?= /opt/java/SwingX/swingx.jar
++SwingX ?= /usr/share/java/swingx1.jar
+
+ # Location of the JavaMail Classes (used by Notify; cross-dependency).
+-JavaMail ?= /opt/java/javamail/mail.jar
++JavaMail ?= /usr/share/java/gnumail.jar
+
+ JPATH ?= ../..:$(JCM):$(SwingX):$(JavaMail)
+ JC ?= javac
Modified: trunk/pirl/debian/rules
===================================================================
--- trunk/pirl/debian/rules 2012-04-13 08:27:49 UTC (rev 15942)
+++ trunk/pirl/debian/rules 2012-04-13 08:49:56 UTC (rev 15943)
@@ -6,5 +6,13 @@
%:
dh $@ --with javahelper --sourcedirectory=Build
+override_dh_auto_configure:
+ (cd .. && ln -sf PIRL-* PIRL)
+ dh_auto_configure
+
+override_dh_auto_clean:
+ find . -name *.class -delete
+ find . -name *.so -delete
+
get-orig-source:
uscan --verbose --force-download --rename
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
