[pkg-java] r5185 - in trunk/libfonts-java/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Thu Dec 27 23:10:39 UTC 2007 

Author: mkoch
Date: 2007-12-27 23:10:39 +0000 (Thu, 27 Dec 2007)
New Revision: 5185

Added:
   trunk/libfonts-java/debian/libfonts-java-doc.doc-base
   trunk/libfonts-java/debian/libfonts-java-doc.docs
   trunk/libfonts-java/debian/patches/jarnames.diff
   trunk/libfonts-java/debian/patches/libdir.diff
   trunk/libfonts-java/debian/patches/target-source-1.3.diff
Removed:
   trunk/libfonts-java/debian/README.Debian-source
   trunk/libfonts-java/debian/ant.properties
   trunk/libfonts-java/debian/doc-base
   trunk/libfonts-java/debian/patches/00_BuildXml.patch
Modified:
   trunk/libfonts-java/debian/
   trunk/libfonts-java/debian/changelog
   trunk/libfonts-java/debian/compat
   trunk/libfonts-java/debian/control
   trunk/libfonts-java/debian/docs
   trunk/libfonts-java/debian/patches/
   trunk/libfonts-java/debian/rules
   trunk/libfonts-java/debian/watch
Log:
libfonts-java (0.2.6-2) unstable; urgency=low

  [ Kumar Appaiah ]
  * debian/control:
    + Add XS-Vcs-Svn and XS-Vcs-Browser.
    + Add Homepage field.
  * Updated watch file to use uscan SourceForge alias.

  [ Michael Koch ]
  * Updated Standards-Version to 3.7.3.
  * Renamed XS-Vcs-* fields to Vcs-*.
  * Added myself to Uploaders and removed Wolfgang.
  * Updated Build-Depends on debhelper to require version > 5.

 -- Michael Koch <konqueror at gmx.de>  Fri, 28 Dec 2007 00:11:37 +0100

libfonts-java (0.2.6-1) unstable; urgency=low

  * New upstream release
  * add myself to Uploaders:
  * (build)depend on libjcommon-java (>= 1.0.10-1) and libloader-java
  * Build-Depends-Indep -> Build-Depends:
  * split javadoc out into an own package
  * move to debhelper compat 5
  * add debian/watch
  * use DEB_UPSTREAM_VERSION

 -- Rene Engelhard <rene at debian.org>  Fri, 12 Oct 2007 23:19:37 +0200




Property changes on: trunk/libfonts-java/debian
___________________________________________________________________
Name: svn:ignore
   + files
libfonts-java
libfonts-java-doc
stamp-*
*.debhelper


Deleted: trunk/libfonts-java/debian/README.Debian-source
===================================================================
--- trunk/libfonts-java/debian/README.Debian-source	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/README.Debian-source	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,9 +0,0 @@
-libfonts-java
--------------
-
-Upstream does not provide source only tarballs. Therefore the following
-actions were taken to produce the orig.tar.gz:
-
-- rm *.jar
-
- -- Wolfgang Baer <WBaer at gmx.de>  Thu, 02 Feb 2006 15:48:42 +0100 

Deleted: trunk/libfonts-java/debian/ant.properties
===================================================================
--- trunk/libfonts-java/debian/ant.properties	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/ant.properties	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,2 +0,0 @@
-build.target=1.3
-build.debug=true

Modified: trunk/libfonts-java/debian/changelog
===================================================================
--- trunk/libfonts-java/debian/changelog	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/changelog	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,12 +1,32 @@
-libfonts-java (0.1.4-2) UNRELEASED; urgency=low
+libfonts-java (0.2.6-2) unstable; urgency=low
 
+  [ Kumar Appaiah ]
   * debian/control:
     + Add XS-Vcs-Svn and XS-Vcs-Browser.
     + Add Homepage field.
-  * Add watch file.
-  
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 20 Sep 2007 20:58:31 +0530
+  * Updated watch file to use uscan SourceForge alias.
 
+  [ Michael Koch ]
+  * Updated Standards-Version to 3.7.3.
+  * Renamed XS-Vcs-* fields to Vcs-*.
+  * Added myself to Uploaders and removed Wolfgang.
+  * Updated Build-Depends on debhelper to require version > 5.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 28 Dec 2007 00:11:37 +0100
+
+libfonts-java (0.2.6-1) unstable; urgency=low
+
+  * New upstream release
+  * add myself to Uploaders:
+  * (build)depend on libjcommon-java (>= 1.0.10-1) and libloader-java
+  * Build-Depends-Indep -> Build-Depends:
+  * split javadoc out into an own package
+  * move to debhelper compat 5
+  * add debian/watch
+  * use DEB_UPSTREAM_VERSION
+
+ -- Rene Engelhard <rene at debian.org>  Fri, 12 Oct 2007 23:19:37 +0200
+
 libfonts-java (0.1.4-1) unstable; urgency=low
 
   * Initial release

