[pkg-java] r10344 - in trunk/jarjar/debian: . patches
Niels Thykier
nthykier-guest at alioth.debian.org
Sat Sep 12 17:27:23 UTC 2009
Author: nthykier-guest
Date: 2009-09-12 17:27:23 +0000 (Sat, 12 Sep 2009)
New Revision: 10344
Added:
trunk/jarjar/debian/patches/02_fix_build_xml.patch
Removed:
trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch
Modified:
trunk/jarjar/debian/changelog
trunk/jarjar/debian/compat
trunk/jarjar/debian/control
trunk/jarjar/debian/copyright
trunk/jarjar/debian/rules
Log:
jarjar (1.0~rc8+dfsg-1) unstable; urgency=low
* New upstream release.
* Added myself to uploaders.
* Renamed and updated 02_dont_build_JarJarMojo.patch to
02_fix_build_xml.patch.
* Stopped using Build-Depends-Indep since buildds and the policy
does not agree on when it should used.
* Changed section to java.
* Replaced gcj-compat with the default javas packages.
(Closes: #526279)
* Bumped to Standard-Version 3.8.3.
- Link to Apache-2.0 license rather than quoting it.
* Bumped Debhelper to version 7.
-- Niels Thykier <niels at thykier.net> Sat, 12 Sep 2009 19:26:57 +0200
Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog 2009-09-12 13:29:50 UTC (rev 10343)
+++ trunk/jarjar/debian/changelog 2009-09-12 17:27:23 UTC (rev 10344)
@@ -1,3 +1,20 @@
+jarjar (1.0~rc8+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added myself to uploaders.
+ * Renamed and updated 02_dont_build_JarJarMojo.patch to
+ 02_fix_build_xml.patch.
+ * Stopped using Build-Depends-Indep since buildds and the policy
+ does not agree on when it should used.
+ * Changed section to java.
+ * Replaced gcj-compat with the default javas packages.
+ (Closes: #526279)
+ * Bumped to Standard-Version 3.8.3.
+ - Link to Apache-2.0 license rather than quoting it.
+ * Bumped Debhelper to version 7.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 12 Sep 2009 19:26:57 +0200
+
jarjar (1.0~rc7.dfsg-2) unstable; urgency=low
* Fix lists in long descriptions. Closes: #480324
Modified: trunk/jarjar/debian/compat
===================================================================
--- trunk/jarjar/debian/compat 2009-09-12 13:29:50 UTC (rev 10343)
+++ trunk/jarjar/debian/compat 2009-09-12 17:27:23 UTC (rev 10344)
@@ -1 +1 @@
-5
+7
Modified: trunk/jarjar/debian/control
===================================================================
--- trunk/jarjar/debian/control 2009-09-12 13:29:50 UTC (rev 10343)
+++ trunk/jarjar/debian/control 2009-09-12 17:27:23 UTC (rev 10344)
@@ -1,19 +1,18 @@
Source: jarjar
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant, libasm3-java
-Standards-Version: 3.7.3
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: debhelper (>= 7), cdbs, ant, libasm3-java, default-jdk
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jarjar
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jarjar
Homepage: http://code.google.com/p/jarjar/
Package: libjarjar-java
-Section: libs
Architecture: all
-Depends: java-gcj-compat | java2-runtime
+Depends: default-jre-headless | java2-runtime, ${misc:Depends}
Description: repackage third-party jars
Utility that makes it easy to repackage Java libraries and embed them
into your own distribution. This is useful for two reasons:
@@ -26,8 +25,9 @@
Package: libjarjar-java-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: libjarjar-java
-Description: repackage third-party jars
+Description: repackage third-party jars - documentation
Utility that makes it easy to repackage Java libraries and embed them
into your own distribution. This is useful for two reasons:
.
Modified: trunk/jarjar/debian/copyright
===================================================================
--- trunk/jarjar/debian/copyright 2009-09-12 13:29:50 UTC (rev 10343)
+++ trunk/jarjar/debian/copyright 2009-09-12 17:27:23 UTC (rev 10344)
@@ -8,227 +8,11 @@
Copyright: (C) 2004 Tonic Systems, Inc.
-License:
+License: Apache 2.0
+On Debian systems the full text of the Apache 2.0 License can be found at
+/usr/share/common-licenses/Apache-2.0.
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 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.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
The Debian packaging is licensed under the General Public License. On Debian
systems the full text of the General Public License, GPL, can be found at
/usr/share/common-licenses/GPL.
Deleted: trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch
===================================================================
--- trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch 2009-09-12 13:29:50 UTC (rev 10343)
+++ trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch 2009-09-12 17:27:23 UTC (rev 10344)
@@ -1,10 +0,0 @@
---- build.xml~ 2007-04-11 08:32:34.000000000 +0000
-+++ build.xml 2007-05-11 12:34:10.000000000 +0000
-@@ -49,6 +49,7 @@
- <javac srcdir="src/@{module}" destdir="build/@{module}"
- source="${compile.source}"
- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
-+ excludes="com/tonicsystems/jarjar/JarJarMojo.java"
- debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
- <classpath refid="@{refid}"/>
- </javac>
Copied: trunk/jarjar/debian/patches/02_fix_build_xml.patch (from rev 10343, trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch)
===================================================================
--- trunk/jarjar/debian/patches/02_fix_build_xml.patch (rev 0)
+++ trunk/jarjar/debian/patches/02_fix_build_xml.patch 2009-09-12 17:27:23 UTC (rev 10344)
@@ -0,0 +1,14 @@
+--- build.xml.orig 2009-09-12 18:05:14.053030997 +0200
++++ build.xml 2009-09-12 18:06:01.346009724 +0200
+@@ -47,8 +47,9 @@
+ <fileset dir="src/@{module}" excludes="**/*.java"/>
+ </copy>
+ <javac srcdir="src/@{module}" destdir="build/@{module}"
+- source="${compile.source}"
+- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
++ source="1.5"
++ target="1.5" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
++ excludes="com/tonicsystems/jarjar/JarJarMojo.java"
+ debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
+ <classpath refid="@{refid}"/>
+ <compilerarg value="-Xlint"/>
Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules 2009-09-12 13:29:50 UTC (rev 10343)
+++ trunk/jarjar/debian/rules 2009-09-12 17:27:23 UTC (rev 10344)
@@ -6,11 +6,11 @@
VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//`
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := asm3 asm3-commons
DEB_ANT_BUILD_TARGET := jar javadoc
install/libjarjar-java::
- install -m 644 -D dist/jarjar-$(VERSION).jar debian//libjarjar-java/usr/share/java/jarjar-$(VERSION).jar
+ install -m 644 -D dist/jarjar-*.jar debian//libjarjar-java/usr/share/java/jarjar-$(VERSION).jar
dh_link -plibjarjar-java /usr/share/java/jarjar-$(VERSION).jar /usr/share/java/jarjar.jar
More information about the pkg-java-commits
mailing list