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

[Paul Cager]

Author: paulcager-guest
Date: 2007-04-22 19:57:25 +0000 (Sun, 22 Apr 2007)
New Revision: 3304

Added:
   trunk/jta/debian/jta-doc.doc-base
Removed:
   trunk/jta/debian/docs
   trunk/jta/debian/libjta-java-doc.doc-base
Modified:
   trunk/jta/debian/changelog
   trunk/jta/debian/control
   trunk/jta/debian/rules
Log:
Revert renaming as libjta-java.
Add other documentation from upstream tarball

Modified: trunk/jta/debian/changelog
===================================================================
--- trunk/jta/debian/changelog	2007-04-22 17:21:11 UTC (rev 3303)
+++ trunk/jta/debian/changelog	2007-04-22 19:57:25 UTC (rev 3304)
@@ -1,7 +1,5 @@
 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.
@@ -10,7 +8,6 @@
     Makefile is out of date. Swapped to build.xml.
   * 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)

Modified: trunk/jta/debian/control
===================================================================
--- trunk/jta/debian/control	2007-04-22 17:21:11 UTC (rev 3303)
+++ trunk/jta/debian/control	2007-04-22 19:57:25 UTC (rev 3304)
@@ -10,11 +10,11 @@
 		     classpath-doc
 Standards-Version: 3.7.2
 
-Package: libjta-java
+Package: jta
 Architecture: all
-Section: libs
+Section: net
 Depends:  libgnu-regexp-java, libcrimson-java, libjdom-java
-Suggests: libjta-java-doc
+Suggests: jta-doc
 Description: Java telnet/ssh applet
  JTA is a Java implementation of Telnet and ssh.
  .
@@ -28,11 +28,11 @@
  .
   Homepage: http://www.javassh.org/
 
-Package: libjta-java-doc
+Package: jta-doc
 Architecture: all
 Section: doc
 Depends: classpath-doc
-Suggests: libjta-java
+Suggests: jta
 Description: Java telnet/ssh applet
  JTA is a Java implementation of Telnet and ssh.
  .

Deleted: trunk/jta/debian/docs
===================================================================
--- trunk/jta/debian/docs	2007-04-22 17:21:11 UTC (rev 3303)
+++ trunk/jta/debian/docs	2007-04-22 19:57:25 UTC (rev 3304)
@@ -1 +0,0 @@
-README

Copied: trunk/jta/debian/jta-doc.doc-base (from rev 3303, trunk/jta/debian/libjta-java-doc.doc-base)
===================================================================
--- trunk/jta/debian/libjta-java-doc.doc-base	2007-04-22 17:21:11 UTC (rev 3303)
+++ trunk/jta/debian/jta-doc.doc-base	2007-04-22 19:57:25 UTC (rev 3304)
@@ -0,0 +1,9 @@
+Document: jta
+Title: API Javadoc for jta
+Author: jta developers
+Abstract: This is the API Javadoc provided by the jta library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/jta/api/index.html
+Files: /usr/share/doc/jta/api/*

Deleted: trunk/jta/debian/libjta-java-doc.doc-base
===================================================================
--- trunk/jta/debian/libjta-java-doc.doc-base	2007-04-22 17:21:11 UTC (rev 3303)
+++ trunk/jta/debian/libjta-java-doc.doc-base	2007-04-22 19:57:25 UTC (rev 3304)
@@ -1,9 +0,0 @@
-Document: libjta-java
-Title: API Javadoc for jta
-Author: jta developers
-Abstract: This is the API Javadoc provided by the jta library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjta-java/api/index.html
-Files: /usr/share/doc/libjta-java/api/*

Modified: trunk/jta/debian/rules
===================================================================
--- trunk/jta/debian/rules	2007-04-22 17:21:11 UTC (rev 3303)
+++ trunk/jta/debian/rules	2007-04-22 19:57:25 UTC (rev 3304)
@@ -28,20 +28,21 @@
 	tar czf ../../jta_$(VERSION).orig.tar.gz jta_$(VERSION).orig
 	rm -rf tmp orig-jar
  
-binary-post-install/lib$(PACKAGE)-java::
+binary-post-install/$(PACKAGE)::
 	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
+	dh_install -p$(PACKAGE) jar/$(PACKAGE)-$(VERSION).jar usr/share/java
+	dh_link -p$(PACKAGE) usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
+	dh_installdocs -p$(PACKAGE) README
 
-binary-post-install/lib$(PACKAGE)-java-doc::
+binary-post-install/$(PACKAGE)-doc::
 	mv $(API_DOCS) doc/api
-	dh_install -plib$(PACKAGE)-java-doc doc/api usr/share/doc/lib$(PACKAGE)-java
+	dh_install -p$(PACKAGE)-doc doc/api usr/share/doc/$(PACKAGE)
+	dh_install -p$(PACKAGE)-doc doc/*.html doc/plugins usr/share/doc/$(PACKAGE)
 
-makebuilddir/lib$(PACKAGE)-java::
+makebuilddir/$(PACKAGE)::
 	-mkdir jar
 
-cleanbuilddir/lib$(PACKAGE)-java::
+cleanbuilddir/$(PACKAGE)::
 	rm -rf jar doc/source doc/api