[ognl] 02/34: o Cleaning up debian/changelog and debian/control after advice from Barry Hawkins: - Changing version to 2.5.1-1 - Adding myself in Uploaders: o Setting the correct Build-Depends-Indep. o Setting JAVA_HOME_DIRS to kaffe.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ognl.

commit 751478ac48be8f5d400681ccb4bf39607c642a75
Author: Trygve Laugstøl <trygvis at inamo.no>
Date:   Sun Aug 14 23:59:16 2005 +0000

    o Cleaning up debian/changelog and debian/control after advice from Barry
      Hawkins:
      - Changing version to 2.5.1-1
      - Adding myself in Uploaders:
    o Setting the correct Build-Depends-Indep.
    o Setting JAVA_HOME_DIRS to kaffe.
---
 debian/changelog                        | 2 +-
 debian/control                          | 6 +++---
 debian/files                            | 1 -
 debian/patches/01build.xml.patch        | 4 ++--
 debian/patches/02build.properties.patch | 6 ++++--
 debian/rules                            | 7 +------
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f59da0a..30e4948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ognl (2.5.1) unstable; urgency=low
+ognl (2.5.1-1) unstable; urgency=low
 
   * Non-maintainer upload.
   * Initial Release (closes: #321476).
diff --git a/debian/control b/debian/control
index c6f55a6..043218c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: ognl
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: 
-Build-Depends-Indep: debhelper (>> 4.0.0), jikes-classpath, fastjar, cdbs
+Uploaders: Trygve Laugstøl <trygvis at inamo.no>
+Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 1.1.5), javacc (>= 3.2), ant
 Standards-Version: 3.6.2
 
 Package: ognl
 Architecture: all
-Depends:  gij | sablevm | kaffe | jamvm | java1-runtime | java2-runtime
+Depends: java1-runtime | java2-runtime | kaffe | jamvm | sablevm
 Description: Java expression language
  OGNL stands for Object-Graph Navigation Language; it is an expression language
  for getting and setting properties of Java objects. You use the same
diff --git a/debian/files b/debian/files
deleted file mode 100644
index fd26098..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-ognl_2.5.1_all.deb libs optional
diff --git a/debian/patches/01build.xml.patch b/debian/patches/01build.xml.patch
index 64c5ea0..650e822 100644
--- a/debian/patches/01build.xml.patch
+++ b/debian/patches/01build.xml.patch
@@ -1,5 +1,5 @@
---- /tmp/ognl-2.5.1/build.xml	2005-08-02 17:36:49.000000000 +0200
-+++ build.xml	2005-08-06 17:25:49.520289464 +0200
+--- ../ognl-2.5.1/build.xml	2005-08-02 17:36:49.000000000 +0200
++++ build.xml	2005-08-06 19:41:30.818992096 +0200
 @@ -34,7 +34,7 @@
  	<!-- General environment setup -->
  	<property environment="env"/>
diff --git a/debian/patches/02build.properties.patch b/debian/patches/02build.properties.patch
index c92c3e1..bd5cd7f 100644
--- a/debian/patches/02build.properties.patch
+++ b/debian/patches/02build.properties.patch
@@ -1,11 +1,13 @@
 --- /dev/null	2005-04-30 15:48:21.320416232 +0200
-+++ build.properties	2005-08-06 16:49:30.196334200 +0200
++++ build.properties	2005-08-06 19:41:30.831990120 +0200
 @@ -0,0 +1,8 @@
 +workarea.root=.
 +env.TEMP=target
 +
++javacc.jar=/usr/share/java/javacc.jar
++
 +output.base=target
++output.root=target
 +output.jars=debian/ognl/usr/share/java
 +output.jar=debian/ognl/usr/share/java/ognl-2.5.1.jar
 +
-+javacc.jar=/usr/share/java/javacc.jar
diff --git a/debian/rules b/debian/rules
index 3d0b290..17904b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS      := \
-               /usr/lib/j2sdk1.4-sun \
-               /usr/lib/j2sdk1.4 \
-               /usr/lib/j2sdk1.3 \
-               /usr/lib/j2se/1.4 \
-               /usr/lib/j2se/1.3
+JAVA_HOME_DIRS  := /usr/lib/kaffe
 
 ANT_HOME        := /usr/share/ant
 DEB_JARS        := /usr/share/ant/lib/ant-launcher.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git