[pkg-java] r12715 - in trunk/libradeox-java/debian: . patches source
Miguel Landaeta
nomadium-guest at alioth.debian.org
Thu Jul 1 03:28:26 UTC 2010
Author: nomadium-guest
Date: 2010-07-01 03:28:25 +0000 (Thu, 01 Jul 2010)
New Revision: 12715
Added:
trunk/libradeox-java/debian/jlibs
trunk/libradeox-java/debian/source/
trunk/libradeox-java/debian/source/format
Modified:
trunk/libradeox-java/debian/changelog
trunk/libradeox-java/debian/compat
trunk/libradeox-java/debian/control
trunk/libradeox-java/debian/copyright
trunk/libradeox-java/debian/orig-tar.sh
trunk/libradeox-java/debian/patches/upstream.diff
trunk/libradeox-java/debian/rules
Log:
* Change section to java.
* Add myself as Uploader.
* Update Build-Depends and Depends.
* Bump Standards-Version to 3.9.0.
* Use source package format 3.0 (quilt).
* Increase debhelper compatibility level from 5 to 7.
* Use javahelper to ease packaging.
* Patch changes in picocontainer library API.
* Package the last release committed to upstream svn repository.
* Summarize and update debian/copyright file.
Modified: trunk/libradeox-java/debian/changelog
===================================================================
--- trunk/libradeox-java/debian/changelog 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/changelog 2010-07-01 03:28:25 UTC (rev 12715)
@@ -1,5 +1,5 @@
-libradeox-java (1.0~beta3-1) unstable; urgency=low
+libradeox-java (1.1~beta+svn14-1) unstable; urgency=low
* initial version (Closes: #453471)
- -- Torsten Werner <twerner at debian.org> Mon, 26 Nov 2007 16:31:34 +0100
+ -- Miguel Landaeta <miguel at miguel.cc> Wed, 30 Jun 2010 21:51:57 -0430
Modified: trunk/libradeox-java/debian/compat
===================================================================
--- trunk/libradeox-java/debian/compat 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/compat 2010-07-01 03:28:25 UTC (rev 12715)
@@ -1 +1 @@
-5
+7
Modified: trunk/libradeox-java/debian/control
===================================================================
--- trunk/libradeox-java/debian/control 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/control 2010-07-01 03:28:25 UTC (rev 12715)
@@ -1,19 +1,21 @@
Source: libradeox-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev, libpicocontainer-java,
- libcommons-logging-java, liboro-java, groovy
-Standards-Version: 3.7.2
-Homepage: http://www.radeox.org
+Uploaders: Torsten Werner <twerner at debian.org>, Miguel Landaeta <miguel at miguel.cc>
+Build-Depends: debhelper (>= 7.0.50~), cdbs, default-jdk, javahelper
+Build-Depends-Indep: ant, libpicocontainer-java, libcommons-logging-java,
+ liboro-java, groovy
+Standards-Version: 3.9.0
+Homepage: http://xircles.codehaus.org/projects/radeox
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libradeox-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libradeox-java
Package: libradeox-java
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: libcommons-logging-java, ${misc:Depends}
+Recommends: liboro-java
+Suggests: groovy, libpicocontainer-java
Description: wiki render engine for Java
SnipSnap Radeox is a rendering engine that renders text markup like
__bold__ and ~~italic~~ to XHTML. It is used in wiki engines and
Modified: trunk/libradeox-java/debian/copyright
===================================================================
--- trunk/libradeox-java/debian/copyright 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/copyright 2010-07-01 03:28:25 UTC (rev 12715)
@@ -1,191 +1,28 @@
This package was debianized by Torsten Werner <twerner at debian.org> on
Mon, 26 Nov 2007 16:31:34 +0100.
-It was downloaded from http://www.radeox.org
+It was downloaded from http://www.radeox.org/.
+Nowadays the source code can be found at http://svn.codehaus.org/radeox/main/trunk/.
-Copyright: (C) 2001-2004 Fraunhofer Gesellschaft, Munich, Germany, for its
- Fraunhofer Institute Computer Architecture and Software Technology
- (FIRST), Berlin, Germany
+Files: *
+Copyright: © 2001-2004 Fraunhofer Gesellschaft, Munich, Germany, for its
+ Fraunhofer Institute Computer Architecture and Software Technology
+ (FIRST), Berlin, Germany
+License: Apache-2.0
-License:
+File: src/test/org/radeox/macro/code/SqlCodeMacroTest.java
+Copyright: © 2002 Stephan J. Schmidt, Matthias L. Jugel
+License: LGPL-2.1
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+Files: debian/*
+Copyright: © 2007 Torsten Werner <twerner at debian.org>,
+ © 2010 Miguel Landaeta <miguel at miguel.cc>
+License: Apache-2.0
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+License: Apache-2.0
+ The full text of the Apache 2.0 license is distributed in
+ /usr/share/common-licenses/Apache-2.0 on Debian systems.
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
-----------
-
-The file src/test/org/radeox/macro/code/SqlCodeMacroTest.java is
-licensed under the terms of the LGPL which can be found on Debian
-systems in the file /usr/share/common-licenses/LGPL.
+License: LGPL-2.1
+ The full text of the GNU Lesser General Public License 2.1
+ is distributed in /usr/share/common-licenses/LGPL-2.1 on Debian systems.
Added: trunk/libradeox-java/debian/jlibs
===================================================================
--- trunk/libradeox-java/debian/jlibs (rev 0)
+++ trunk/libradeox-java/debian/jlibs 2010-07-01 03:28:25 UTC (rev 12715)
@@ -0,0 +1 @@
+dist/radeox.jar
Modified: trunk/libradeox-java/debian/orig-tar.sh
===================================================================
--- trunk/libradeox-java/debian/orig-tar.sh 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/orig-tar.sh 2010-07-01 03:28:25 UTC (rev 12715)
@@ -3,8 +3,9 @@
# $1 = version
DIR=radeox-$1
TAR=../libradeox-java_$1.orig.tar.gz
+REV=$(echo $1 | sed 's/^.*+svn\([0-9]\+\)$/\1/')
-svn export http://svn.reposita.org/svn/radeox $DIR
+svn export -r $REV http://svn.codehaus.org/radeox/main/trunk $DIR
tar -c -z -f $TAR --exclude '*.jar' $DIR
rm -rf $DIR
Modified: trunk/libradeox-java/debian/patches/upstream.diff
===================================================================
--- trunk/libradeox-java/debian/patches/upstream.diff 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/patches/upstream.diff 2010-07-01 03:28:25 UTC (rev 12715)
@@ -1,3 +1,46 @@
+Description: allow upstream code to compile with current libraries
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: not-needed
+Last-Update: 2010-06-30
+
+--- libradeox-java-1.1~beta+svn14.orig/src/java/org/radeox/example/PicoExample.java
++++ libradeox-java-1.1~beta+svn14/src/java/org/radeox/example/PicoExample.java
+@@ -20,7 +20,7 @@
+ package org.radeox.example;
+
+ import org.picocontainer.PicoContainer;
+-import org.picocontainer.defaults.DefaultPicoContainer;
++import org.picocontainer.DefaultPicoContainer;
+ import org.radeox.api.engine.RenderEngine;
+ import org.radeox.api.engine.context.InitialRenderContext;
+ import org.radeox.api.engine.context.RenderContext;
+@@ -41,13 +41,13 @@ public class PicoExample {
+ public static void main(String[] args) {
+ String test = "==SnipSnap== {link:Radeox|http://radeox.org}";
+
+- DefaultPicoContainer c = new org.picocontainer.defaults.DefaultPicoContainer();
++ DefaultPicoContainer c = new org.picocontainer.DefaultPicoContainer();
+ try {
+ InitialRenderContext initialContext = new BaseInitialRenderContext();
+ initialContext.set(RenderContext.INPUT_LOCALE, new Locale("otherwiki", ""));
+- c.registerComponentInstance(InitialRenderContext.class, initialContext);
+- c.registerComponentImplementation(RenderEngine.class, BaseRenderEngine.class);
+- c.getComponentInstances();
++ c.addComponent(InitialRenderContext.class, initialContext);
++ c.addComponent(RenderEngine.class, BaseRenderEngine.class);
++ c.getComponents();
+ } catch (Exception e) {
+ System.err.println("Could not register component: "+e);
+ }
+@@ -58,7 +58,7 @@ public class PicoExample {
+
+ // Only ask for RenderEngine, we automatically get an object
+ // that implements RenderEngine
+- RenderEngine engine = (RenderEngine) container.getComponentInstance(RenderEngine.class);
++ RenderEngine engine = (RenderEngine) container.getComponent(RenderEngine.class);
+ RenderContext context = new BaseRenderContext();
+ System.out.println(engine.render(test, context));
+ }
Index: libradeox-java-1.0~beta3/src/java/org/radeox/example/RadeoxTemplateEngine.java
===================================================================
--- libradeox-java-1.0~beta3.orig/src/java/org/radeox/example/RadeoxTemplateEngine.java 2007-11-28 22:09:16.000000000 +0100
Modified: trunk/libradeox-java/debian/rules
===================================================================
--- trunk/libradeox-java/debian/rules 2010-06-30 22:53:07 UTC (rev 12714)
+++ trunk/libradeox-java/debian/rules 2010-07-01 03:28:25 UTC (rev 12715)
@@ -2,15 +2,13 @@
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-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := jar
DEB_JARS := picocontainer commons-logging oro groovy
install/libradeox-java::
- install -m644 -D dist/radeox.jar $(DEB_DESTDIR)/usr/share/java/radeox-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibradeox-java /usr/share/java/radeox-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/radeox.jar
+ jh_installlibs
get-orig-source:
sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
Added: trunk/libradeox-java/debian/source/format
===================================================================
--- trunk/libradeox-java/debian/source/format (rev 0)
+++ trunk/libradeox-java/debian/source/format 2010-07-01 03:28:25 UTC (rev 12715)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list