Author: malat
Date: 2012-04-13 08:27:49 +0000 (Fri, 13 Apr 2012)
New Revision: 15942
Modified:
trunk/pirl/debian/patches/fixjcmloc.patch
Log:
getting closer to package
Modified: trunk/pirl/debian/patches/fixjcmloc.patch
===================================================================
--- trunk/pirl/debian/patches/fixjcmloc.patch 2012-04-13 08:26:45 UTC (rev
15941)
+++ trunk/pirl/debian/patches/fixjcmloc.patch 2012-04-13 08:27:49 UTC (rev
15942)
@@ -1,7 +1,7 @@
-Index: PIRL/Build/Makefile
+Index: PIRL-2.3.4/Build/Makefile
===================================================================
---- PIRL.orig/Build/Makefile 2012-04-07 17:51:44.000000000 +0200
-+++ PIRL/Build/Makefile 2012-04-07 17:54:26.000000000 +0200
+--- 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
@@ -10,7 +10,7 @@
@@ -41,10 +41,19 @@
cp -f $(addprefix ../,$(APPLICATIONS)) $(INSTALL_DIR)
-Index: PIRL/Utilities/Makefile
+@@ -219,8 +220,6 @@
+ @if [ ! -d staging_area/PIRL/Build ]; then \
+ echo ; \
+ echo "--- Assembling the package files" ; \
+- mkdir -p staging_area/PIRL ; \
+- Release -dir staging_area/PIRL -no_make Build $(PACKAGES) ; \
+ fi
+ @echo
+ $(MAKE) -C staging_area/PIRL/Build
+Index: PIRL-2.3.4/Utilities/Makefile
===================================================================
---- PIRL.orig/Utilities/Makefile 2012-04-07 17:51:44.000000000 +0200
-+++ PIRL/Utilities/Makefile 2012-04-07 17:51:56.000000000 +0200
+--- PIRL-2.3.4.orig/Utilities/Makefile 2009-07-21 00:09:48.000000000 +0000
++++ PIRL-2.3.4/Utilities/Makefile 2012-04-13 08:15:07.965935926 +0000
@@ -5,7 +5,7 @@
# gmake syntax
@@ -54,10 +63,10 @@
JPATH ?= ../..:$(JCM)
JC ?= javac
-Index: PIRL/Conductor/Makefile
+Index: PIRL-2.3.4/Conductor/Makefile
===================================================================
---- PIRL.orig/Conductor/Makefile 2012-04-07 17:51:44.000000000 +0200
-+++ PIRL/Conductor/Makefile 2012-04-07 17:51:56.000000000 +0200
+--- PIRL-2.3.4.orig/Conductor/Makefile 2012-01-25 23:12:08.000000000 +0000
++++ PIRL-2.3.4/Conductor/Makefile 2012-04-13 08:15:07.965935926 +0000
@@ -13,13 +13,13 @@
@@ -84,10 +93,10 @@
# Compiler.
CC = gcc
-Index: PIRL/Conductor/Maestro/Makefile
+Index: PIRL-2.3.4/Conductor/Maestro/Makefile
===================================================================
---- PIRL.orig/Conductor/Maestro/Makefile 2012-04-07 17:51:44.000000000
+0200
-+++ PIRL/Conductor/Maestro/Makefile 2012-04-07 17:51:56.000000000 +0200
+--- PIRL-2.3.4.orig/Conductor/Maestro/Makefile 2008-09-09 05:48:07.000000000
+0000
++++ PIRL-2.3.4/Conductor/Maestro/Makefile 2012-04-13 08:15:07.965935926
+0000
@@ -13,7 +13,7 @@
JCM ?= /opt/java/jcm
@@ -97,10 +106,10 @@
JPATH ?= ../../..:$(JCM):$(SwingX)
JC ?= javac
-Index: PIRL/Conductor/Pipeline_Configuration/Makefile
+Index: PIRL-2.3.4/Conductor/Pipeline_Configuration/Makefile
===================================================================
---- PIRL.orig/Conductor/Pipeline_Configuration/Makefile 2012-04-07
17:51:44.000000000 +0200
-+++ PIRL/Conductor/Pipeline_Configuration/Makefile 2012-04-07
17:51:56.000000000 +0200
+--- PIRL-2.3.4.orig/Conductor/Pipeline_Configuration/Makefile 2011-06-02
06:24:06.000000000 +0000
++++ PIRL-2.3.4/Conductor/Pipeline_Configuration/Makefile 2012-04-13
08:15:07.965935926 +0000
@@ -9,7 +9,7 @@
SCRIPTS_DIR ?= /opt/local/sh
@@ -110,3 +119,16 @@
JPATH ?= ../../..:$(Commons_CLI)
+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 @@
+ # gmake syntax
+
+ # Location of the Java Classes for Mathematics.
+-JCM ?= /opt/java/jcm
++JCM ?= /usr/share/java/jcm.jar
+
+ # Location of SwingX Classes.
+ SwingX ?= /opt/java/SwingX/swingx.jar
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
