[pkg-java] r12525 - trunk/knopflerfish-osgi/debian
Eric Lavarde
ewl-guest at alioth.debian.org
Sat May 29 07:50:15 UTC 2010
Author: ewl-guest
Date: 2010-05-29 07:50:08 +0000 (Sat, 29 May 2010)
New Revision: 12525
Modified:
trunk/knopflerfish-osgi/debian/clean-sources
trunk/knopflerfish-osgi/debian/copyright
trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs
trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install
trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links
Log:
Remove dll & exe from source.
Use more specific jar file names in /usr/share/java
Rework copyright file.
Modified: trunk/knopflerfish-osgi/debian/clean-sources
===================================================================
--- trunk/knopflerfish-osgi/debian/clean-sources 2010-05-28 22:27:51 UTC (rev 12524)
+++ trunk/knopflerfish-osgi/debian/clean-sources 2010-05-29 07:50:08 UTC (rev 12525)
@@ -29,7 +29,7 @@
fi
unzip -q -d "${packdir}" "${file}" || exit 1
-find "${packdir}" -name \*.zip -o -name \*.jar -o -name \*.class | xargs rm -f
+find "${packdir}" -name \*.zip -o -name \*.jar -o -name \*.class -o -name \*.dll -o -name \*.exe | xargs rm -f
rm -fr "${packdir}/knopflerfish.org/docs/javadoc"
rm -f "${packdir}/knopflerfish.org/osgi/framework/resources/tstamp"
tar czf "${origtar}" -C "${basedir}" $(basename "${packdir}") || exit 1
Modified: trunk/knopflerfish-osgi/debian/copyright
===================================================================
--- trunk/knopflerfish-osgi/debian/copyright 2010-05-28 22:27:51 UTC (rev 12524)
+++ trunk/knopflerfish-osgi/debian/copyright 2010-05-29 07:50:08 UTC (rev 12525)
@@ -29,10 +29,6 @@
Further parts of the source code are licensed and copyrighted as follows:
-======================================================================
-= General Notices
-======================================================================
-
----------------------------------------------------------------------
- OSGi Alliance Notice
----------------------------------------------------------------------
@@ -48,158 +44,118 @@
----------------------------------------------------------------------
This product uses icons created by Carlitus,
http://www.carlitus.net, originally distributed under LGPL,
+ see "/usr/share/common-licenses/LGPL".
used with permission.
-----------------------------------------------------------------------
-- ASM Notice
-----------------------------------------------------------------------
-This product includes the ASM byte code manipulation library from
-INRIA (BSD Style License)
-http://asm.objectweb.org
+File: knopflerfish.org/osgi/bundles/cm/cm/src/org/knopflerfish/bundle/cm/Makefile
+ Copyright (c) 2001 Gatespace AB. All Rights Reserved.
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Files: ./knopflerfish.org/osgi/bundles/trayicon/trayicon/src/com/jeans/trayicon/*
+Files: ./knopflerfish.org/docs/jars/trayicon/trayicon_api-2.0.1/src/com/jeans/trayicon/*
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ * Windows Tray Icon
+ * -----------------
+ *
+ * Written by Jan Struyf
+ *
+ * jan.struyf at cs.kuleuven.ac.be
+ * http://jeans.studentenweb.org/java/trayicon/trayicon.html
+ *
+ * Please mail me if you
+ * - 've found bugs
+ * - like this program
+ * - don't like a particular feature
+ * - would like something to be modified
+ *
+ * I always give it my best shot to make a program useful and solid, but
+ * remeber that there is absolutely no warranty for using this program as
+ * stated in the following terms:
+ *
+ * THERE IS NO WARRANTY FOR THIS PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+ * LAW. THE COPYRIGHT HOLDER AND/OR OTHER PARTIES WHO MAY HAVE MODIFIED THE
+ * PROGRAM, PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+ * TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+ * PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+ * REPAIR OR CORRECTION.
+ *
+ * IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL ANY COPYRIGHT HOLDER,
+ * OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM,
+ * BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+ * PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+ * INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+ * PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+ * PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * May the Force be with you... Just compile it & use it!
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+Files: ./knopflerfish.org/docs/jars/bundlerepository/bundlerepository_all-2.0.3/src/kxml/sax/*
+Files: ./knopflerfish.org/docs/jars/bundlerepository/bundlerepository_all-2.0.3/src/fr/imag/adele/metadataparser/*
+ Copyright: 2004, Didier Donsez
+ License: BSD (3 clauses), see "/usr/share/common-licenses/BSD".
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
+Files: ./knopflerfish.org/docs/jars/bundlerepository/bundlerepository_all-2.0.3/src/org/ungoverned/osgi/*
+Files: ./knopflerfish.org/docs/jars/bundlerepository/bundlerepository_all-2.0.3/src/org/knopflerfish/osgi/bundle/bundlerepository/ObrCommandGroup.java
+ Copyright: 2004, Richard S. Hall
+ License: BSD (3 clauses), see "/usr/share/common-licenses/BSD".
-======================================================================
-= Bundle Specific Notices
-======================================================================
-----------------------------------------------------------------------
-- Axis Bundle Notice
-----------------------------------------------------------------------
-This product includes the axis bundle which includes software
-developed by the Apache Axis project releases under Apache Software
-License, Version 1.1. (c) 1999-2003.
+Files: ./knopflerfish.org/docs/jars/jsdk/jsdk_api-2.5/src/javax/servlet/*
+Files: ./knopflerfish.org/osgi/bundles/jsdk/src/javax/servlet/*
+ Copyright: Apache Software Foundation
+ License: Apache 2, see "/usr/share/common-licenses/Apache-2.0".
-----------------------------------------------------------------------
-- Axis 2 Bundle Notice
-----------------------------------------------------------------------
-This product includes the axis2 bundle which includes software
-developed by the Apache Axis project releases under Apache Software
-License, Version 2.0. (c) 2001-2004
-http://ws.apache.org/axis2/
+File: ./knopflerfish.org/docs/jars/desktop/desktop_all-2.3.11/src/apple/dts/samplecode/osxadapter/OSXAdapter.java
+File: ./knopflerfish.org/docs/jars/desktop/desktop-2.3.11/src/apple/dts/samplecode/osxadapter/OSXAdapter.java
+File: ./knopflerfish.org/docs/jars/desktop/desktop_api-2.3.11/src/apple/dts/samplecode/osxadapter/OSXAdapter.java:
+File: ./knopflerfish.org/osgi/bundles/desktop/src/apple/dts/samplecode/osxadapter/OSXAdapter.java
+ Copyright: 2003-2007 Apple, Inc.
+ License: (specific Apple license)
-----------------------------------------------------------------------
-- Bundlerepository Bundle Notice
-----------------------------------------------------------------------
-This product includes the bundlerepository bundle which includes
-the follwing software:
+Disclaimer: IMPORTANT: This Apple software is supplied to you by
+Apple Inc. ("Apple") in consideration of your agreement to the
+following terms, and your use, installation, modification or
+redistribution of this Apple software constitutes acceptance of these
+terms. If you do not agree with these terms, please do not use,
+install, modify or redistribute this Apple software.
- OBR related softare developed by the the Oscar Project.
- Copyright (c) 2004, Richard S. Hall
+In consideration of your agreement to abide by the following terms, and
+subject to these terms, Apple grants you a personal, non-exclusive
+license, under Apple's copyrights in this original Apple software (the
+"Apple Software"), to use, reproduce, modify and redistribute the Apple
+Software, with or without modifications, in source and/or binary forms;
+provided that if you redistribute the Apple Software in its entirety and
+without modifications, you must retain this notice and the following
+text and disclaimers in all such redistributions of the Apple Software.
+Neither the name, trademarks, service marks or logos of Apple Inc.
+may be used to endorse or promote products derived from the Apple
+Software without specific prior written permission from Apple. Except
+as expressly stated in this notice, no other rights or licenses, express
+or implied, are granted by Apple herein, including but not limited to
+any patent rights that may be infringed by your derivative works or by
+other works in which the Apple Software may be incorporated.
- XML Parser software
- Copyright (c) 2004, Didier Donsez
+The Apple Software is provided by Apple on an "AS IS" basis. APPLE
+MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
- kxml parser
- Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
-----------------------------------------------------------------------
-- Commons Loggin Bundle Notice
-----------------------------------------------------------------------
-This product includes the commons_logging bundle which includes
-software developed by the Apache Commons Logging project releases
-under Apache Software License, Version 2.0. (c) 2001-2004
-http://commons.apache.org/logging/
-----------------------------------------------------------------------
-- Crimson Bundle Notice
-----------------------------------------------------------------------
-This product includes the xerces bundle which includes software
-developed by the Apache Crimson project releases under Apache Software
-License, Version 1.1 (c) 1999-2003.
-http://xml.apache.org/dist/LICENSE.txt
-----------------------------------------------------------------------
-- JSDK Bundle Notice
-----------------------------------------------------------------------
-This product includes the jsdk bundle which includes
-software developed by the Apache Geronimo project released
-under Apache Software License, Version 2.0. (c) 2001-2004
-
-----------------------------------------------------------------------
-- JUnit Bundle Notice
-----------------------------------------------------------------------
-This product includes the junit bundles which includes
-software developed by the JUnit project releases under a Common Public
-License, Version 1.0
-http://junit.sourceforge.net/
-
-----------------------------------------------------------------------
-- kSOAP Bundle Notice
-----------------------------------------------------------------------
-This product includes the ksoap-osgi bundles which includes software
-developed by the kSOAP project.
-http://www.ksoap.org
-
-Copyright (c) 2002,2004, Stefan Haustein, Oberhausen, Rhld., Germany
-
-----------------------------------------------------------------------
-- kxml Bundle Notice
-----------------------------------------------------------------------
-This product includes the kxml bundle which includes software
-developed by Stefan Haustein.
-http://www.kxml.org
-
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
-
-----------------------------------------------------------------------
-- Oscar Shell API Bundle Notice
-----------------------------------------------------------------------
-This product includes the oscar-shell bundle which includes
-software developed by the Oscar project.
-Copyright (c) 2004, Richard S. Hall
-
-----------------------------------------------------------------------
-- Windows Tray Icon Bundle Notice
-----------------------------------------------------------------------
-This product includes the trayicon bundle written by Jan Struyf
-http://jeans.studentenweb.org/java/trayicon/trayicon.html
-Distributed under "May the Force be with you... Just compile
-it & use it!"-license
-
-----------------------------------------------------------------------
-- Xalan Bundle Notice
-----------------------------------------------------------------------
-This product includes the xerces bundle which includes software
-developed by the Apache Xalan project releases under Apache Software
-License, Version 2.0. (c) 2001-2004
-http://xml.apache.org/xalan-j/
-
-----------------------------------------------------------------------
-- Xerces Bundle Notice
-----------------------------------------------------------------------
-This product includes the xerces bundle which includes software
-developed by the Apache Xerces project releases under Apache Software
-License, Version 2.0. (c) 2001-2004
-http://xerces.apache.org/
Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs 2010-05-28 22:27:51 UTC (rev 12524)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs 2010-05-29 07:50:08 UTC (rev 12525)
@@ -1 +1,2 @@
usr/share/java
+usr/share/knopflerfish
Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install 2010-05-28 22:27:51 UTC (rev 12524)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install 2010-05-29 07:50:08 UTC (rev 12525)
@@ -1 +1 @@
-knopflerfish.org/osgi/framework-2.3.3.jar usr/share/java/
+knopflerfish.org/osgi/framework-2.3.3.jar usr/share/knopflerfish/
Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links 2010-05-28 22:27:51 UTC (rev 12524)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links 2010-05-29 07:50:08 UTC (rev 12525)
@@ -1 +1,3 @@
-usr/share/java/framework-2.3.3.jar usr/share/java/framework.jar
+usr/share/knopflerfish/framework-2.3.3.jar usr/share/knopflerfish/framework.jar
+usr/share/knopflerfish/framework-2.3.3.jar usr/share/java/knopflerfish-framework.jar
+usr/share/knopflerfish/framework-2.3.3.jar usr/share/java/knopflerfish-framework-2.3.3.jar
More information about the pkg-java-commits
mailing list