This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libcommons-logging-java.

commit 1bf9b397c187d37ad1de62a7b01680fd598c610a
Author: Varun Hiremath <va...@debian.org>
Date:   Sun Dec 7 02:03:41 2008 +0000

    * Split out api docs into a separate -doc package (Closes: #506364)
    * Update Vcs headers
    * Bump Standards-Version to 3.8.0
    * Remove full text of the Apache-2 license from debian/copyright
---
 debian/changelog                                   |  11 +-
 debian/control                                     |  21 ++-
 debian/copyright                                   | 209 +--------------------
 ...c-base => libcommons-logging-java-doc.doc-base} |   4 +-
 debian/{docs => libcommons-logging-java-doc.docs}  |   0
 debian/rules                                       |  11 +-
 6 files changed, 36 insertions(+), 220 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06b4b6a..51a289d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-libcommons-logging-java (1.1.1-2) UNRELEASED; urgency=low
+libcommons-logging-java (1.1.1-2) unstable; urgency=low
 
+  [ Matthias Klose ]
   * (Build-)depend on default-jre/-jdk.
 
- -- Matthias Klose <d...@debian.org>  Wed, 30 Jul 2008 16:01:11 +0000
+  [ Varun Hiremath ]
+  * Split out api docs into a separate -doc package (Closes: #506364)
+  * Update Vcs headers
+  * Bump Standards-Version to 3.8.0
+  * Remove full text of the Apache-2 license from debian/copyright
+
+ -- Varun Hiremath <va...@debian.org>  Sat, 06 Dec 2008 20:55:36 -0500
 
 libcommons-logging-java (1.1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6af5f31..1458e11 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,30 @@ Source: libcommons-logging-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <ab...@debian.org>, Michael Koch <konque...@gmx.de>, 
Kumar Appaiah <aku...@ee.iitm.ac.in>, Varun Hiremath <varunhirem...@gmail.com>
+Uploaders: Arnaud Vandyck <ab...@debian.org>, Michael Koch <konque...@gmx.de>, 
Kumar Appaiah <aku...@debian.org>, Varun Hiremath <va...@debian.org>
 Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: ant-optional, liblogkit-java, liblog4j1.2-java, 
default-jdk, junit, libservlet2.3-java
-Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-logging-java
 Homepage: http://commons.apache.org/logging
 
 Package: libcommons-logging-java
 Architecture: all
 Depends: default-jre-headless | java1-runtime-headless | 
java2-runtime-headless, libservlet2.3-java
-Suggests: liblog4j1.2-java, liblogkit-java, libavalon-framework-java
+Suggests: liblog4j1.2-java, liblogkit-java, libavalon-framework-java, 
libcommons-logging-java-doc
 Description: commmon wrapper interface for several logging APIs
  Provides a simple, component oriented interface together with wrappers for 
  several existing java logging systems. The user can choose at runtime which
  system they want to use for logging. 
+
+Package: libcommons-logging-java-doc
+Section: doc
+Architecture: all
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Description: commmon wrapper interface for several logging APIs (documentation)
+ Provides a simple, component oriented interface together with wrappers for 
+ several existing java logging systems. The user can choose at runtime which
+ system they want to use for logging. 
+ .
+ This package contains the documentation.
diff --git a/debian/copyright b/debian/copyright
index b7400e7..97704d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,214 +21,15 @@ Various parts of the source code written by:
 
 Copyright: 2001 - 2006, The Apache Software Foundation.
 
-License:
+License: 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.
+  On Debian GNU/Linux system you can find the complete text of the
+  Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
 
 Debian packaging: (C) 2001 - 2004, Takashi Okamoto <t...@debian.org>
                          (C) 2005 - 2007, Arnaud Vandyck <av...@debian.org>, 
Wolfgang Baer <wb...@gmx.de>
-                 (C) 2007, Michael Koch, <konque...@gmx.de>, Varun Hiremath 
<varunhirem...@gmail.com>,
-                 Kumar Appaiah <aku...@ee.iitm.ac.in>
+                 (C) 2007, Michael Koch, <konque...@gmx.de>, Varun Hiremath 
<va...@debian.org>,
+                 Kumar Appaiah <aku...@debian.org>
 
 The Debian packaging of this package is licensed under the Apache
 Software License 2.0 (see above).
diff --git a/debian/doc-base b/debian/libcommons-logging-java-doc.doc-base
similarity index 74%
rename from debian/doc-base
rename to debian/libcommons-logging-java-doc.doc-base
index f957e4e..2c6a98c 100644
--- a/debian/doc-base
+++ b/debian/libcommons-logging-java-doc.doc-base
@@ -7,5 +7,5 @@ Abstract: A commmon wrapper interface for several logging APIs, 
providing
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-logging-java/api/index.html
-Files: /usr/share/doc/libcommons-logging-java/api/*
+Index: /usr/share/doc/libcommons-logging-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-logging-java-doc/api/*
diff --git a/debian/docs b/debian/libcommons-logging-java-doc.docs
similarity index 100%
rename from debian/docs
rename to debian/libcommons-logging-java-doc.docs
diff --git a/debian/rules b/debian/rules
index cee9204..9660589 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
-# debian/rules file for libcommons-logging-java (uses cdbs)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 
junit ant-junit
-
-DEB_ANT_BUILD_TARGET := dist
+JAVA_HOME               := /usr/lib/jvm/default-java
+ANT_HOME                := /usr/share/ant
+DEB_ANT_BUILD_TARGET    := dist
+DEB_JARS                := commons-logging log4j-1.2 logkit avalon-framework 
servlet-2.3 junit ant-junit
 
 install/libcommons-logging-java::
        dh_install target/commons-logging-$(DEB_UPSTREAM_VERSION).jar 
usr/share/java

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/libcommons-logging-java.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to