Author: twerner
Date: 2007-12-13 21:13:01 +0000 (Thu, 13 Dec 2007)
New Revision: 5019

Added:
   trunk/groovy/debian/groovy.install
Removed:
   trunk/groovy/debian/groovy.dirs
Modified:
   trunk/groovy/debian/control
   trunk/groovy/debian/groovy.links
   trunk/groovy/debian/rules
Log:
fix the groovy binary package


Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control 2007-12-13 19:16:30 UTC (rev 5018)
+++ trunk/groovy/debian/control 2007-12-13 21:13:01 UTC (rev 5019)
@@ -3,24 +3,23 @@
 Priority: optional
 Maintainer: Marcus Crafter <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: bzip2, libasm-java (>= 1.5.2), libbsf-java,
+Build-Depends-Indep: bzip2, libasm2-java, libbsf-java,
  libclassworlds-java (>= 1.0.1), libcommons-cli-java (>= 1.0),
  libcommons-collections3-java (>= 3.1), libcommons-logging-java (>=
  1.0.3), junit4, libmockobjects-java (>= 0.09), libmx4j-java
- (>= 2.0.1), libregexp-java (>= 1.2), libservlet2.4-java, sharutils,
- ant, ant-optional, j2sdk1.4 | j2sdk1.3 | java-virtual-machine,
- libxstream-java, libjline-java
+ (>= 2.0.1), libregexp-java (>= 1.2), libservlet2.4-java,
+ ant, ant-optional, java-gcj-compat-dev, libxstream-java, libjline-java
 Standards-Version: 3.7.3
 Homepage: http://groovy.codehaus.org/
 
 Package: groovy
 Architecture: all
-Depends: ant, ant-optional, libasm-java (>= 1.5.2), libbsf-java, 
+Depends: libasm2-java, libbsf-java, 
  libclassworlds-java (>= 1.0.1), libcommons-cli-java (>= 1.0), 
  libcommons-collections3-java (>= 3.1), libcommons-logging-java (>= 1.0.3), 
- junit (>= 3.8.1), libmockobjects-java (>= 0.09), libmx4j-java (>= 2.0.1), 
- libregexp-java (>= 1.2), libservlet2.3-java, 
- j2sdk1.4 | j2sdk1.3 | java-virtual-machine
+ junit4, libmockobjects-java (>= 0.09), libmx4j-java (>= 2.0.1), 
+ libregexp-java (>= 1.2), libservlet2.4-java, libjline-java
+ java-gcj-compat | java-virtual-machine
 Description: Agile dynamic language for the Java Virtual Machine
  Groovy is an agile dynamic language for the JVM combining lots of great
  features from languages like Python, Ruby and Smalltalk and making them

Deleted: trunk/groovy/debian/groovy.dirs
===================================================================
--- trunk/groovy/debian/groovy.dirs     2007-12-13 19:16:30 UTC (rev 5018)
+++ trunk/groovy/debian/groovy.dirs     2007-12-13 21:13:01 UTC (rev 5019)
@@ -1,6 +0,0 @@
-usr/bin
-usr/share/groovy/bin
-usr/share/groovy/conf
-usr/share/groovy/embeddable
-usr/share/groovy/lib
-