Modified: trunk/libfonts-java/debian/compat
===================================================================
--- trunk/libfonts-java/debian/compat	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/compat	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1 +1 @@
-4 
+5 

Modified: trunk/libfonts-java/debian/control
===================================================================
--- trunk/libfonts-java/debian/control	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/control	2007-12-27 23:10:39 UTC (rev 5185)
@@ -2,17 +2,27 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.0-1)
-Standards-Version: 3.6.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfonts-java
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libfonts-java
+Uploaders: Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs, java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.10-1), libloader-java
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfonts-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libfonts-java
 Homepage: http://jfreereport.sourceforge.net/
 
 Package: libfonts-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libjcommon-java (>= 1.0.0-1)
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libjcommon-java (>= 1.0.10-1), libloader-java
+Suggests: libfonts-java-doc
 Description: Java fonts layouting library
  LibFonts is a library developed to support advanced layouting and allows to 
  read TrueType-Font files to extract layouting specific informations.
+
+Package: libfonts-java-doc
+Section: doc
+Architecture: all
+Description: Java fonts layouting library -- documentation
+ LibFonts is a library developed to support advanced layouting and allows to 
+ read TrueType-Font files to extract layouting specific informations.
+ .
+ This package contains the Javadoc.

Deleted: trunk/libfonts-java/debian/doc-base
===================================================================
--- trunk/libfonts-java/debian/doc-base	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/doc-base	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,11 +0,0 @@
-Document: libfonts-java
-Title: Programmer API for JFreeChart
-Author: Thomas Morgner, David Gilbert and others
-Abstract: This is the programmer API of libfonts a library developed to 
- support advanced layouting and allows to read TrueType-Font files to 
- extract layouting specific informations.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libfonts-java/javadoc/index.html
-Files: /usr/share/doc/libfonts-java/javadoc/*.html

Modified: trunk/libfonts-java/debian/docs
===================================================================
--- trunk/libfonts-java/debian/docs	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/docs	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,2 +1 @@
-javadoc
 README

Added: trunk/libfonts-java/debian/libfonts-java-doc.doc-base
===================================================================
--- trunk/libfonts-java/debian/libfonts-java-doc.doc-base	                        (rev 0)
+++ trunk/libfonts-java/debian/libfonts-java-doc.doc-base	2007-12-27 23:10:39 UTC (rev 5185)
@@ -0,0 +1,11 @@
+Document: libfonts-java
+Title: Programmer API for JFreeChart
+Author: Thomas Morgner, David Gilbert and others
+Abstract: This is the programmer API of libfonts a library developed to 
+ support advanced layouting and allows to read TrueType-Font files to 
+ extract layouting specific informations.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libfonts-java-doc/index.html
+Files: /usr/share/doc/libfonts-java-doc/*.html

Added: trunk/libfonts-java/debian/libfonts-java-doc.docs
===================================================================
--- trunk/libfonts-java/debian/libfonts-java-doc.docs	                        (rev 0)
+++ trunk/libfonts-java/debian/libfonts-java-doc.docs	2007-12-27 23:10:39 UTC (rev 5185)
@@ -0,0 +1 @@
+javadoc/*


Property changes on: trunk/libfonts-java/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Deleted: trunk/libfonts-java/debian/patches/00_BuildXml.patch
===================================================================
--- trunk/libfonts-java/debian/patches/00_BuildXml.patch	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/patches/00_BuildXml.patch	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,13 +0,0 @@
---- ant/build.xml.orig	2006-02-02 21:28:26.000000000 +0100
-+++ ant/build.xml	2006-02-02 21:28:13.000000000 +0100
-@@ -67,9 +67,7 @@
-     <delete dir="javadoc"/>
-     <mkdir dir="javadoc"/>
-     <javadoc destdir="javadoc"
--      windowtitle="LibFonts Class Library (version ${libfonts.version})"
--      overview="source/overview.html"
--      linksource="true">
-+      windowtitle="LibFonts Class Library (version ${libfonts.version})">
-       <classpath refid="build.classpath"/>
-       <packageset dir="source" defaultexcludes="yes">
-         <include name="org/jfree/fonts"/>

Added: trunk/libfonts-java/debian/patches/jarnames.diff
===================================================================
--- trunk/libfonts-java/debian/patches/jarnames.diff	                        (rev 0)
+++ trunk/libfonts-java/debian/patches/jarnames.diff	2007-12-27 23:10:39 UTC (rev 5185)
@@ -0,0 +1,13 @@
+--- ant/build.properties-old	2007-08-21 01:02:49.000000000 +0200
++++ ant/build.properties	2007-08-21 01:03:11.000000000 +0200
+@@ -38,8 +38,8 @@
+ # Used by: core libraries
+ 
+ # Used by: module-misc-beanshell
+-jcommon-jar-file=jcommon-1.0.10.jar
+-libloader-jar-file=libloader-0.3.4.jar
++jcommon-jar-file=jcommon.jar
++libloader-jar-file=libloader.jar
+ 
+ ##############################################################
+ #

Added: trunk/libfonts-java/debian/patches/libdir.diff
===================================================================
--- trunk/libfonts-java/debian/patches/libdir.diff	                        (rev 0)
+++ trunk/libfonts-java/debian/patches/libdir.diff	2007-12-27 23:10:39 UTC (rev 5185)
@@ -0,0 +1,13 @@
+--- ant/build.properties-old	2007-08-21 01:01:59.000000000 +0200
++++ ant/build.properties	2007-08-21 01:02:22.000000000 +0200
+@@ -21,8 +21,8 @@
+ # All path settings are relative to the project root directory
+ # (..)
+ #
+-libdir=lib
+-junit-dir=lib
++libdir=/usr/share/java
++junit-dir=/usr/share/java
+ 
+ #
+ # If you specify a non-empty string, then dont forget the

Added: trunk/libfonts-java/debian/patches/target-source-1.3.diff
===================================================================
--- trunk/libfonts-java/debian/patches/target-source-1.3.diff	                        (rev 0)
+++ trunk/libfonts-java/debian/patches/target-source-1.3.diff	2007-12-27 23:10:39 UTC (rev 5185)
@@ -0,0 +1,13 @@
+--- ant/build.properties-old	2007-08-27 23:48:54.000000000 +0200
++++ ant/build.properties	2007-08-27 23:49:06.000000000 +0200
+@@ -14,8 +14,8 @@
+ 
+ #
+ # Make sure that JDK 1.2 compatible class files are generated
+-build.target=1.2
+-build.source=1.2
++build.target=1.3
++build.source=1.3
+ 
+ #
+ # All path settings are relative to the project root directory

Modified: trunk/libfonts-java/debian/rules
===================================================================
--- trunk/libfonts-java/debian/rules	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/rules	2007-12-27 23:10:39 UTC (rev 5185)
@@ -8,17 +8,18 @@
 JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon libloader
 DEB_ANT_BUILDFILE := ant/build.xml
 DEB_ANT_BUILD_TARGET := compile javadoc
 
-VERSION := 0.1.4
-
 clean::
 	-rm -rf build
 	-rm -rf javadoc
-	-rm -f libfonts-$(VERSION).jar
+	-rm -f libfonts-$(DEB_UPSTREAM_VERSION).jar
+	# don't use them, go sure
+	-rm -f lib/* lib/optional/*
 
 install/libfonts-java::
-	install -m 644 libfonts-$(VERSION).jar debian/libfonts-java/usr/share/java/libfonts-$(VERSION).jar
-	ln -s libfonts-$(VERSION).jar debian/libfonts-java/usr/share/java/libfonts.jar
+	install -m 644 libfonts-$(DEB_UPSTREAM_VERSION).jar debian/libfonts-java/usr/share/java/libfonts-$(DEB_UPSTREAM_VERSION).jar
+	ln -s libfonts-$(DEB_UPSTREAM_VERSION).jar debian/libfonts-java/usr/share/java/libfonts.jar
+

Modified: trunk/libfonts-java/debian/watch
===================================================================
--- trunk/libfonts-java/debian/watch	2007-12-27 22:54:30 UTC (rev 5184)
+++ trunk/libfonts-java/debian/watch	2007-12-27 23:10:39 UTC (rev 5185)
@@ -1,2 +1,2 @@
 version=3
-http://heanet.dl.sourceforge.net/sourceforge/jfreereport/libfonts-([\d\.]+).tar.gz debian uupdate
+http://sf.net/jfreereport/libfonts-(.+)\.tar\.gz debian uupdate

More information about the pkg-java-commits mailing list