From: Rafael L. <rla...@us...> - 2006-06-06 00:58:47
|
Update of /cvsroot/plplot/plplot/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18458 Modified Files: changelog control rules Log Message: Preparation for Debian release 5.6.1-2 Index: rules =================================================================== RCS file: /cvsroot/plplot/plplot/debian/rules,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- rules 28 May 2006 13:57:29 -0000 1.61 +++ rules 5 Jun 2006 18:09:19 -0000 1.62 @@ -25,11 +25,7 @@ debinfo := $(debshr)/info debex := $(debshr)/plplot$(version)/examples -javasetup := $(shell \ - if test ! -f /usr/include/jni.h \ - -a -f /usr/lib/kaffe/include/jni.h ; then \ - echo --with-java-home=/usr/lib/kaffe ; \ - fi) +javasetup := --with-java-home=/usr/lib/gcc/i486-linux-gnu/4.1.2 include /usr/share/dpatch/dpatch.make Index: control =================================================================== RCS file: /cvsroot/plplot/plplot/debian/control,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- control 28 May 2006 13:57:29 -0000 1.73 +++ control 5 Jun 2006 18:09:18 -0000 1.74 @@ -10,8 +10,7 @@ libxml-parser-perl, libxml-dom-perl, matwrap, autotools-dev, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev, - libgcj6-dev | kaffe-dev | libsablevm1-dev, gcj | java-compiler, - fastjar | kaffe, liblasi-dev (>= 1.0.5-2), libwxgtk2.6-dev, + java-gcj-compat-dev, liblasi-dev (>= 1.0.5-2), libwxgtk2.6-dev, python-gnome2-dev, pdl Build-Conflicts: libplplot5 Index: changelog =================================================================== RCS file: /cvsroot/plplot/plplot/debian/changelog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- changelog 31 May 2006 10:01:02 -0000 1.117 +++ changelog 5 Jun 2006 18:09:18 -0000 1.118 @@ -1,3 +1,12 @@ +plplot (5.6.1-2) unstable; urgency=low + + * debian/control: Replaced all build-dependencies for java by + java-gcj-compat-dev, which will be default java environment for + building packages soon (thanks to Michael Koch <kon...@gm...> + for the hint) + + -- Rafael Laboissiere <ra...@de...> Mon, 5 Jun 2006 19:07:48 +0200 + plplot (5.6.1-1) unstable; urgency=low * New upstream release |