Author: twerner
Date: 2011-09-03 23:27:44 +0000 (Sat, 03 Sep 2011)
New Revision: 14709

Added:
   trunk/libiscwt-java/debian/compat
   trunk/libiscwt-java/debian/javabuild
   trunk/libiscwt-java/debian/libiscwt-java-doc.javadoc
   trunk/libiscwt-java/debian/libiscwt-java.jlibs
Removed:
   trunk/libiscwt-java/debian/libiscwt-5.2-java.dirs
   trunk/libiscwt-java/debian/libiscwt-java-doc.TODO
   trunk/libiscwt-java/debian/libiscwt-java-doc.doc-base
   trunk/libiscwt-java/debian/libiscwt-java-doc.docs
   trunk/libiscwt-java/debian/libiscwt-java.dirs
Modified:
   trunk/libiscwt-java/debian/changelog
   trunk/libiscwt-java/debian/control
   trunk/libiscwt-java/debian/rules
Log:
* Switch to javahelper.
* Drop versioned binary package.

Modified: trunk/libiscwt-java/debian/changelog
===================================================================
--- trunk/libiscwt-java/debian/changelog        2011-09-03 23:21:43 UTC (rev 
14708)
+++ trunk/libiscwt-java/debian/changelog        2011-09-03 23:27:44 UTC (rev 
14709)
@@ -6,8 +6,10 @@
   * Fix Build-Depends.
   * Update Standards-Version: 3.9.2.
   * Implement get-orig-source and drop javadoc from orig-tarball.
+  * Switch to javahelper.
+  * Drop versioned binary package.
 
- -- Torsten Werner <[email protected]>  Sun, 04 Sep 2011 01:17:21 +0200
+ -- Torsten Werner <[email protected]>  Sun, 04 Sep 2011 01:23:11 +0200
 
 libiscwt-java (5.2.20091102-2) unstable; urgency=low
 

Added: trunk/libiscwt-java/debian/compat
===================================================================
--- trunk/libiscwt-java/debian/compat                           (rev 0)
+++ trunk/libiscwt-java/debian/compat   2011-09-03 23:27:44 UTC (rev 14709)
@@ -0,0 +1 @@
+7

Modified: trunk/libiscwt-java/debian/control
===================================================================
--- trunk/libiscwt-java/debian/control  2011-09-03 23:21:43 UTC (rev 14708)
+++ trunk/libiscwt-java/debian/control  2011-09-03 23:27:44 UTC (rev 14709)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: Steffen Moeller <[email protected]>
-Build-Depends: debhelper (>= 7), default-jdk, cdbs, libswt-gtk-3-java, 
libisrt-java, libisfreetype-java
+Build-Depends: debhelper (>= 7), default-jdk, libswt-gtk-3-java, libisrt-java, 
libisfreetype-java, javahelper (>= 0.37)
 Standards-Version: 3.9.2
 Homepage: http://opensource.intarsys.de/home/en/index.php?n=OpenSource.IsCWT
 Vcs-svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libiscwt-java/
@@ -11,7 +11,8 @@
 
 Package: libiscwt-java
 Architecture: all
-Depends: ${misc:Depends}, libiscwt-5.2-java
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: abstractions and Java implementations for rendering PDF
  To built a flexible PDF rendering one first needed some basics
  functionality to deal with fonts, images and general platform
@@ -23,21 +24,10 @@
  This package always installs the latest version of the isCWT library.
  It only offers a symbolic link to the respective jar file.
 
-Package: libiscwt-5.2-java
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: default-jre-headless
-Description: abstractions and Java implementations for rendering PDF
- To built a flexible PDF rendering one first needed some basics
- functionality to deal with fonts, images and general platform
- abstractions. The result is isCWT. It contains all abstraction and
- implementations needed for rendering PDF that are not related to PDF
- itself.  This library is built and used primarily for jPod Renderer,
- so one is likely to miss some features when using it in another context.
-
 Package: libiscwt-java-doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
 Section: doc
 Description: Javadoc API description for isCWT
  Autogenerated from the Java source code, this package offers

Added: trunk/libiscwt-java/debian/javabuild
===================================================================
--- trunk/libiscwt-java/debian/javabuild                                (rev 0)
+++ trunk/libiscwt-java/debian/javabuild        2011-09-03 23:27:44 UTC (rev 
14709)
@@ -0,0 +1 @@
+libiscwt.jar src

