[pkg-java] r11348 - trunk/libtggraphlayout-java/debian

Morten Sørensen starswifter-guest at alioth.debian.org
Sat Jan 16 14:04:15 UTC 2010


Author: starswifter-guest
Date: 2010-01-16 14:04:12 +0000 (Sat, 16 Jan 2010)
New Revision: 11348

Added:
   trunk/libtggraphlayout-java/debian/doc-base
   trunk/libtggraphlayout-java/debian/libtggraphlayout-java.dirs
Removed:
   trunk/libtggraphlayout-java/debian/build.xml
   trunk/libtggraphlayout-java/debian/getorig.sh
Modified:
   trunk/libtggraphlayout-java/debian/control
   trunk/libtggraphlayout-java/debian/libtggraphlayout-java-doc.install
   trunk/libtggraphlayout-java/debian/libtggraphlayout-java.install
   trunk/libtggraphlayout-java/debian/rules
   trunk/libtggraphlayout-java/debian/watch
Log:
* Switched from using cdbs and ant to debhelper and javahelper
  for doing all the work
* Added a doc-base for the package


Deleted: trunk/libtggraphlayout-java/debian/build.xml
===================================================================
--- trunk/libtggraphlayout-java/debian/build.xml	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/build.xml	2010-01-16 14:04:12 UTC (rev 11348)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project name="TGGraphLayout" basedir=".">
-	<description>
-		TGGraphLayout build file.
-	</description>
-
-	<property name="dist.dir" location="dist"/>
-	<property name="build.dir" location="${dist.dir}/build"/>
-	<property name="doc.dir" location="${dist.dir}/api"/>
-	<property name="src.dir" location=".."/>
-	<property name="src.version" value="1.1"/>
-	<property name="build.version" value="${src.version}"/>
-
-	<target name="init">
-		<mkdir dir="${dist.dir}"/>
-	</target>
-
-	<target name="doc" depends="init">
-		<mkdir dir="${doc.dir}"/>
-		<javadoc sourcepath="${src.dir}" destdir="${doc.dir}"/>
-	</target>
-
-	<target name="build" depends="init">
-		<mkdir dir="${build.dir}"/>
-		<javac srcdir="${src.dir}" destdir="${build.dir}" target="${build.version}" source="${src.version}"/>
-	</target>
-
-	<target name="jar" depends="build">
-		<manifest file="${dist.dir}/MANIFEST.MF">
-			<attribute name="classpath" value="./"/>
-			<attribute name="Main-Class" value="com.touchgraph.graphlayout.GLPanel"/>
-		</manifest>
-		<jar jarfile="${dist.dir}/${ant.project.name}.jar" basedir="${build.dir}" manifest="${dist.dir}/MANIFEST.MF"/>
-	</target>
-
-	<target name="all" depends="jar,doc"/>
-
-	<target name="clean">
-		<delete dir="${dist.dir}"/>
-	</target>
-</project>

Modified: trunk/libtggraphlayout-java/debian/control
===================================================================
--- trunk/libtggraphlayout-java/debian/control	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/control	2010-01-16 14:04:12 UTC (rev 11348)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at list.alioth.debian.org>
 Uploaders: Morten Sørensen <starswifter at gmail.com>
-Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
+Build-Depends: debhelper (>= 7), default-jdk, javahelper
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libtggraphlayout-java
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/libtggraphlayout-java
@@ -11,7 +11,7 @@
 
 Package: libtggraphlayout-java
 Architecture: all
