[pkg-java] r3298 - trunk/jta/debian

Paul Cager paulcager-guest at alioth.debian.org
Sat Apr 21 20:39:16 UTC 2007


Author: paulcager-guest
Date: 2007-04-21 20:39:16 +0000 (Sat, 21 Apr 2007)
New Revision: 3298

Added:
   trunk/jta/debian/README.Debian
Removed:
   trunk/jta/debian/Makefile.patch
   trunk/jta/debian/jta.links
Modified:
   trunk/jta/debian/changelog
   trunk/jta/debian/compat
   trunk/jta/debian/control
   trunk/jta/debian/rules
Log:
NOT YET READY FOR UPLOAD

  * Added myself to uploaders.
  * Converted to use CDBS (usual build system in pkg-java).
  * Compiles using java-gcj-compat-dev.
  * Changed to debheler version 5.
  * Swapped from Makefile to build.xml, as upstream's intention.
  * Removed dependency on Java runtime (as required by draft Java
    policy).
  * Renamed binary package to "libjta-java".
  * Created separate -doc package.
  * Removed non-dfsg RFC from source tarball.
    (Closes: #393377)
  * Expanded description, and added end-user documentation.
    (Closes: #34130, #417544)


Deleted: trunk/jta/debian/Makefile.patch
===================================================================
--- trunk/jta/debian/Makefile.patch	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/Makefile.patch	2007-04-21 20:39:16 UTC (rev 3298)
@@ -1,20 +0,0 @@
---- Makefile.orig	2004-02-11 01:35:22.000000000 +0100
-+++ Makefile	2004-05-15 17:28:25.915950888 +0200
-@@ -15,11 +15,12 @@
- # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- # Boston, MA 02111-1307, USA.
- 
--JAVA	=	java
--JAR	=	jar
--JAVAC	=	javac
--JAVADOC =	javadoc
--JAVAH 	=	javah
-+JAVA_HOME=/usr/local/IBMJava2-ppc-141
-+JAVA	=	$(JAVA_HOME)/bin/java
-+JAR	=	$(JAVA_HOME)/bin/jar
-+JAVAC	=	$(JAVA_HOME)/bin/javac
-+JAVADOC =	$(JAVA_HOME)/bin/javadoc
-+JAVAH 	=	$(JAVA_HOME)/bin/javah
- #JAVA	=	/q/opt/jdk1.2.2/bin/java
- #JAR	=	/q/opt/jdk1.2.2/bin/jar
- #JAVAC	=	/q/opt/jdk1.2.2/bin/javac

Added: trunk/jta/debian/README.Debian
===================================================================
--- trunk/jta/debian/README.Debian	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/README.Debian	2007-04-21 20:39:16 UTC (rev 3298)
@@ -0,0 +1,22 @@
+JTA Quick Start
+===============
+
+To run JTA as an SSH client:
+
+   java -jar /usr/share/java/jta.jar -plugins Status,Socket,SSH,Terminal your_server_name 22
+
+To run JTA as an applet, create a web page like:
+   <html>
+   <body>
+   <applet CODEBASE="." ARCHIVE="jta26.jar" CODE="de.mud.jta.Applet" WIDTH=590 HEIGHT=360>
+       <param name="Applet.detach" value="true">
+       <param name="Applet.detach.title" value="SSH">
+       <param name="Socket.host" value="yourserver" >
+       <param name="Socket.port" value="22" >
+       <param name="plugins" value="Status,Socket,SSH,Terminal" >
+   </applet>
+   </body>
+   </html>
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 16 Apr 2007 11:29:27 +0100
+

Modified: trunk/jta/debian/changelog
===================================================================
--- trunk/jta/debian/changelog	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/changelog	2007-04-21 20:39:16 UTC (rev 3298)
@@ -1,3 +1,23 @@
+jta (2.6+dfsg-1) unstable; urgency=low
+
+  NOT YET READY FOR UPLOAD
+
+  * Added myself to uploaders.
+  * Converted to use CDBS (usual build system in pkg-java).
+  * Compiles using java-gcj-compat-dev.
+  * Changed to debheler version 5.
+  * Swapped from Makefile to build.xml, as upstream's intention.
+  * Removed dependency on Java runtime (as required by draft Java
+    policy).
+  * Renamed binary package to "libjta-java".
+  * Created separate -doc package.
+  * Removed non-dfsg RFC from source tarball.
+    (Closes: #393377)
+  * Expanded description, and added end-user documentation.
+    (Closes: #34130, #417544)
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 21 Apr 2007 21:37:36 +0100
+
 jta (2.5+dfsg-1) unstable; urgency=low
 
   * Re-upload with orig.tar.gz with new version number (Closes: #413053).

Modified: trunk/jta/debian/compat
===================================================================
--- trunk/jta/debian/compat	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/compat	2007-04-21 20:39:16 UTC (rev 3298)
@@ -1 +1 @@
-4
+5

Modified: trunk/jta/debian/control
===================================================================
--- trunk/jta/debian/control	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/control	2007-04-21 20:39:16 UTC (rev 3298)
@@ -2,14 +2,48 @@
 Section: net
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jaldhar H. Vyas <jaldhar at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.1)
-Build-Depends-Indep: kaffe, libgnu-regexp-java, libcrimson-java, libjdom0-java
+Uploaders: Jaldhar H. Vyas <jaldhar at debian.org>, Arnaud Vandyck <avdyk at debian.org>,
+           Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
+Build-Depends: debhelper (>= 5), ant, dpatch (>= 2.0)
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.65), libxerces2-java,
+                     libgnu-regexp-java, libcrimson-java, libjdom0-java,
+		     classpath-doc
 Standards-Version: 3.7.2
 
-Package: jta
+Package: libjta-java
 Architecture: all
-Depends: j2sdk1.3 | j2sdk1.4 | java2-runtime | java-virtual-machine, libgnu-regexp-java, libcrimson-java, libjdom-java
+Section: libs
+Depends:  libgnu-regexp-java, libcrimson-java, libjdom-java
+Suggests: libjta-java-doc
 Description: Java telnet/ssh applet
- This is a java 1.1 compliant applet you can add to a web page.  Then you can 
- use the applet to SSH or telnet to the server the web page is on.
+ JTA is a Java implementation of Telnet and ssh.
+ .
+ JTA may be run as a standalone application (using class
+ de.mud.jta.Main), or as a Java Applet (class de.mud.jta.Applet).
+ .
+ It's modular structure allows to configure the software to act either
+ as a sophisticated terminal emulation and/or, adding the network
+ backend, as telnet implementation. Additional modules provide features
+ like scripting or an improved graphical user interface.
+ .
+  Homepage: http://www.javassh.org/
+
+Package: libjta-java-doc
+Architecture: all
+Section: doc
+Depends: classpath-doc
+Suggests: libjta-java
+Description: Java telnet/ssh applet
+ JTA is a Java implementation of Telnet and ssh.
+ .
+ JTA may be run as a standalone application (using class
+ de.mud.jta.Main), or as a Java Applet (class de.mud.jta.Applet).
+ .
+ It's modular structure allows to configure the software to act either
+ as a sophisticated terminal emulation and/or, adding the network
+ backend, as telnet implementation. Additional modules provide features
+ like scripting or an improved graphical user interface.
+ .
+ This package provides the API documentation for JTA
+ .
+  Homepage: http://www.javassh.org/

Deleted: trunk/jta/debian/jta.links
===================================================================
--- trunk/jta/debian/jta.links	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/jta.links	2007-04-21 20:39:16 UTC (rev 3298)
@@ -1 +0,0 @@
-usr/share/java/jta25.jar usr/share/java/jta.jar

Modified: trunk/jta/debian/rules
===================================================================
--- trunk/jta/debian/rules	2007-04-21 19:59:36 UTC (rev 3297)
+++ trunk/jta/debian/rules	2007-04-21 20:39:16 UTC (rev 3298)
@@ -1,109 +1,46 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+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
 
-#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), amd64))
-#	export JAVA_HOME=/usr/lib/j2sdk1.4-blackdown
-#else
-#	export JITC_PROCESSOR_TYPE=6
-#	export JAVA_HOME=/usr/local/IBMJava2-ppc-142
-#endif
+PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
+VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
+THEIR_VERSION        := $(shell echo $(VERSION) | sed 's/+dfsg//' | sed 's/\.//')
+JAVA_HOME            := /usr/lib/jvm/java-gcj
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
+DEB_ANT_BUILD_TARGET := bin-jar doc
+DEB_ANT_BUILDFILE    := build.xml
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+#DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
+API_DOCS             := doc/source
 
-
-export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# Class path: Ant requires an JAXP-compatible XML parser
-# You need to set CLASSPATH here (even if your build.xml assembles its own
-# class path) to ensure the same build results in all cases
-JARS=/usr/share/java
-ANT_HOME=/usr/share/ant
-export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:$(JARS)/junit.jar:/usr/share/java/regexp.jar:/usr/share/java/crimson.jar:/usr/share/java/jdom0.jar
-
-# Ant options
-ANT_OPTS=-Dant.build.javac.target=1.4
-ANT=/usr/bin/ant ${ANT_OPTS}
-VERSION=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
-
-
-
 get-orig-source:
+	echo "Downloading version $(VERSION) $(THEIR_VERSION)"
 	mkdir tmp
-	wget -O orig-jar http://javassh.org/download/jta26-src.jar && \
+	wget -O orig-jar http://javassh.org/download/jta$(THEIR_VERSION)-src.jar && \
 	cd tmp && \
 	jar xf ../orig-jar && \
-	rm jta26/doc/rfc854.txt jta26/tools/*relayd jta26/tools/*relayd.exe && \
-	mv jta26 jta_2.6+dfsg.orig && \
-	tar czf ../../jta_2.6+dfsg.orig.tar.gz jta_2.6+dfsg.orig
+	rm jta$(THEIR_VERSION)/doc/rfc854.txt jta$(THEIR_VERSION)/tools/*relayd jta$(THEIR_VERSION)/tools/*relayd.exe && \
+	rm -rf jta$(THEIR_VERSION)/doc/source && \
+	mv jta$(THEIR_VERSION) jta_$(VERSION).orig && \
+	tar czf ../../jta_$(VERSION).orig.tar.gz jta_$(VERSION).orig
 	rm -rf tmp orig-jar
+ 
+binary-post-install/lib$(PACKAGE)-java::
+	mv "jar/$(PACKAGE)$(VERSION).jar" "jar/$(PACKAGE)-$(VERSION).jar"
+	dh_install -plib$(PACKAGE)-java jar/$(PACKAGE)-$(VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
+	#	dh_installdocs -plib$(PACKAGE)-java doc/devref.html doc/readme.html debian/README.Debian-source
 
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
+makebuilddir/lib$(PACKAGE)-java::
 	-mkdir jar
-	$(ANT) bin-jar doc
 
-	touch build-stamp
+makebuilddir/lib$(PACKAGE)-java-doc::
+	echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+cleanbuilddir/lib$(PACKAGE)-java::
+	rm -rf jar doc/source
 
-	-find . -name \*.class -print | xargs rm > /dev/null 2>&1
-	-find . -name \*~ -print | xargs rm > /dev/null 2>&1
-	-rm -f tools/relayd tools/mrelayd
-	-rm -f jar/$(PKGNAME).jar jar/$(PKGNAME)-src.jar
-	cd jni && $(MAKE) realclean
-	-$(MAKE) realclean
 
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/jta.
-	install -o root -g root -m 0644 jar/jta25.jar \
-		$(CURDIR)/debian/jta/usr/share/java
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure




More information about the pkg-java-commits mailing list