[pkg-java] r4272 - in trunk/jline/debian: . patches

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Wed Sep 26 16:25:31 UTC 2007 

Author: varun-guest
Date: 2007-09-26 16:25:31 +0000 (Wed, 26 Sep 2007)
New Revision: 4272

Added:
   trunk/jline/debian/build.properties
   trunk/jline/debian/build.xml
   trunk/jline/debian/orig-tar.exclude
   trunk/jline/debian/orig-tar.sh
   trunk/jline/debian/patches/remove_import_jmx.diff
   trunk/jline/debian/patches/series
Modified:
   trunk/jline/debian/changelog
   trunk/jline/debian/control
   trunk/jline/debian/copyright
   trunk/jline/debian/libjline-java-doc.doc-base
   trunk/jline/debian/libjline-java-doc.docs
   trunk/jline/debian/rules
   trunk/jline/debian/watch
Log:
* New upstream release
* Add debian/build.xml and debian/build.properties - no longer provided by upstream.
* debian/control:
  + Add myself and Kumar Appaiah to Uploaders.
  + Depend and Build-Depend on java-gcj-compat(-dev) instead of kaffe.
  + Build-Depends on quilt for patches.
  + add XS-Vcs-Svn, XS-Vcs-Browser and Homepage headers
* debian/rules:
  + set JAVA_HOME to java-gcj
  + implement get-orig-source
* Add debian/orig-tar.sh and debian/orig-tar.exclude to create orig.tar.gz
* Update debian/watch to call debian/orig-tar.sh
* debian/patches:
  + remove old patches
  + add remove_import_jmx.diff to comment out import of com.sun.jmx.* class
  which was not being used.
* debian/copyright: make some minor corrections.

Added: trunk/jline/debian/build.properties
===================================================================
--- trunk/jline/debian/build.properties	                        (rev 0)
+++ trunk/jline/debian/build.properties	2007-09-26 16:25:31 UTC (rev 4272)
@@ -0,0 +1,5 @@
+class.dir=build
+source.dir=src/src
+doc.dir=api
+jar.name=jline.jar
+demo-jar.name=jline-demo.jar

Added: trunk/jline/debian/build.xml
===================================================================
--- trunk/jline/debian/build.xml	                        (rev 0)
+++ trunk/jline/debian/build.xml	2007-09-26 16:25:31 UTC (rev 4272)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<project default="jar" name="jline" basedir="..">
+
+  <patternset id="compiler.resources">
+    <include name="**/*.properties"/>
+    <include name="**/*.gz"/>
+    <include name="**/*.gif"/>
+    <include name="**/*.png"/>
+    <include name="**/*.jpg"/>
+  </patternset>
+
+  <target name="clean">
+    <delete dir="${class.dir}" quiet="true" />
+    <delete file="${jar.name}" quiet="true" />
+    <delete file="${demo-jar.name}" quiet="true" />
+    <delete dir="${doc.dir}" quiet="true" />
+  </target>
+
+  <target name="compile">
+    <mkdir dir="${class.dir}" />
+    <javac srcdir="${source.dir}" destdir="${class.dir}"
+    deprecation="true" debug="true" optimize="false" />
+    <copy todir="${class.dir}">
+      <fileset dir="${source.dir}/main/resources">
+        <patternset refid="compiler.resources" />
+      </fileset>
+    </copy>
+    <copy todir="${class.dir}">
+      <fileset dir="${source.dir}/test/resources">
+        <patternset refid="compiler.resources" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="jar" description="o Creates the jars" depends="compile">
+    <jar jarfile="${jar.name}" basedir="${class.dir}"
+    includes="**/jline/*.class,**/jline/*.properties" />
+    <jar jarfile="${demo-jar.name}" basedir="${class.dir}" includes="**/example/*"/>
+  </target>
+
+  <target name="javadoc" description="Creates Javadoc documentation">
+    <mkdir dir="${doc.dir}" />
+    <javadoc packagenames="jline" sourcepath="${source.dir}/main/java" destdir="${doc.dir}" />
+  </target>
+
+</project>

