[pkg-java] r11875 - trunk/ganymed-ssh2/debian

Miguel Landaeta nomadium-guest at alioth.debian.org
Tue Mar 16 00:56:20 UTC 2010


Author: nomadium-guest
Date: 2010-03-16 00:56:20 +0000 (Tue, 16 Mar 2010)
New Revision: 11875

Added:
   trunk/ganymed-ssh2/debian/clean
   trunk/ganymed-ssh2/debian/doc-base
   trunk/ganymed-ssh2/debian/jlibs
   trunk/ganymed-ssh2/debian/links
Modified:
   trunk/ganymed-ssh2/debian/changelog
   trunk/ganymed-ssh2/debian/control
   trunk/ganymed-ssh2/debian/docs
   trunk/ganymed-ssh2/debian/pom.xml
   trunk/ganymed-ssh2/debian/rules
   trunk/ganymed-ssh2/debian/watch
Log:
* New upstream release. (Closes: #574007).
* Added myself to Uploaders.
* Replaced Build-Depends on java-gcj-compat-dev with default-jdk.
  Also now Depends on default-jre-headless instead of java-gcj-compat-dev.
* Switched packaging style from plain debhelper to dh7 and enabled
  building with javahelper.
* Updated watch file.
* Registered API docs with doc-base.


Modified: trunk/ganymed-ssh2/debian/changelog
===================================================================
--- trunk/ganymed-ssh2/debian/changelog	2010-03-15 22:08:33 UTC (rev 11874)
+++ trunk/ganymed-ssh2/debian/changelog	2010-03-16 00:56:20 UTC (rev 11875)
@@ -1,3 +1,16 @@
+ganymed-ssh2 (250-1) UNRELEASED; urgency=low
+
+  * New upstream release. (Closes: #574007).
+  * Added myself to Uploaders.
+  * Replaced Build-Depends on java-gcj-compat-dev with default-jdk.
+    Also now Depends on default-jre-headless instead of java-gcj-compat-dev.
+  * Switched packaging style from plain debhelper to dh7 and enabled
+    building with javahelper.
+  * Updated watch file.
+  * Registered API docs with doc-base.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 15 Mar 2010 20:23:17 -0430
+
 ganymed-ssh2 (210-3) unstable; urgency=low
 
   [ Marcus Better ]

Added: trunk/ganymed-ssh2/debian/clean
===================================================================
--- trunk/ganymed-ssh2/debian/clean	                        (rev 0)
+++ trunk/ganymed-ssh2/debian/clean	2010-03-16 00:56:20 UTC (rev 11875)
@@ -0,0 +1 @@
+ganymed-ssh2*.jar

Modified: trunk/ganymed-ssh2/debian/control
===================================================================
--- trunk/ganymed-ssh2/debian/control	2010-03-15 22:08:33 UTC (rev 11874)
+++ trunk/ganymed-ssh2/debian/control	2010-03-16 00:56:20 UTC (rev 11875)
@@ -2,9 +2,9 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), maven-repo-helper
-Build-Depends-Indep: java-gcj-compat-dev
+Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>, Miguel Landaeta <miguel at miguel.cc>
+Build-Depends: debhelper (>= 7.0.50~), maven-repo-helper, default-jdk,
+               javahelper
 Standards-Version: 3.8.4
 Homepage: http://www.cleondris.ch/ssh2/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/ganymed-ssh2
@@ -12,8 +12,9 @@
 
 Package: libganymed-ssh2-java
 Architecture: all
-Depends: ${misc:Depends}, java-gcj-compat-dev | java2-runtime
-Suggests: java-virtual-machine
+Depends: default-jre-headless | java6-runtime-headless |
+         java5-runtime-headless | java2-runtime-headless | java2-runtime,
+         ${misc:Depends}
 Description: pure Java implementation of the SSH-2 protocol
  Ganymed SSH-2 for Java is a library which implements the SSH-2
  protocol in pure Java. It allows one to connect to SSH servers from

Added: trunk/ganymed-ssh2/debian/doc-base
===================================================================
--- trunk/ganymed-ssh2/debian/doc-base	                        (rev 0)
+++ trunk/ganymed-ssh2/debian/doc-base	2010-03-16 00:56:20 UTC (rev 11875)
@@ -0,0 +1,8 @@
+Document: libganymed-ssh2-java-doc
+Title: Ganymed SSH-2
+Abstract: pure Java implementation of the SSH-2 protocol
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libganymed-ssh2-java/api/index.html
+Files: /usr/share/doc/libganymed-ssh2-java/api/*.html

Modified: trunk/ganymed-ssh2/debian/docs
===================================================================
--- trunk/ganymed-ssh2/debian/docs	2010-03-15 22:08:33 UTC (rev 11874)
+++ trunk/ganymed-ssh2/debian/docs	2010-03-16 00:56:20 UTC (rev 11875)
@@ -1,3 +1,3 @@
-apidocs
+debian/_jh_build.javadoc/api
 README.txt
 faq/FAQ.html

Added: trunk/ganymed-ssh2/debian/jlibs
===================================================================
--- trunk/ganymed-ssh2/debian/jlibs	                        (rev 0)
+++ trunk/ganymed-ssh2/debian/jlibs	2010-03-16 00:56:20 UTC (rev 11875)
@@ -0,0 +1 @@
+ganymed-ssh2.jar

Added: trunk/ganymed-ssh2/debian/links
===================================================================
--- trunk/ganymed-ssh2/debian/links	                        (rev 0)
+++ trunk/ganymed-ssh2/debian/links	2010-03-16 00:56:20 UTC (rev 11875)
@@ -0,0 +1 @@
+usr/share/java/ganymed-ssh2-250.jar  usr/share/java/ganymed-ssh2-build250.jar

Modified: trunk/ganymed-ssh2/debian/pom.xml
===================================================================
--- trunk/ganymed-ssh2/debian/pom.xml	2010-03-15 22:08:33 UTC (rev 11874)
+++ trunk/ganymed-ssh2/debian/pom.xml	2010-03-16 00:56:20 UTC (rev 11875)
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ch.ethz.ganymed</groupId>
   <artifactId>ganymed-ssh2</artifactId>
-  <version>build210</version>
+  <version>build250</version>
   <name>Ganymed SSH2 for Java</name>
   <description>Ganymed SSH2 for Java is a library which implements the SSH-2 protocol in pure Java</description>
   <url>http://www.cleondris.ch/ssh2/</url>

Modified: trunk/ganymed-ssh2/debian/rules
===================================================================
--- trunk/ganymed-ssh2/debian/rules	2010-03-15 22:08:33 UTC (rev 11874)
+++ trunk/ganymed-ssh2/debian/rules	2010-03-16 00:56:20 UTC (rev 11875)
@@ -1,57 +1,29 @@
 #!/usr/bin/make -f
 
-JAVA_HOME	:= /usr/lib/jvm/java-gcj
-DEB_JARS_BASE	:= /usr/share/java
-JAVAC 	 	:= $(JAVA_HOME)/bin/javac
+PKGNAME := ganymed-ssh2
+LIBNAME := lib$(PKGNAME)-java
 
-PKGNAME		:= ganymed-ssh2
-LIBNAME		:= lib$(PKGNAME)-java
-INSTALL_DIR	:= $(CURDIR)/debian/$(LIBNAME)
-JAVALIB_DIR	:= $(INSTALL_DIR)/usr/share/java
+%:
+	dh --with javahelper $@
 
-VERSION         := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d-)
+override_dh_auto_build:
+	jh_build $(PKGNAME).jar src
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(JAVAC) src
-	cd src && $(JAVA_HOME)/bin/jar cf ../$(PKGNAME).jar $$(find -name \*.class) && cd ..
-	$(JAVA_HOME)/bin/javadoc -sourcepath src -all -doctitle 'Ganymed SSH-2' -d apidocs 
-	touch build-stamp
+override_dh_auto_clean:
+	jh_clean
 
-clean:
-	dh_testdir
-	dh_testroot
-	-rm -rf $(PKGNAME).jar apidocs build-stamp
-	find -name \*.class -exec rm {} \+
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	ln -s $(PKGNAME).jar $(JAVALIB_DIR)/$(PKGNAME)-$(VERSION).jar
-	install -m 644 HISTORY.txt $(INSTALL_DIR)/usr/share/doc/$(LIBNAME)/changlog
-	# maven
+override_dh_auto_install:
+	dh_auto_install
 	mh_installpom -p$(LIBNAME) $(CURDIR)/debian/pom.xml
 	mh_installjar -p$(LIBNAME) -l $(CURDIR)/debian/pom.xml \
 		$(CURDIR)/$(PKGNAME).jar
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary-arch: build install
+override_dh_installchangelogs:
+	dh_installchangelogs HISTORY.txt
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+get-orig-source:
+	uscan \
+		--verbose \
+		--no-symlink \
+		--force-download \
+		--destdir $(CURDIR)

Modified: trunk/ganymed-ssh2/debian/watch
===================================================================
--- trunk/ganymed-ssh2/debian/watch	2010-03-15 22:08:33 UTC (rev 11874)
+++ trunk/ganymed-ssh2/debian/watch	2010-03-16 00:56:20 UTC (rev 11875)
@@ -1,2 +1,2 @@
 version=3
-http://www.ganymed.ethz.ch/ssh2/ganymed-ssh2-build(\d+)\.zip
+http://www.cleondris.ch/ssh2/ganymed-ssh2-build(\d+)\.zip debian jh_repack




More information about the pkg-java-commits mailing list