Author: wbaer-guest
Date: 2006-03-12 11:29:29 +0000 (Sun, 12 Mar 2006)
New Revision: 1991
Added:
trunk/libpixie-java/debian/README.Debian-source
trunk/libpixie-java/debian/ant.properties
trunk/libpixie-java/debian/compat
trunk/libpixie-java/debian/dirs
trunk/libpixie-java/debian/docs
trunk/libpixie-java/debian/patches/
trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch
Removed:
trunk/libpixie-java/debian/README.Debian
trunk/libpixie-java/debian/libpixie-java.dirs
trunk/libpixie-java/debian/libpixie-java.docs
trunk/libpixie-java/debian_patch
Modified:
trunk/libpixie-java/debian/changelog
trunk/libpixie-java/debian/control
trunk/libpixie-java/debian/copyright
trunk/libpixie-java/debian/rules
Log:
* New upstream release
* Added epoch as previous releases used dates
* Build-depends and depends on libjcommon-java (>= 1.0.0-1)
* Convert build system to cdbs - added build-dependency
* Move package to pkg-java-maintainers for comaintenance,
added Christian Bayle and myself as uploaders
* Although build with free tools its not yet completely usable with free
tools alone (needs Java2D) - therefore it stays in contrib for now.
* Updated copyright
* Added ant.properties to specify build target and jar name
* Added README.Debian-source how the upstream tarball was cleaned
* Added patch to remove bogus manifest classpath from jar
* Added compat file (level 4)
* Updated description based on README file
* Standards-Version 3.6.2 (no changes)
Deleted: trunk/libpixie-java/debian/README.Debian
===================================================================
--- trunk/libpixie-java/debian/README.Debian 2006-03-09 22:58:59 UTC (rev
1990)
+++ trunk/libpixie-java/debian/README.Debian 2006-03-12 11:29:29 UTC (rev
1991)
@@ -1,6 +0,0 @@
-libpixie-java for Debian
-------------------------
-
-See upstream README included
-
- -- Christian Bayle <[EMAIL PROTECTED]>, Sun, 6 Jul 2003 20:45:53 +0200
Added: trunk/libpixie-java/debian/README.Debian-source
===================================================================
--- trunk/libpixie-java/debian/README.Debian-source 2006-03-09 22:58:59 UTC
(rev 1990)
+++ trunk/libpixie-java/debian/README.Debian-source 2006-03-12 11:29:29 UTC
(rev 1991)
@@ -0,0 +1,10 @@
+libpixie-java
+-------------
+
+Upstream does not provide source only tarballs. Therefore the following
+actions were taken to produce the orig.tar.gz:
+
+- rm lib/*
+- rm *.jar
+
+ -- Wolfgang Baer <[EMAIL PROTECTED]> Thu, 02 Feb 2006 15:48:42 +0100
Added: trunk/libpixie-java/debian/ant.properties
===================================================================
--- trunk/libpixie-java/debian/ant.properties 2006-03-09 22:58:59 UTC (rev
1990)
+++ trunk/libpixie-java/debian/ant.properties 2006-03-12 11:29:29 UTC (rev
1991)
@@ -0,0 +1,3 @@
+build.target=1.3
+build.debug=true
+pixie-jar-file=pixie.jar
Modified: trunk/libpixie-java/debian/changelog
===================================================================
--- trunk/libpixie-java/debian/changelog 2006-03-09 22:58:59 UTC (rev
1990)
+++ trunk/libpixie-java/debian/changelog 2006-03-12 11:29:29 UTC (rev
1991)
@@ -1,3 +1,23 @@
+libpixie-java (1:0.8.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Added epoch as previous releases used dates
+ * Build-depends and depends on libjcommon-java (>= 1.0.0-1)
+ * Convert build system to cdbs - added build-dependency
+ * Move package to pkg-java-maintainers for comaintenance,
+ added Christian Bayle and myself as uploaders
+ * Although build with free tools its not yet completely usable with free
+ tools alone (needs Java2D) - therefore it stays in contrib for now.
+ * Updated copyright
+ * Added ant.properties to specify build target and jar name
+ * Added README.Debian-source how the upstream tarball was cleaned
+ * Added patch to remove bogus manifest classpath from jar
+ * Added compat file (level 4)
+ * Updated description based on README file
+ * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <[EMAIL PROTECTED]> Thu, 02 Feb 2006 15:48:42 +0100
+
libpixie-java (20030705-4) unstable; urgency=high
* Fixed FTBFS: ./debian_patch: Permission denied (Closes: #306749)
Added: trunk/libpixie-java/debian/compat
===================================================================
--- trunk/libpixie-java/debian/compat 2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian/compat 2006-03-12 11:29:29 UTC (rev 1991)
@@ -0,0 +1 @@
+4
Modified: trunk/libpixie-java/debian/control
===================================================================
--- trunk/libpixie-java/debian/control 2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian/control 2006-03-12 11:29:29 UTC (rev 1991)
@@ -1,21 +1,20 @@
Source: libpixie-java
Section: contrib/libs
Priority: optional
-Maintainer: Christian Bayle <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.4, ant, libjcommon-java
-Standards-Version: 3.5.8
+Maintainer: Debian Java Maintainers
<[email protected]>
+Uploaders: Christian Bayle <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL
PROTECTED]>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, ant,
libjcommon-java (>= 1.0.0-1)
+Standards-Version: 3.6.2
Package: libpixie-java
Section: contrib/libs
Architecture: all
-Depends: j2re1.4 | java2-runtime, libjcommon-java
+Depends: j2re1.4 | java2-runtime, libjcommon-java (>= 1.0.0-1)
Description: Java Vector Format Viewer Library
- Pixie is an applet which displays images in a vector format.
- The vector format, being scalable, can work out much smaller
- than conventional bitmap formats for some images.
- The viewer applet is very small; only 6k, and the format
- is also very compact (much smaller than Windows metafiles
- or any text-based format).
- This code is used in a modified version by jfreereport from jfree.org
- The code depends on Sun Swing Implementation an Javadoc
-
+ Pixie is a WMF-File reading library originally written as converter for the
+ Pixie-ImageViewer. Pixie was long time dead and is now resurrected as
+ WMF-Reader and ImageProducer for Java 1.2.2 or higher.
+ .
+ Pixie lacks the support for most BitMap-Formats but everything else is
+ working fine. Write-Support will be implemented somewhere in the future,
+ classes for the writesupport are mostly dummies at the moment.
Modified: trunk/libpixie-java/debian/copyright
===================================================================
--- trunk/libpixie-java/debian/copyright 2006-03-09 22:58:59 UTC (rev
1990)
+++ trunk/libpixie-java/debian/copyright 2006-03-12 11:29:29 UTC (rev
1991)
@@ -1,22 +1,16 @@
-This package was debianized by Christian Bayle <[EMAIL PROTECTED]>, Sun, 6
Jul 2003 20:45:53 +0200
+This package was debianized by Christian Bayle <[EMAIL PROTECTED]>,
+Sun, 6 Jul 2003 20:45:53 +0200
It was downloaded from http://sourceforge.net/projects/jfreereport/
-Upstream Authors: Originally Dave Harris <[EMAIL PROTECTED]>
+Upstream Author: Originally Dave Harris <[EMAIL PROTECTED]>
-I couldn't find any reference in original code but found this
-http://www.jars.com/classes/jresout.cgi?resource=3452 referencing
-Dave Harris as a submitter.
-The description was taken from this place
-Code is also referenced at http://www.gnu.org/software/java/packages.html
-It was formaly available at http://www.bhresearch.co.uk/Java/Pixie/
-bhresearch.co.uk DNS Domain is DETAGGED and not available when i write these
lines
+For a further history see included README file.
-Code is now included and maintained in jfreechart CVS
-Pixie moved from package gnu.bhresearch.pixie to the package org.jfree.pixie
-
Copyright:
+ 2000-2005, by Object Refinery Limited and Contributors.
+
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -27,10 +21,5 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
-
Added: trunk/libpixie-java/debian/dirs
===================================================================
--- trunk/libpixie-java/debian/dirs 2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian/dirs 2006-03-12 11:29:29 UTC (rev 1991)
@@ -0,0 +1 @@
+usr/share/java
Added: trunk/libpixie-java/debian/docs
===================================================================
--- trunk/libpixie-java/debian/docs 2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian/docs 2006-03-12 11:29:29 UTC (rev 1991)
@@ -0,0 +1,2 @@
+javadoc
+README
Deleted: trunk/libpixie-java/debian/libpixie-java.dirs
===================================================================
--- trunk/libpixie-java/debian/libpixie-java.dirs 2006-03-09 22:58:59 UTC
(rev 1990)
+++ trunk/libpixie-java/debian/libpixie-java.dirs 2006-03-12 11:29:29 UTC
(rev 1991)
@@ -1 +0,0 @@
-/usr/share/java
Deleted: trunk/libpixie-java/debian/libpixie-java.docs
===================================================================
--- trunk/libpixie-java/debian/libpixie-java.docs 2006-03-09 22:58:59 UTC
(rev 1990)
+++ trunk/libpixie-java/debian/libpixie-java.docs 2006-03-12 11:29:29 UTC
(rev 1991)
@@ -1,2 +0,0 @@
-pixie-0.8.0/javadoc
-pixie-0.8.0/README
Added: trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch
===================================================================
--- trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch
2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch
2006-03-12 11:29:29 UTC (rev 1991)
@@ -0,0 +1,14 @@
+--- ant/build.xml.orig 2006-02-02 17:03:41.000000000 +0100
++++ ant/build.xml 2006-02-02 19:32:34.000000000 +0100
+@@ -54,10 +54,7 @@
+
+ <!-- make the jar -->
+ <jar jarfile="${pixie-jar-file}"
+- basedir="build">
+- <manifest>
+- <attribute name="Class-Path"
value="${manifest-lib-prefix}/${jcommon-jar-file}"/>
+- </manifest>
++ basedir="build">
+ </jar>
+
+ <!-- delete the temp directory -->
Modified: trunk/libpixie-java/debian/rules
===================================================================
--- trunk/libpixie-java/debian/rules 2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian/rules 2006-03-12 11:29:29 UTC (rev 1991)
@@ -1,89 +1,24 @@
#!/usr/bin/make -f
+# debian/rules file for libpixie-java (uses cdbs)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Build
-JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm
/usr/lib/j2sdk1.4-blackdown
-export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] &&
echo $$j && exit 0; done)
+JAVA_HOME := /usr/lib/jvm/java-gcj
+ANT_HOME := /usr/share/ant
-export LIBRARY=pixie
-export VERSION=$(shell ls pixie-*.tar.gz | sed 's/pixie-\(.*\).tar.gz/\1/' )
-export SRCDIR=$(LIBRARY)-$(VERSION)
-export CURDIR=$(shell pwd)
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon
+DEB_ANT_BUILDFILE := ant/build.xml
+DEB_ANT_BUILD_TARGET := compile javadoc
+VERSION := 0.8.4
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- mkdir $(SRCDIR)
- tar xvzf pixie-$(VERSION).tar.gz
- sh ./debian_patch $(SRCDIR)/ant/build.xml
- touch configure-stamp
+clean::
+ -rm -rf build
+ -rm -rf javadoc
+ -rm -f pixie.jar
-
-build: configure build-stamp
-build-stamp:
- dh_testdir
- # Use debian jar to use debian jars
- # Ant compile
- cd $(SRCDIR)/ant; ant compile
- touch build-stamp
-
-javadoc:
- echo $(SRCDIR)/javadoc > debian/libpixie-java.docs
- echo $(SRCDIR)/README >> debian/libpixie-java.docs
- -rm -rf $(SRCDIR)/javadoc
- # Ant
- cd $(SRCDIR)/ant; ant javadoc
-
-clean:
- dh_testdir
- dh_testroot
- -rm -f build-stamp
- -rm -f configure-stamp
- -rm -rf $(SRCDIR)
- dh_clean
-
-install: build javadoc
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- #
- # Package
- #
- install -m 644 $(SRCDIR)/$(LIBRARY)-$(VERSION).jar \
- debian/tmp/usr/share/java/$(LIBRARY)-$(VERSION).jar
- ln -s $(LIBRARY)-$(VERSION).jar debian/tmp/usr/share/java/$(LIBRARY).jar
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
-# dh_perl
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-
-binary: binary-indep
-
-.PHONY: binary binary-indep clean
+install/libpixie-java::
+ install -m 644 pixie.jar
debian/libpixie-java/usr/share/java/pixie-$(VERSION).jar
+ ln -s pixie-$(VERSION).jar debian/libpixie-java/usr/share/java/pixie.jar
Deleted: trunk/libpixie-java/debian_patch
===================================================================
--- trunk/libpixie-java/debian_patch 2006-03-09 22:58:59 UTC (rev 1990)
+++ trunk/libpixie-java/debian_patch 2006-03-12 11:29:29 UTC (rev 1991)
@@ -1 +0,0 @@
-perl -pi -e 's:\${libdir}/\${JCommon-jar}:/usr/share/java/jcommon.jar:' $1
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