Modified: trunk/jline/debian/changelog
===================================================================
--- trunk/jline/debian/changelog	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/changelog	2007-09-26 16:25:31 UTC (rev 4272)
@@ -1,3 +1,25 @@
+jline (0.9.91-1) unstable; urgency=low
+
+  * New upstream release
+  * Add debian/build.xml and debian/build.properties - no longer provided by upstream.
+  * debian/control:
+    + Add myself and Kumar Appaiah to Uploaders.
+    + Depend and Build-Depend on java-gcj-compat(-dev) instead of kaffe.
+    + Build-Depends on quilt for patches.
+    + add XS-Vcs-Svn, XS-Vcs-Browser and Homepage headers
+  * debian/rules:
+    + set JAVA_HOME to java-gcj
+    + implement get-orig-source
+  * Add debian/orig-tar.sh and debian/orig-tar.exclude to create orig.tar.gz
+  * Update debian/watch to call debian/orig-tar.sh
+  * debian/patches:
+    + remove old patches
+    + add remove_import_jmx.diff to comment out import of com.sun.jmx.* class
+    which was not being used.
+  * debian/copyright: make some minor corrections.
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Wed, 26 Sep 2007 17:30:34 +0530
+
 jline (0.9.5-3) unstable; urgency=low
 
   * Adjusted watch file

Modified: trunk/jline/debian/control
===================================================================
--- trunk/jline/debian/control	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/control	2007-09-26 16:25:31 UTC (rev 4272)
@@ -2,33 +2,32 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Peter Eisentraut <petere at debian.org>
-Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), ant, jikes, junit, kaffe
+Uploaders: Peter Eisentraut <petere at debian.org>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
+Build-Depends: cdbs, debhelper (>= 5), quilt
+Build-Depends-Indep: ant, junit, java-gcj-compat-dev
 Standards-Version: 3.7.2
+Homepage: http://jline.sourceforge.net/
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jline
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jline
 
 Package: libjline-java
-Section: libs
 Architecture: all
-Depends: kaffe | java2-runtime | java1-runtime
-Suggests: kaffe | java-virtual-machine, libjline-java-doc
+Depends: java-gcj-compat | java2-runtime | java1-runtime
+Suggests: libjline-java-doc
 Description: Java library for handling console input
  JLine is a 100% pure Java library for reading and editing console input.
  It is similar in functionality to BSD editline and GNU readline.  People
  familiar with the readline/editline capabilities for modern shells will
  find most of the command editing features of JLine to be familiar.
- .
- Web site: http://jline.sourceforge.net/
 
 Package: libjline-java-doc
 Section: doc
 Architecture: all
 Suggests: libjline-java
-Description: documentation for JLine
+Description: Java library for handling console input - documentation
  JLine is a 100% pure Java library for reading and editing console input.
  It is similar in functionality to BSD editline and GNU readline.  People
  familiar with the readline/editline capabilities for modern shells will
  find most of the command editing features of JLine to be familiar.
  .
  This package contains the documentation for JLine.
- .
- Web site: http://jline.sourceforge.net/

Modified: trunk/jline/debian/copyright
===================================================================
--- trunk/jline/debian/copyright	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/copyright	2007-09-26 16:25:31 UTC (rev 4272)
@@ -5,11 +5,10 @@
 
 Upstream author: Marc Prud'hommeaux <marc at apocalypse.org>
 
-Copyright:
+Copyright: (c) 2002-2006 Marc Prud'hommeaux <mwp1 at cornell.edu>,  
+	   All rights reserved.
 
-  Copyright (c) 2002, 2003, 2004, 2005, 2006, Marc Prud'hommeaux <mwp1 at cornell.edu>
-  All rights reserved.
-
+License:
   Redistribution and use in source and binary forms, with or
   without modification, are permitted provided that the following
   conditions are met:

Modified: trunk/jline/debian/libjline-java-doc.doc-base
===================================================================
--- trunk/jline/debian/libjline-java-doc.doc-base	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/libjline-java-doc.doc-base	2007-09-26 16:25:31 UTC (rev 4272)
@@ -8,5 +8,5 @@
 Section: Apps/Text
 
 Format: HTML