Deleted: trunk/libiscwt-java/debian/libiscwt-5.2-java.dirs
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-5.2-java.dirs   2011-09-03 23:21:43 UTC 
(rev 14708)
+++ trunk/libiscwt-java/debian/libiscwt-5.2-java.dirs   2011-09-03 23:27:44 UTC 
(rev 14709)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/libiscwt-java/debian/libiscwt-java-doc.TODO
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-java-doc.TODO   2011-09-03 23:21:43 UTC 
(rev 14708)
+++ trunk/libiscwt-java/debian/libiscwt-java-doc.TODO   2011-09-03 23:27:44 UTC 
(rev 14709)
@@ -1 +0,0 @@
-* rename javadoc to api - somehow

Deleted: trunk/libiscwt-java/debian/libiscwt-java-doc.doc-base
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-java-doc.doc-base       2011-09-03 
23:21:43 UTC (rev 14708)
+++ trunk/libiscwt-java/debian/libiscwt-java-doc.doc-base       2011-09-03 
23:27:44 UTC (rev 14709)
@@ -1,10 +0,0 @@
-Document: libiscwt-java
-Title: Javadoc generated API
-Author: authors of code
-Abstract: This manual describes what libiscwt-java is
- and how it can be used to render PDF files.
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libiscwt-java-doc/javadoc/index.html
-Files: /usr/share/doc/libiscwt-java-doc/javadoc/*.html

Deleted: trunk/libiscwt-java/debian/libiscwt-java-doc.docs
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-java-doc.docs   2011-09-03 23:21:43 UTC 
(rev 14708)
+++ trunk/libiscwt-java/debian/libiscwt-java-doc.docs   2011-09-03 23:27:44 UTC 
(rev 14709)
@@ -1 +0,0 @@
-javadoc

Added: trunk/libiscwt-java/debian/libiscwt-java-doc.javadoc
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-java-doc.javadoc                        
        (rev 0)
+++ trunk/libiscwt-java/debian/libiscwt-java-doc.javadoc        2011-09-03 
23:27:44 UTC (rev 14709)
@@ -0,0 +1 @@
+internal

Deleted: trunk/libiscwt-java/debian/libiscwt-java.dirs
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-java.dirs       2011-09-03 23:21:43 UTC 
(rev 14708)
+++ trunk/libiscwt-java/debian/libiscwt-java.dirs       2011-09-03 23:27:44 UTC 
(rev 14709)
@@ -1 +0,0 @@
-usr/share/java/

Added: trunk/libiscwt-java/debian/libiscwt-java.jlibs
===================================================================
--- trunk/libiscwt-java/debian/libiscwt-java.jlibs                              
(rev 0)
+++ trunk/libiscwt-java/debian/libiscwt-java.jlibs      2011-09-03 23:27:44 UTC 
(rev 14709)
@@ -0,0 +1 @@
+libiscwt.jar

Modified: trunk/libiscwt-java/debian/rules
===================================================================
--- trunk/libiscwt-java/debian/rules    2011-09-03 23:21:43 UTC (rev 14708)
+++ trunk/libiscwt-java/debian/rules    2011-09-03 23:27:44 UTC (rev 14709)
@@ -1,30 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+export JAVA_HOME=/usr/lib/jvm/default-java
 
-CLASSPATH=/usr/share/java/isnativec.jar:/usr/share/java/isfreetype.jar:/usr/share/java/isrt.jar:rt.jar:/usr/share/java/swt-gtk-3.7.jar
+export 
CLASSPATH=/usr/share/java/isnativec.jar:/usr/share/java/isfreetype.jar:/usr/share/java/isrt.jar:rt.jar:/usr/share/java/swt-gtk-3.7.jar
 
-DEB_UPSTREAM_VERSION_2=$(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
+%:
+       dh --with javahelper $@
 
-build/libiscwt-$(DEB_UPSTREAM_VERSION_2)-java::
-       #cd src && javac -Xlint:unchecked `find . -name "*.java"`
-       cd src && javac -cp "$(CLASSPATH)" `find . -name "*.java"`
-
-install/libiscwt-$(DEB_UPSTREAM_VERSION_2)-java::
-       cd src && jar cf \
-                   
$(CURDIR)/debian/libiscwt-$(DEB_UPSTREAM_VERSION_2)-java/usr/share/java/iscwt-$(DEB_UPSTREAM_VERSION).jar
 \
-                   `find . -name "*.class"`
-       cd 
$(CURDIR)/debian/libiscwt-$(DEB_UPSTREAM_VERSION_2)-java/usr/share/java/ && \
-               ln -s iscwt-$(DEB_UPSTREAM_VERSION).jar 
iscwt-$(DEB_UPSTREAM_VERSION_2).jar
-
-build/libiscwt-java::
-
-install/libiscwt-java::
-       cd $(CURDIR)/debian/libiscwt-java/usr/share/java/ && ln -s 
iscwt-$(DEB_UPSTREAM_VERSION).jar iscwt.jar
-
-clean::
-       find src -name "*.class" | xargs -r rm
-
 get-orig-source:
        uscan --force-download


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to