[pkg-java] r14629 - in trunk/libisrt-java/debian: . source

Torsten Werner twerner at alioth.debian.org
Wed Aug 31 15:28:58 UTC 2011


Author: twerner
Date: 2011-08-31 15:28:57 +0000 (Wed, 31 Aug 2011)
New Revision: 14629

Added:
   trunk/libisrt-java/debian/compat
   trunk/libisrt-java/debian/javabuild
   trunk/libisrt-java/debian/libisrt-java-doc.javadoc
   trunk/libisrt-java/debian/libisrt-java.jlibs
   trunk/libisrt-java/debian/orig-tar.sh
   trunk/libisrt-java/debian/source/
   trunk/libisrt-java/debian/source/format
Removed:
   trunk/libisrt-java/debian/libisrt-4.7-java.dirs
   trunk/libisrt-java/debian/libisrt-4.7-java.docs
   trunk/libisrt-java/debian/libisrt-java-doc.doc-base
   trunk/libisrt-java/debian/libisrt-java-doc.docs
   trunk/libisrt-java/debian/libisrt-java.dirs
Modified:
   trunk/libisrt-java/debian/
   trunk/libisrt-java/debian/changelog
   trunk/libisrt-java/debian/control
   trunk/libisrt-java/debian/rules
   trunk/libisrt-java/debian/watch
Log:
UNRELEASED
* Team upload
* New upstream release
* Improve downloading / creating the orig tarball. Remove javadoc files.
* Switch to javahelper.
* Drop versioned package libisrt-4.7-java.
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.


Property changes on: trunk/libisrt-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/libisrt-java/debian/changelog
===================================================================
--- trunk/libisrt-java/debian/changelog	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/changelog	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1,3 +1,17 @@
+libisrt-java (4.8.20100629-1) unstable; urgency=low
+
+  UNRELEASED
+  * Team upload
+  * New upstream release
+  * Improve downloading / creating the orig tarball. Remove javadoc files.
+  * Switch to javahelper.
+  * Drop versioned package libisrt-4.7-java.
+  * Switch to debhelper level 7.
+  * Update Standards-Version: 3.9.1.
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 31 Aug 2011 17:16:54 +0200
+
 libisrt-java (4.7.20091102-1) unstable; urgency=low
 
   * Initial release (Closes: #568598).

Added: trunk/libisrt-java/debian/compat
===================================================================
--- trunk/libisrt-java/debian/compat	                        (rev 0)
+++ trunk/libisrt-java/debian/compat	2011-08-31 15:28:57 UTC (rev 14629)
@@ -0,0 +1 @@
+7

Modified: trunk/libisrt-java/debian/control
===================================================================
--- trunk/libisrt-java/debian/control	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/control	2011-08-31 15:28:57 UTC (rev 14629)
@@ -3,13 +3,14 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 7), default-jdk-builddep, cdbs, libjna-java
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), default-jdk, cdbs, libjna-java, javahelper (>= 0.37)
+Standards-Version: 3.9.1
 Homepage: http://opensource.intarsys.de/home/en/index.php?n=OpenSource.IsRuntime
 
 Package: libisrt-java
 Architecture: all
-Depends: ${misc:Depends}, libisrt-4.7-java
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: isRuntime library of intarsys
  Ths isRuntime library collects a series of routines common to the isCWT
  and the jPod Java libraries of the intarsys PDF management software.
@@ -17,19 +18,12 @@
  This package always installs the latest version of the isCWT library.
  It only offers a symbolic link to the respective jar file.
 
-
-Package: libisrt-4.7-java
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: default-jre-headless
-Description: isRuntime library of intarsys
- Ths isRuntime library collects a series of routines common to the isCWT
- and the jPod Java libraries of the intarsys PDF management software.
-
 Package: libisrt-java-doc
 Section: doc
-Depends: ${misc:Depends}
 Architecture: all
-Description: Javadoc API description for isRuntime
- Autogenerated from the Java source code, this package offers
- the HTML files describing the library for programmers.
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Short Description - doc
+ Long Description
+ .
+ This package contains the Javadoc API

Added: trunk/libisrt-java/debian/javabuild
===================================================================
--- trunk/libisrt-java/debian/javabuild	                        (rev 0)
+++ trunk/libisrt-java/debian/javabuild	2011-08-31 15:28:57 UTC (rev 14629)
@@ -0,0 +1 @@
+isrt.jar src

Deleted: trunk/libisrt-java/debian/libisrt-4.7-java.dirs
===================================================================
--- trunk/libisrt-java/debian/libisrt-4.7-java.dirs	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/libisrt-4.7-java.dirs	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/libisrt-java/debian/libisrt-4.7-java.docs
===================================================================
--- trunk/libisrt-java/debian/libisrt-4.7-java.docs	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/libisrt-4.7-java.docs	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1,2 +0,0 @@
-debian/README.Debian
-debian/README.source

