[pkg-java] r4074 - in trunk/libpixie-java/debian: . patches
rene at alioth.debian.org
rene at alioth.debian.org
Thu Aug 30 11:23:05 UTC 2007
Author: rene
Date: 2007-08-30 11:23:05 +0000 (Thu, 30 Aug 2007)
New Revision: 4074
Added:
trunk/libpixie-java/debian/patches/jarnames.diff
trunk/libpixie-java/debian/patches/libdir.diff
Removed:
trunk/libpixie-java/debian/ant.properties
trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch
Modified:
trunk/libpixie-java/debian/changelog
trunk/libpixie-java/debian/control
trunk/libpixie-java/debian/docs
trunk/libpixie-java/debian/rules
Log:
new upstream release; move to main
Deleted: trunk/libpixie-java/debian/ant.properties
===================================================================
--- trunk/libpixie-java/debian/ant.properties 2007-08-30 09:08:47 UTC (rev 4073)
+++ trunk/libpixie-java/debian/ant.properties 2007-08-30 11:23:05 UTC (rev 4074)
@@ -1,3 +0,0 @@
-build.target=1.3
-build.debug=true
-pixie-jar-file=pixie.jar
Modified: trunk/libpixie-java/debian/changelog
===================================================================
--- trunk/libpixie-java/debian/changelog 2007-08-30 09:08:47 UTC (rev 4073)
+++ trunk/libpixie-java/debian/changelog 2007-08-30 11:23:05 UTC (rev 4074)
@@ -1,3 +1,11 @@
+libpixie-java (1:0.8.7-1) unstable; urgency=low
+
+ * New upstream release
+ * move to main
+ * add myself to Uploaders:, remove Wolfgang
+
+ -- Rene Engelhard <rene at debian.org> Thu, 30 Aug 2007 12:52:52 +0200
+
libpixie-java (1:0.8.4-1) unstable; urgency=low
* New upstream release
@@ -48,6 +56,3 @@
-- Christian Bayle <bayle at debian.org> Sat, 5 Jul 2003 02:51:05 +0200
-Local variables:
-mode: debian-changelog
-End:
Modified: trunk/libpixie-java/debian/control
===================================================================
--- trunk/libpixie-java/debian/control 2007-08-30 09:08:47 UTC (rev 4073)
+++ trunk/libpixie-java/debian/control 2007-08-30 11:23:05 UTC (rev 4074)
@@ -1,15 +1,16 @@
Source: libpixie-java
-Section: contrib/libs
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, 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)
+Uploaders: Christian Bayle <bayle at debian.org>, Rene Engelhard <rene at debian.org>
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.10-1)
Standards-Version: 3.6.2
Package: libpixie-java
-Section: contrib/libs
+Section: libs
Architecture: all
-Depends: j2re1.4 | java2-runtime, libjcommon-java (>= 1.0.0-1)
+Depends: java-gcj-compat | java2-runtime, libjcommon-java (>= 1.0.10-1)
Description: Java Vector Format Viewer Library
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
Modified: trunk/libpixie-java/debian/docs
===================================================================
--- trunk/libpixie-java/debian/docs 2007-08-30 09:08:47 UTC (rev 4073)
+++ trunk/libpixie-java/debian/docs 2007-08-30 11:23:05 UTC (rev 4074)
@@ -1,2 +1,2 @@
-javadoc
-README
+javadoc/*
+README.txt
Deleted: trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch
===================================================================
--- trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch 2007-08-30 09:08:47 UTC (rev 4073)
+++ trunk/libpixie-java/debian/patches/00_BuildXml_Manifest.patch 2007-08-30 11:23:05 UTC (rev 4074)
@@ -1,14 +0,0 @@
---- 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 -->
Added: trunk/libpixie-java/debian/patches/jarnames.diff
===================================================================
--- trunk/libpixie-java/debian/patches/jarnames.diff (rev 0)
+++ trunk/libpixie-java/debian/patches/jarnames.diff 2007-08-30 11:23:05 UTC (rev 4074)
@@ -0,0 +1,11 @@
+--- build.properties-old 2007-08-28 00:10:06.000000000 +0200
++++ build.properties 2007-08-28 00:10:19.000000000 +0200
+@@ -39,7 +39,7 @@
+ ###########################################################
+ #
+ # Used libraries ...
+-jcommon-jar-file=jcommon-1.0.10.jar
++jcommon-jar-file=jcommon.jar
+
+ ##############################################################
+ #
Added: trunk/libpixie-java/debian/patches/libdir.diff
===================================================================
--- trunk/libpixie-java/debian/patches/libdir.diff (rev 0)
+++ trunk/libpixie-java/debian/patches/libdir.diff 2007-08-30 11:23:05 UTC (rev 4074)
@@ -0,0 +1,11 @@
+--- build.properties-old 2007-08-28 00:10:06.000000000 +0200
++++ build.properties 2007-08-28 00:11:01.000000000 +0200
+@@ -27,7 +27,7 @@
+ # All path settings are relative to the project root directory
+ # (..)
+ #
+-libdir=lib
++libdir=/usr/share/java
+
+ #
+ # If you specify a non-emty string, then dont forget the
Modified: trunk/libpixie-java/debian/rules
===================================================================
--- trunk/libpixie-java/debian/rules 2007-08-30 09:08:47 UTC (rev 4073)
+++ trunk/libpixie-java/debian/rules 2007-08-30 11:23:05 UTC (rev 4074)
@@ -9,15 +9,15 @@
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon
-DEB_ANT_BUILDFILE := ant/build.xml
+DEB_ANT_BUILDFILE := build.xml
DEB_ANT_BUILD_TARGET := compile javadoc
-VERSION := 0.8.4
+VERSION := 0.8.7
clean::
-rm -rf build
-rm -rf javadoc
- -rm -f pixie.jar
+ -rm -f pixie.jar lib/*
install/libpixie-java::
install -m 644 pixie.jar debian/libpixie-java/usr/share/java/pixie-$(VERSION).jar
More information about the pkg-java-commits
mailing list