Added: trunk/groovy/debian/groovy.install
===================================================================
--- trunk/groovy/debian/groovy.install                          (rev 0)
+++ trunk/groovy/debian/groovy.install  2007-12-13 21:13:01 UTC (rev 5019)
@@ -0,0 +1,8 @@
+src/bin/groovy        /usr/share/groovy/bin/
+src/bin/groovyConsole /usr/share/groovy/bin/
+src/bin/groovyc       /usr/share/groovy/bin/
+src/bin/groovysh      /usr/share/groovy/bin/
+src/bin/java2groovy   /usr/share/groovy/bin/
+src/bin/startGroovy   /usr/share/groovy/bin/
+src/conf/*            /usr/share/groovy/conf/
+target/*.jar          /usr/share/groovy/lib/

Modified: trunk/groovy/debian/groovy.links
===================================================================
--- trunk/groovy/debian/groovy.links    2007-12-13 19:16:30 UTC (rev 5018)
+++ trunk/groovy/debian/groovy.links    2007-12-13 21:13:01 UTC (rev 5019)
@@ -1,18 +1,21 @@
-/usr/share/groovy/bin/grok             /usr/bin/grok
 /usr/share/groovy/bin/groovy           /usr/bin/groovy
 /usr/share/groovy/bin/groovyc          /usr/bin/groovyc
 /usr/share/groovy/bin/groovyConsole    /usr/bin/groovyConsole
 /usr/share/groovy/bin/groovysh         /usr/bin/groovysh
-/usr/share/java/asm-analysis.jar       /usr/share/groovy/lib/asm-analysis.jar
-/usr/share/java/asm-attrs.jar          /usr/share/groovy/lib/asm-attrs.jar
-/usr/share/java/asm.jar                        /usr/share/groovy/lib/asm.jar
-/usr/share/java/asm-util.jar           /usr/share/groovy/lib/asm-util.jar
+/usr/share/groovy/bin/java2groovy      /usr/bin/java2groovy
+/usr/share/groovy/bin/startGroovy      /usr/bin/startGroovy
+/usr/share/java/antlr.jar              /usr/share/groovy/lib/antlr.jar
+/usr/share/java/asm2-analysis.jar      /usr/share/groovy/lib/asm2-analysis.jar
+/usr/share/java/asm2-attrs.jar         /usr/share/groovy/lib/asm2-attrs.jar
+/usr/share/java/asm2.jar               /usr/share/groovy/lib/asm2.jar
+/usr/share/java/asm2-util.jar          /usr/share/groovy/lib/asm2-util.jar
 /usr/share/java/bsf.jar                        /usr/share/groovy/lib/bsf.jar
 /usr/share/java/classworlds.jar                
/usr/share/groovy/lib/classworlds-1.0.jar
 /usr/share/java/commons-cli.jar                
/usr/share/groovy/lib/commons-cli.jar
 /usr/share/java/commons-logging.jar    
/usr/share/groovy/lib/commons-logging.jar
-/usr/share/java/junit.jar              /usr/share/groovy/lib/junit.jar
+/usr/share/java/jline.jar              /usr/share/groovy/lib/jline.jar
+/usr/share/java/junit4.jar             /usr/share/groovy/lib/junit4.jar
 /usr/share/java/mockobjects-core.jar   
/usr/share/groovy/lib/mockobjects-core.jar
 /usr/share/java/mx4j.jar               /usr/share/groovy/lib/mx4j.jar
 /usr/share/java/regexp.jar             /usr/share/groovy/lib/regexp.jar
-/usr/share/java/servlet-2.3.jar                
/usr/share/groovy/lib/servlet-2.3.jar
+/usr/share/java/servlet-2.4.jar                
/usr/share/groovy/lib/servlet-2.4.jar

Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules   2007-12-13 19:16:30 UTC (rev 5018)
+++ trunk/groovy/debian/rules   2007-12-13 21:13:01 UTC (rev 5019)
@@ -8,5 +8,18 @@
 DEB_JARS  := mockobjects-core servlet-api jsp-api commons-cli antlr \
              xstream bsf xercesImpl jline junit4 xstream jline
 
+VERSION := 1.5
+
+binary-install/groovy::
+       fromdos debian/groovy/usr/share/groovy/bin/*
+       chmod a+x debian/groovy/usr/share/groovy/bin/*
+       sed -i                                     \
+         -e"1s,.*,#!/bin/sh,"                     \
+         -e"s,@GROOVYJAR@,groovy-$(VERSION).jar," \
+         debian/groovy/usr/share/groovy/bin/startGroovy
+       dh_link -pgroovy                              \
+         /usr/share/groovy/lib/groovy-$(VERSION).jar \
+         /usr/share/java/groovy.jar
+
 get-orig-source:
        -uscan --upstream-version 0 --rename


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to