[pkg-java] r8660 - in trunk: . libflexdock-java libflexdock-java/debian libflexdock-java/debian/patches
Torsten Werner
twerner at alioth.debian.org
Sun Jun 28 20:23:05 UTC 2009
Author: twerner
Date: 2009-06-28 20:23:04 +0000 (Sun, 28 Jun 2009)
New Revision: 8660
Added:
trunk/libflexdock-java/
trunk/libflexdock-java/debian/
trunk/libflexdock-java/debian/ant.properties
trunk/libflexdock-java/debian/changelog
trunk/libflexdock-java/debian/compat
trunk/libflexdock-java/debian/control
trunk/libflexdock-java/debian/copyright
trunk/libflexdock-java/debian/libflexdock-java-demo.README.Debian
trunk/libflexdock-java/debian/libflexdock-java-doc.docs
trunk/libflexdock-java/debian/orig-tar.exclude
trunk/libflexdock-java/debian/orig-tar.sh
trunk/libflexdock-java/debian/patches/
trunk/libflexdock-java/debian/patches/AllDemos.java.patch
trunk/libflexdock-java/debian/patches/build.xml.patch
trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
trunk/libflexdock-java/debian/patches/series
trunk/libflexdock-java/debian/rules
trunk/libflexdock-java/debian/watch
Log:
move package to pkg-java
Added: trunk/libflexdock-java/debian/ant.properties
===================================================================
--- trunk/libflexdock-java/debian/ant.properties (rev 0)
+++ trunk/libflexdock-java/debian/ant.properties 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,3 @@
+OS_NAME linux
+sdk.include /usr/
+build.sysclasspath first
Added: trunk/libflexdock-java/debian/changelog
===================================================================
--- trunk/libflexdock-java/debian/changelog (rev 0)
+++ trunk/libflexdock-java/debian/changelog 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,57 @@
+libflexdock-java (0.5.1-dfsg1-6) hardy; urgency=low
+
+ * Use openjdk instead of gcj
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 13 Jan 2009 15:05:29 +0100
+
+libflexdock-java (0.5.1-dfsg1-5) unstable; urgency=low
+
+ * libRubberBand.so.1 was also incorporated into the jar file
+ * Only try to load the library from system directories
+ * Demo should work better
+ * libflexdock-java-demo.README.Debian is now ship correctly
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 12 Aug 2008 14:57:30 +0200
+
+libflexdock-java (0.5.1-dfsg1-4) unstable; urgency=low
+
+ * Add DM-Upload-Allowed: yes to enable uploads by Sylvestre.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 29 Apr 2008 20:49:41 +0200
+
+libflexdock-java (0.5.1-dfsg1-3) unstable; urgency=low
+
+ * Build dep java-gcj-compat-dev changed to default-jdk-builddep
+ (Closes: #477877)
+ * JAVA_HOME changed to /usr/lib/jvm/default-java
+ * Small spelling mistake in the file libflexdock-java-demo.README-Debian
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Fri, 25 Apr 2008 23:21:45 +0200
+
+libflexdock-java (0.5.1-dfsg1-2) unstable; urgency=low
+
+ * Fix path to jni.h.
+ * Add -fPIC to gcc's command line.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 22 Dec 2007 17:29:03 +0100
+
+libflexdock-java (0.5.1-dfsg1-1) unstable; urgency=low
+
+ * Remove files matching *.dll and *.so from upstream's tarball.
+ * Fix the build of libRubberBand.so.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 22 Dec 2007 16:38:36 +0100
+
+libflexdock-java (0.5.1-2) unstable; urgency=low
+
+ * Updated to Standards-Version: 3.7.3 (no changes needed).
+ * Build-Depends-Indep elements moved to Build-Depends (Closes: #457349)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Sat, 22 Dec 2007 12:59:28 +0100
+
+libflexdock-java (0.5.1-1) unstable; urgency=low
+
+ * Initial Release (Closes: #454653)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Sun, 30 Sep 2007 00:32:33 +0100
+
Added: trunk/libflexdock-java/debian/compat
===================================================================
--- trunk/libflexdock-java/debian/compat (rev 0)
+++ trunk/libflexdock-java/debian/compat 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1 @@
+5
Added: trunk/libflexdock-java/debian/control
===================================================================
--- trunk/libflexdock-java/debian/control (rev 0)
+++ trunk/libflexdock-java/debian/control 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,78 @@
+Source: libflexdock-java
+Section: libs
+Priority: optional
+Maintainer: Sylvestre Ledru <sylvestre.ledru at inria.fr>
+Uploaders: Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional,
+ openjdk-6-jdk, libcommons-logging-java, libskinlf-java,
+ libjgoodies-looks-java, libx11-dev, quilt
+Standards-Version: 3.7.3
+Homepage: http://flexdock.dev.java.net
+Vcs-Svn: https://bollin.googlecode.com/svn/libflexdock-java/trunk
+Vcs-Browser: http://bollin.googlecode.com/svn/libflexdock-java/trunk
+DM-Upload-Allowed: yes
+
+Package: libflexdock-java
+Architecture: all
+Depends: java-gcj-compat | java1-runtime | java2-runtime,
+ libflexdock-jni, libcommons-logging-java, libskinlf-java,
+ libjgoodies-looks-java
+Suggests: libflexdock-java-doc, libflexdock-java-demo
+Description: Swing Java docking framework
+ FlexDock is a Java docking framework for use in cross-platform Swing
+ applications. It offers features you'd expect in any desktop docking
+ framework such as:
+ * Tabbed and Split Layouts
+ * Drag-n-Drop capability (with native drag rubber band painting on
+ some platforms)
+ * Floating windows
+ * Collapsible Containers to Save Real Estate
+ * Layout Persistence
+
+Package: libflexdock-java-doc
+Section: doc
+Architecture: all
+Description: Swing Java docking framework - demos and examples
+ FlexDock is a Java docking framework for use in cross-platform
+ Swing applications. It offers features you'd expect in any desktop
+ docking framework such as:
+ * Tabbed and Split Layouts
+ * Drag-n-Drop capability (with native drag rubber band painting
+ on some platforms)
+ * Floating windows
+ * Collapsible Containers to Save Real Estate
+ * Layout Persistence
+ .
+ This package contains documentation files.
+
+Package: libflexdock-java-demo
+Architecture: all
+Depends: libflexdock-java
+Description: Swing Java docking framework - demos and examples
+ FlexDock is a Java docking framework for use in cross-platform
+ Swing applications. It offers features you'd expect in any desktop
+ docking framework such as:
+ * Tabbed and Split Layouts
+ * Drag-n-Drop capability (with native drag rubber band painting on
+ some platforms)
+ * Floating windows
+ * Collapsible Containers to Save Real Estate
+ * Layout Persistence
+ .
+ This package contains the examples and demonstration files.
+
+Package: libflexdock-jni
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Swing Java docking framework - JNI library
+ FlexDock is a Java docking framework for use in cross-platform Swing
+ applications. It offers features you'd expect in any desktop docking
+ framework such as:
+ * Tabbed and Split Layouts
+ * Drag-n-Drop capability (with native drag rubber band painting on
+ some platforms)
+ * Floating windows
+ * Collapsible Containers to Save Real Estate
+ * Layout Persistence
+ .
+ This package contains the native jni library for flexdock.
Added: trunk/libflexdock-java/debian/copyright
===================================================================
--- trunk/libflexdock-java/debian/copyright (rev 0)
+++ trunk/libflexdock-java/debian/copyright 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,30 @@
+This package was debianized by Sylvestre Ledru <sylvestre.ledru at inria.fr> on
+Mon, 26 Nov 2007 16:31:34 +0100.
+
+It was downloaded from http://flexdock.dev.java.net/
+
+Upstream Authors: Claudio Romano - Eleritec
+
+Copyright: (c) 2005-2006 FlexDock Development Team. All rights reserved.
+
+License:
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
Added: trunk/libflexdock-java/debian/libflexdock-java-demo.README.Debian
===================================================================
--- trunk/libflexdock-java/debian/libflexdock-java-demo.README.Debian (rev 0)
+++ trunk/libflexdock-java/debian/libflexdock-java-demo.README.Debian 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,11 @@
+flexdock for Debian
+-------------------
+
+This package provides a few demos. These demos show the features of Flexdock.
+
+The demo can be launched with this command :
+
+ java -jar /usr/share/java/flexdock-demo.jar
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>, Wed, 05 Dec 2007 13:45:32 +0100
+
Added: trunk/libflexdock-java/debian/libflexdock-java-doc.docs
===================================================================
--- trunk/libflexdock-java/debian/libflexdock-java-doc.docs (rev 0)
+++ trunk/libflexdock-java/debian/libflexdock-java-doc.docs 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,2 @@
+build/docs/*
+docs/*.sxw
Added: trunk/libflexdock-java/debian/orig-tar.exclude
===================================================================
--- trunk/libflexdock-java/debian/orig-tar.exclude (rev 0)
+++ trunk/libflexdock-java/debian/orig-tar.exclude 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,5 @@
+*.dll
+*.doc
+*.jar
+*.pdf
+*.so
Added: trunk/libflexdock-java/debian/orig-tar.sh
===================================================================
--- trunk/libflexdock-java/debian/orig-tar.sh (rev 0)
+++ trunk/libflexdock-java/debian/orig-tar.sh 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p')
+SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p')
+
+DIR=flexdock-${VERSION}
+TAR=../${SOURCE}_${VERSION}.orig.tar.gz
+
+# clean up the upstream tarball
+# Export to the $DIR directory since there is no directory in
+# the archive
+unzip $3 -d $DIR
+tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Property changes on: trunk/libflexdock-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+
Added: trunk/libflexdock-java/debian/patches/AllDemos.java.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/AllDemos.java.patch (rev 0)
+++ trunk/libflexdock-java/debian/patches/AllDemos.java.patch 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,12 @@
+Index: libflexdock-java-0.5.1-dfsg1/src/java/demo/org/flexdock/demos/AllDemos.java
+===================================================================
+--- libflexdock-java-0.5.1-dfsg1.orig/src/java/demo/org/flexdock/demos/AllDemos.java 2007-01-11 15:52:00.000000000 +0100
++++ libflexdock-java-0.5.1-dfsg1/src/java/demo/org/flexdock/demos/AllDemos.java 2007-12-22 16:20:09.000000000 +0100
+@@ -33,7 +33,6 @@
+ "org.flexdock.demos.raw.border.BorderDemo",
+ "org.flexdock.demos.raw.CompoundDemo",
+ "org.flexdock.demos.raw.elegant.ElegantDemo",
+- "org.flexdock.demos.raw.jmf.JMFDemo",
+ "org.flexdock.demos.raw.SimpleDemo",
+ "org.flexdock.demos.raw.SplitPaneDemo",
+ "org.flexdock.demos.raw.TabbedPaneDemo",
Added: trunk/libflexdock-java/debian/patches/build.xml.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/build.xml.patch (rev 0)
+++ trunk/libflexdock-java/debian/patches/build.xml.patch 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,85 @@
+--- flexdock-0.5.1-dfsg1.orig/build.xml 2008-08-12 14:53:19.000000000 +0200
++++ flexdock-0.5.1-dfsg1/build.xml 2008-08-12 17:07:02.000000000 +0200
+@@ -118,7 +118,7 @@
+ <condition property="os.unixWithXlib">
+ <and>
+ <os family="unix"/>
+- <available file="/usr/X11R6/include/X11/Xlib.h"/>
++ <available file="/usr/include/X11/Xlib.h"/>
+ </and>
+ </condition>
+ </target>
+@@ -145,7 +145,7 @@
+ <src path="${java.src.drag}"/>
+ <src path="${java.src.perspective}"/>
+ </javac>
+- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
++ <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" excludes="org/flexdock/demos/raw/jmf//**" debug="true" source="1.4"/>
+ <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
+ </target>
+
+@@ -176,10 +176,10 @@
+ <path id="sdk.include.dirset">
+ <dirset dir="${sdk.include}"/>
+ </path>
+- <pathconvert property="sdk.include.gcc.args.temp"
++<!-- <pathconvert property="sdk.include.gcc.args.temp"
+ refid="sdk.include.dirset"
+- pathsep='" "-I'/>
+- <property name="sdk.include.gcc.args" value='"-I${sdk.include.gcc.args.temp}"'/>
++ pathsep='" "-I'/>-->
++ <property name="sdk.include.gcc.args" value='"-I/usr/lib/jvm/java-6-openjdk/include/"' />
+ </target>
+
+
+@@ -291,11 +291,12 @@
+
+ <exec executable="gcc" failonerror="true">
+ <arg value="-lX11"/>
+- <arg value="-L/usr/X11R6/lib"/>
+- <arg value="-I/usr/X11R6/include"/>
++ <arg value="-L/usr/lib"/>
++ <arg value="-I/usr/include/X11"/>
+ <arg value="-o"/>
+ <arg value="${so.dir}/libRubberBand${library.key}.so"/>
+ <arg value="-shared"/>
++ <arg value="-fPIC"/>
+ <arg value="${c.dir}/RubberBand.c"/>
+ <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
+ </exec>
+@@ -313,7 +314,7 @@
+ <isset property="generic.jar"/>
+ </condition>
+ <property name="jar.suffix" value=""/>
+- <property name="jar.excludes" value=""/>
++ <property name="jar.excludes" value="**/*.so"/>
+
+
+ <!-- after this method is called, other targets can use these props -->
+@@ -334,7 +335,7 @@
+ I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
+ <manifest>
+ <!-- matches core jar name -->
+- <attribute name="Class-Path" value="${dist.jar.name} lib/commons-logging-1.1.jar lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
++ <attribute name="Class-Path" value="${dist.jar.name} commons-logging.jar looks.jar skinlf.jar"/>
+ <attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
+ </manifest>
+ </jar>
+@@ -557,7 +558,6 @@
+ <filter token="VERSION" value="${version}"/>
+ <filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
+ <filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
+- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
+ <filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
+ <filter token="LOOKS" value="looks-2.1.1.jar"/>
+ <filter token="SKIN_LF" value="skinlf.jar"/>
+@@ -570,9 +570,6 @@
+ jarname="${build.dir}/${dist.demo.jar.name}"
+ sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
+ <mysignjar
+- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
+- sjarname="${bin.dir.webstart}/jmf.jar"/>
+- <mysignjar
+ jarname="${build.dir}/lib/commons-logging-1.1.jar"
+ sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
+ <mysignjar
Added: trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch (rev 0)
+++ trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,21 @@
+--- flexdock-0.5.1-dfsg1.orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2008-08-12 14:53:19.000000000 +0200
++++ flexdock-0.5.1-dfsg1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2008-08-12 16:30:51.000000000 +0200
+@@ -36,7 +36,8 @@
+
+ private static void prime() {
+ List keys = OsInfo.getInstance().getPrefixLibraryKeys();
+-
++ System.setProperty("java.library.path", System.getProperty("java.library.path") + ":/usr/lib/jni/");
++
+ // we're going to cycle through various levels of os+arch accuracy
+ // until we're able to load a native library that matches the current
+ // system.
+@@ -46,7 +47,7 @@
+ String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END;
+
+ try {
+- ResourceManager.loadLibrary(lib, resource);
++ System.loadLibrary(lib);
+ // if the library was successfully loaded, then we don't
+ // need to do anything else.
+ return;
Added: trunk/libflexdock-java/debian/patches/series
===================================================================
--- trunk/libflexdock-java/debian/patches/series (rev 0)
+++ trunk/libflexdock-java/debian/patches/series 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,3 @@
+AllDemos.java.patch
+build.xml.patch
+loadOfTheNativeLibrary.patch
Added: trunk/libflexdock-java/debian/rules
===================================================================
--- trunk/libflexdock-java/debian/rules (rev 0)
+++ trunk/libflexdock-java/debian/rules 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+# Copyright 2007 Sylvestre Ledru <sylvestre.ledru at inria.fr>
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
+DEB_JARS := ant-nodeps looks skinlf commons-logging
+DEB_ANT_BUILD_TARGET := build.with.native jar doc
+BUILDDIR := build
+DEB_COMPRESS_EXCLUDE := .sxw
+
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's/-dfsg.*//')
+
+install/libflexdock-java::
+ install -m 644 -D $(BUILDDIR)/flexdock-$(VERSION).jar debian/libflexdock-java/usr/share/java/flexdock-$(VERSION).jar
+ ln -s flexdock-$(VERSION).jar debian/libflexdock-java/usr/share/java/flexdock.jar
+
+install/libflexdock-java-demo::
+ install -m 644 -D $(BUILDDIR)/flexdock-demo-$(VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo-$(VERSION).jar
+ ln -s flexdock-demo-$(VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo.jar
+
+install/libflexdock-jni::
+ install -m 644 -D $(BUILDDIR)/bin/org/flexdock/docking/drag/outline/xlib/libRubberBand*.so debian/libflexdock-jni/usr/lib/jni/libRubberBand-linux.so
+ ln -s libRubberBand-linux.so debian/libflexdock-jni/usr/lib/jni/libRubberBand.so.1
+ ln -s libRubberBand.so.1 debian/libflexdock-jni/usr/lib/jni/libRubberBand.so
+
+get-orig-source:
+ -uscan --upstream-version 0 --rename
Property changes on: trunk/libflexdock-java/debian/rules
___________________________________________________________________
Added: svn:executable
+
Added: trunk/libflexdock-java/debian/watch
===================================================================
--- trunk/libflexdock-java/debian/watch (rev 0)
+++ trunk/libflexdock-java/debian/watch 2009-06-28 20:23:04 UTC (rev 8660)
@@ -0,0 +1,4 @@
+version=3
+opts="dversionmangle=s/-dfsg.*//" \
+ https://flexdock.dev.java.net/ \
+ files/documents/.*/flexdock-([\d\.]*)-src.zip debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list