Author: manuel
Date: 2009-09-17 20:59:33 +0000 (Thu, 17 Sep 2009)
New Revision: 10445
Added:
trunk/pj/debian/javabuild
trunk/pj/debian/libpj-java.jlibs
Removed:
trunk/pj/debian/libpj-java-doc.dirs
trunk/pj/debian/libpj-java-doc.install
trunk/pj/debian/patches/
Modified:
trunk/pj/debian/changelog
trunk/pj/debian/compat
trunk/pj/debian/control
trunk/pj/debian/rules
Log:
Changed to build system to debhelper
Modified: trunk/pj/debian/changelog
===================================================================
--- trunk/pj/debian/changelog 2009-09-17 19:53:56 UTC (rev 10444)
+++ trunk/pj/debian/changelog 2009-09-17 20:59:33 UTC (rev 10445)
@@ -1,14 +1,14 @@
-pj (0.0~20080913-1) UNRELEASED; urgency=low
+pj (0.0~20090405-1) UNRELEASED; urgency=low
* New upstream release
- * Moving PJ to main by build-depending on OpenJDK
- * Building a package that contains the API documentation
+ * Moved PJ to main by dropping build-dep on non-free Java. Closes: #546513
+ * Changed build system to debhelper
* debian/control:
- Bumped Standards-Version to 3.8.3
- Changed Section from "contrib/libs" to "java"
- Updated my email address
- -- Manuel Prinz <[email protected]> Thu, 17 Sep 2009 21:26:34 +0200
+ -- Manuel Prinz <[email protected]> Thu, 17 Sep 2009 22:57:12 +0200
pj (0.0~20080628-1) unstable; urgency=low
Modified: trunk/pj/debian/compat
===================================================================
--- trunk/pj/debian/compat 2009-09-17 19:53:56 UTC (rev 10444)
+++ trunk/pj/debian/compat 2009-09-17 20:59:33 UTC (rev 10445)
@@ -1 +1 @@
-5
+7
Modified: trunk/pj/debian/control
===================================================================
--- trunk/pj/debian/control 2009-09-17 19:53:56 UTC (rev 10444)
+++ trunk/pj/debian/control 2009-09-17 20:59:33 UTC (rev 10445)
@@ -4,24 +4,13 @@
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Manuel Prinz <[email protected]>
Homepage: http://www.cs.rit.edu/~ark/pj.shtml
-Build-Depends: debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: ant, openjdk-6-jdk
+Build-Depends: debhelper (>= 7), javahelper, default-jdk-builddep
Standards-Version: 3.8.3
Package: libpj-java
Architecture: all
-Depends: openjdk-6-jre | java2-runtime
+Depends: ${java:Depends}, ${misc:Depends}
Description: The Parallel Java Library
Parallel Java (PJ) is an API and middleware for parallel programming
in 100% Java on shared memory multiprocessor (SMP) parallel computers,
cluster parallel computers, and hybrid SMP cluster parallel computers.
-
-Package: libpj-java-doc
-Section: doc
-Architecture: all
-Description: Documentation for the Parallel Java Library
- Parallel Java (PJ) is an API and middleware for parallel programming
- in 100% Java on shared memory multiprocessor (SMP) parallel computers,
- cluster parallel computers, and hybrid SMP cluster parallel computers.
- .
- This package contains the class API documentation for PJ.
Added: trunk/pj/debian/javabuild
===================================================================
--- trunk/pj/debian/javabuild (rev 0)
+++ trunk/pj/debian/javabuild 2009-09-17 20:59:33 UTC (rev 10445)
@@ -0,0 +1 @@
+pj.jar lib/edu
Deleted: trunk/pj/debian/libpj-java-doc.dirs
===================================================================
--- trunk/pj/debian/libpj-java-doc.dirs 2009-09-17 19:53:56 UTC (rev 10444)
+++ trunk/pj/debian/libpj-java-doc.dirs 2009-09-17 20:59:33 UTC (rev 10445)
@@ -1 +0,0 @@
-usr/share/doc/libpj-java-doc/api/
Deleted: trunk/pj/debian/libpj-java-doc.install
===================================================================
--- trunk/pj/debian/libpj-java-doc.install 2009-09-17 19:53:56 UTC (rev
10444)
+++ trunk/pj/debian/libpj-java-doc.install 2009-09-17 20:59:33 UTC (rev
10445)
@@ -1 +0,0 @@
-doc/* usr/share/doc/libpj-java-doc/api/
Added: trunk/pj/debian/libpj-java.jlibs
===================================================================
--- trunk/pj/debian/libpj-java.jlibs (rev 0)
+++ trunk/pj/debian/libpj-java.jlibs 2009-09-17 20:59:33 UTC (rev 10445)
@@ -0,0 +1 @@
+pj.jar
Modified: trunk/pj/debian/rules
===================================================================
--- trunk/pj/debian/rules 2009-09-17 19:53:56 UTC (rev 10444)
+++ trunk/pj/debian/rules 2009-09-17 20:59:33 UTC (rev 10445)
@@ -1,35 +1,20 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Copyright (C) 2007 Manuel Prinz <[email protected]>
+# Copyright (C) 2007-2009 Manuel Prinz <[email protected]>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+JAVA_HOME := /usr/lib/jvm/default-java
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-
-DEB_ANT_BUILD_TARGET := jar javadoc
-
-PACKAGE := pj
DEBIAN_VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' '
-f2 | cut -d- -f1)
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' '
-f2 | cut -d- -f1 | cut -d~ -f2)
-ANT_ARGS += -Dapp.version=$(DEBIAN_VERSION)
+get-orig-source: pj_$(DEBIAN_VERSION).orig.tar.gz
-pjsrc$(UPSTREAM_VERSION).jar:
- wget http://www.cs.rit.edu/~ark/pjsrc$(UPSTREAM_VERSION).jar
-
pj_$(DEBIAN_VERSION).orig.tar.gz: pjsrc$(UPSTREAM_VERSION).jar
sh debian/repack.sh $(UPSTREAM_VERSION)
-get-orig-source: pj_$(DEBIAN_VERSION).orig.tar.gz
+pjsrc$(UPSTREAM_VERSION).jar:
+ wget http://www.cs.rit.edu/~ark/pjsrc$(UPSTREAM_VERSION).jar
-clean::
- rm -rf lib/edu/rit/draw/item/doc-files/
+%:
+ dh $@ --with javahelper
-install/lib$(PACKAGE)-java::
- install -m 0644 lib/$(PACKAGE)-$(DEBIAN_VERSION).jar
debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE)-$(DEBIAN_VERSION).jar
- ln -s $(PACKAGE)-$(DEBIAN_VERSION).jar
debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE).jar
+.PHONY: get-orig-source
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