-Index: /usr/share/doc/libjline-java-doc/manual.html
-Files: /usr/share/doc/libjline-java-doc/manual.html
+Index: /usr/share/doc/libjline-java-doc/index.html
+Files: /usr/share/doc/libjline-java-doc/*.html

Modified: trunk/jline/debian/libjline-java-doc.docs
===================================================================
--- trunk/jline/debian/libjline-java-doc.docs	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/libjline-java-doc.docs	2007-09-26 16:25:31 UTC (rev 4272)
@@ -1,4 +1,2 @@
-doc/index.html
-doc-build/manual.html
-doc-build/styles.css
-doc-build/javadoc
+api/*
+

Added: trunk/jline/debian/orig-tar.exclude
===================================================================
--- trunk/jline/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/jline/debian/orig-tar.exclude	2007-09-26 16:25:31 UTC (rev 4272)
@@ -0,0 +1,4 @@
+*apidocs*
+*.jar
+*java.rej
+*java.orig

Added: trunk/jline/debian/orig-tar.sh
===================================================================
--- trunk/jline/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jline/debian/orig-tar.sh	2007-09-26 16:25:31 UTC (rev 4272)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+ZIP=../jline-$2.zip
+DIR=jline-$2.orig
+TAR=../jline_$2.orig.tar.gz
+
+# clean up the upstream tarball
+unzip $ZIP
+mv jline-$2 $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $3 $ZIP
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi
+
+exit 0


Property changes on: trunk/jline/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/jline/debian/patches/remove_import_jmx.diff
===================================================================
--- trunk/jline/debian/patches/remove_import_jmx.diff	                        (rev 0)
+++ trunk/jline/debian/patches/remove_import_jmx.diff	2007-09-26 16:25:31 UTC (rev 4272)
@@ -0,0 +1,13 @@
+Index: jline-0.9.91/src/src/main/java/jline/Terminal.java
+===================================================================
+--- jline-0.9.91.orig/src/src/main/java/jline/Terminal.java	2007-09-26 21:03:51.000000000 +0530
++++ jline-0.9.91/src/src/main/java/jline/Terminal.java	2007-09-26 21:03:54.000000000 +0530
+@@ -8,7 +8,7 @@
+ 
+ import java.io.*;
+ 
+-import com.sun.jmx.snmp.ThreadContext;
++//import com.sun.jmx.snmp.ThreadContext;
+ 
+ /**
+  *  Representation of the input terminal for a platform. Handles

Added: trunk/jline/debian/patches/series
===================================================================
--- trunk/jline/debian/patches/series	                        (rev 0)
+++ trunk/jline/debian/patches/series	2007-09-26 16:25:31 UTC (rev 4272)
@@ -0,0 +1 @@
+remove_import_jmx.diff

Modified: trunk/jline/debian/rules
===================================================================
--- trunk/jline/debian/rules	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/rules	2007-09-26 16:25:31 UTC (rev 4272)
@@ -2,23 +2,20 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME = /usr/lib/kaffe
-DEB_JARS = junit
-DEB_ANT_BUILD_TARGET = jars
-DEB_ANT_COMPILER = jikes
+JAVA_HOME 		:= /usr/lib/jvm/java-gcj
+DEB_JARS 		:= junit
+DEB_ANT_BUILDFILE	:= debian/build.xml
+DEB_ANT_PROPERTYFILE	:= debian/build.properties
+DEB_ANT_BUILD_TARGET    := jar javadoc
 
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_EXAMPLES_libjline-java-doc = release/jline-demo.jar
+DEB_INSTALL_EXAMPLES_libjline-java-doc = jline-demo.jar
 
-
 install/libjline-java:: DEB_FINALDIR=$(CURDIR)/debian/libjline-java
 install/libjline-java::
-	install -m 644 -D release/jline-0_9_5.jar $(DEB_FINALDIR)/usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar
+	install -m 644 -D jline.jar $(DEB_FINALDIR)/usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jline.jar
 
-
-clean::
-	rm -rf build/ release/ reports/ tmp/
-	rm -f VERSION.txt
+get-orig-source:
+	-uscan --upstream-version 0

Modified: trunk/jline/debian/watch
===================================================================
--- trunk/jline/debian/watch	2007-09-26 07:39:55 UTC (rev 4271)
+++ trunk/jline/debian/watch	2007-09-26 16:25:31 UTC (rev 4272)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/jline/jline-([0-9.]+)\.zip
+http://sf.net/jline/jline-([0-9.]+)\.zip debian debian/orig-tar.sh
+

More information about the pkg-java-commits mailing list