Deleted: trunk/libisrt-java/debian/libisrt-java-doc.doc-base
===================================================================
--- trunk/libisrt-java/debian/libisrt-java-doc.doc-base	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/libisrt-java-doc.doc-base	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1,11 +0,0 @@
-Document: libisrt-java
-Title: Javadoc generated API
-Author: authors of code
-Abstract: This auto-generated manual describes
- the functionality of the Java routines offered
- in this library.
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libisrt-java-doc/javadoc/index.html
-Files: /usr/share/doc/libisrt-java-doc/javadoc/*.html /usr/share/doc/libisrt-java-doc/javadoc/*/*.html /usr/share/doc/libisrt-java-doc/javadoc/*/*/*/*/*.html

Deleted: trunk/libisrt-java/debian/libisrt-java-doc.docs
===================================================================
--- trunk/libisrt-java/debian/libisrt-java-doc.docs	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/libisrt-java-doc.docs	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1 +0,0 @@
-javadoc

Added: trunk/libisrt-java/debian/libisrt-java-doc.javadoc
===================================================================
--- trunk/libisrt-java/debian/libisrt-java-doc.javadoc	                        (rev 0)
+++ trunk/libisrt-java/debian/libisrt-java-doc.javadoc	2011-08-31 15:28:57 UTC (rev 14629)
@@ -0,0 +1 @@
+internal

Deleted: trunk/libisrt-java/debian/libisrt-java.dirs
===================================================================
--- trunk/libisrt-java/debian/libisrt-java.dirs	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/libisrt-java.dirs	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1 +0,0 @@
-usr/share/java

Added: trunk/libisrt-java/debian/libisrt-java.jlibs
===================================================================
--- trunk/libisrt-java/debian/libisrt-java.jlibs	                        (rev 0)
+++ trunk/libisrt-java/debian/libisrt-java.jlibs	2011-08-31 15:28:57 UTC (rev 14629)
@@ -0,0 +1 @@
+isrt.jar

Added: trunk/libisrt-java/debian/orig-tar.sh
===================================================================
--- trunk/libisrt-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libisrt-java/debian/orig-tar.sh	2011-08-31 15:28:57 UTC (rev 14629)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+ZIP=$3
+TAR=../libisrt-java_$VERSION.orig.tar.gz
+DIR=libisrt-java-$VERSION
+
+unzip $ZIP
+mv distribution $DIR
+tar -c -z -f $TAR --exclude '*.jar' --exclude '*/javadoc/*' $DIR
+rm -rf $DIR $ZIP
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/libisrt-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/libisrt-java/debian/rules
===================================================================
--- trunk/libisrt-java/debian/rules	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/rules	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1,24 +1,14 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+export JAVA_HOME=/usr/lib/jvm/default-java
 
-CLASSPATH=
+# Put depended upon jars in here
+# export CLASSPATH=
 
-DEB_UPSTREAM_VERSION_2=$(shell echo $(DEB_UPSTREAM_VERSION)|cut -f1,2 -d.)
+%:
+	dh --with javahelper $@
 
-build/libisrt-$(DEB_UPSTREAM_VERSION_2)-java::
-	cd src && javac `find . -name "*.java"`
+VERSION := $(shell dpkg-parsechangelog | awk -F'[ -]' '/^Version: /{print $2}')
 
-install/libisrt-$(DEB_UPSTREAM_VERSION_2)-java::
-	cd src && jar cf $(CURDIR)/debian/libisrt-$(DEB_UPSTREAM_VERSION_2)-java/usr/share/java/isrt-$(DEB_UPSTREAM_VERSION).jar `find . -name "*.class"`
-	cd $(CURDIR)/debian/libisrt-$(DEB_UPSTREAM_VERSION_2)-java/usr/share/java/ && ln -s isrt-$(DEB_UPSTREAM_VERSION).jar isrt-$(DEB_UPSTREAM_VERSION_2).jar
-
-build/libisrt-java::
-
-install/libisrt-java::
-	cd $(CURDIR)/debian/libisrt-java/usr/share/java/ && ln -s isrt-$(DEB_UPSTREAM_VERSION).jar isrt.jar
-
-clean::
-	find src -name "*.class" | xargs -r rm
-
+get-orig-source:
+	uscan --download-version $(VERSION) --force-download

Added: trunk/libisrt-java/debian/source/format
===================================================================
--- trunk/libisrt-java/debian/source/format	                        (rev 0)
+++ trunk/libisrt-java/debian/source/format	2011-08-31 15:28:57 UTC (rev 14629)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/libisrt-java/debian/watch
===================================================================
--- trunk/libisrt-java/debian/watch	2011-08-31 14:06:08 UTC (rev 14628)
+++ trunk/libisrt-java/debian/watch	2011-08-31 15:28:57 UTC (rev 14629)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/jpodlib/isrt\.(.*)\.zip
+http://sf.net/jpodlib/isrt\.(.*)\.zip debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list