-Depends: default-jre | java2-runtime, ${misc:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
 Description: Graph visualization library for Java
  Java library for visualization of graphs. The library supports
  scrolling veritcally and horisontally, and it allows to rotate

Added: trunk/libtggraphlayout-java/debian/doc-base
===================================================================
--- trunk/libtggraphlayout-java/debian/doc-base	                        (rev 0)
+++ trunk/libtggraphlayout-java/debian/doc-base	2010-01-16 14:04:12 UTC (rev 11348)
@@ -0,0 +1,11 @@
+Document: libtggraphlayout-java
+Title: Programmer API for TouchGraph GraphLayout
+Author: Alexander Shapiro <x_ander at users.sourceforge.net>
+Abstract: Java library for visualization of graphs. The library supports
+ scrolling veritcally and horisontally, and it allows to rotate
+ the graph.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libtggraphlayout-java/api/index.html
+Files: /usr/share/doc/libtggraphlayout-java/api/*.html

Deleted: trunk/libtggraphlayout-java/debian/getorig.sh
===================================================================
--- trunk/libtggraphlayout-java/debian/getorig.sh	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/getorig.sh	2010-01-16 14:04:12 UTC (rev 11348)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-#fix for their "_jre11" part
-VERSION=122
-
-unzip $3
-rm -r $3
-find TGGraphLayout -name *.jar -delete
-tar -czf TGGL-$VERSION.tar.gz TGGraphLayout/*
-rm -r TGGraphLayout
-ln -s TGGL-$VERSION.tar.gz libtggraphlayout-java_$VERSION.orig.tar.gz
-
-svn-upgrade $1 $VERSION libtggraphlayout-java_$VERSION.orig.tar.gz

Modified: trunk/libtggraphlayout-java/debian/libtggraphlayout-java-doc.install
===================================================================
--- trunk/libtggraphlayout-java/debian/libtggraphlayout-java-doc.install	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/libtggraphlayout-java-doc.install	2010-01-16 14:04:12 UTC (rev 11348)
@@ -1,2 +1,2 @@
-debian/dist/api usr/share/libtggraphlayout-java
+debian/_jh_build.javadoc/api usr/share/libtggraphlayout-java
 ReleaseNotes.txt usr/share/doc/libtggraphlayout-java-doc

Added: trunk/libtggraphlayout-java/debian/libtggraphlayout-java.dirs
===================================================================
--- trunk/libtggraphlayout-java/debian/libtggraphlayout-java.dirs	                        (rev 0)
+++ trunk/libtggraphlayout-java/debian/libtggraphlayout-java.dirs	2010-01-16 14:04:12 UTC (rev 11348)
@@ -0,0 +1 @@
+usr/share/java

Modified: trunk/libtggraphlayout-java/debian/libtggraphlayout-java.install
===================================================================
--- trunk/libtggraphlayout-java/debian/libtggraphlayout-java.install	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/libtggraphlayout-java.install	2010-01-16 14:04:12 UTC (rev 11348)
@@ -1,2 +1,3 @@
-debian/dist/TGGraphLayout.jar usr/share/java
+libtggraphlayout-122.jar usr/share/java
+libtggraphlayout.jar usr/share/java
 ReleaseNotes.txt usr/share/doc/libtggraphlayout-java

Modified: trunk/libtggraphlayout-java/debian/rules
===================================================================
--- trunk/libtggraphlayout-java/debian/rules	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/rules	2010-01-16 14:04:12 UTC (rev 11348)
@@ -1,12 +1,84 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses debhelper. 
+# This file is public domain software, originally written by Joey Hess.
+#
+# This version is for packages that are architecture independent.
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-JAVA_HOME := /usr/lib/jvm/default-java
+build: build-stamp
+build-stamp:
+	dh_testdir
 
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_BUILD_TARGET := all
+	# Add here commands to compile the package.
+	#$(MAKE)
+	jh_build -J -mcom.touchgraph.graphlayout.GLPanel libtggraphlayout.jar com/
+	ln -s libtggraphlayout.jar libtggraphlayout-122.jar
+	cp "TGGL ReleaseNotes.txt" ReleaseNotes.txt
 
-common-install-prehook-impl::
-	mv "TGGL ReleaseNotes.txt" ReleaseNotes.txt
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	#$(MAKE) clean
+	#$(MAKE) distclean
+	jh_clean
+	rm -f `pwd`/libtggraphlayout-122.jar `pwd`/libtggraphlayout.jar ReleaseNotes.txt
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	dh_install
+
+	# Add here commands to install the package into debian/<packagename>.
+	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
+	
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	jh_depends
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installcatalogs
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_installwm
+#	dh_installudev
+#	dh_lintian
+#	dh_bugfiles
+#	dh_undocumented
+	dh_installman
+	dh_link
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_installdeb
+	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

Modified: trunk/libtggraphlayout-java/debian/watch
===================================================================
--- trunk/libtggraphlayout-java/debian/watch	2010-01-12 11:06:28 UTC (rev 11347)
+++ trunk/libtggraphlayout-java/debian/watch	2010-01-16 14:04:12 UTC (rev 11348)
@@ -1,3 +1,3 @@
 version=3
 # use qa.debian.org redirector; see man uscan
-http://sf.net/touchgraph/ TGGL_(.*)\.zip debian debian/getorig.sh
+http://sf.net/touchgraph/ TGGL_(.*)\.zip debian jh_repack




More information about the pkg-java-commits mailing list