[pleiades] 07/21: Imported Debian patch 1.3.4~I20120531-dfsg-2

Hideki Yamane henrich at moszumanska.debian.org
Thu Jan 2 10:18:23 UTC 2014


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

henrich pushed a commit to branch master
in repository pleiades.

commit f3cc9ccd9c4a37bb51d6a2ddf13933f7d8959c2d
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Jun 5 13:07:59 2012 +0900

    Imported Debian patch 1.3.4~I20120531-dfsg-2
---
 debian/changelog |  14 ++++++++
 debian/control   |   2 +-
 debian/copyright | 101 +++++++++++++++++++++++++++----------------------------
 debian/rules     |   3 ++
 4 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f211c3..a7f336c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pleiades (1.3.4~I20120531-dfsg-2) unstable; urgency=low
+
+  * debian/control
+    - add "Depends: dpkg (>= 1.15.6~)" to deal with Lintian warning
+      "data.tar.xz-member-without-dpkg-pre-depends"
+  * debian/copyright
+    - update "Format:" field to
+      http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+      and set License: EPL-1.0
+  * debian/rules
+    - install readme_pleiades_changes.txt as upstream ChangeLog
+
+ -- Hideki Yamane <henrich at debian.org>  Tue, 05 Jun 2012 13:07:59 +0900
+
 pleiades (1.3.4~I20120531-dfsg-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index 9b31879..d0a41ff 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://mergedoc.sourceforge.jp/
 
 Package: pleiades
 Architecture: all
-Pre-Depends: debconf
+Pre-Depends: debconf, dpkg (>= 1.15.6~)
 Depends: eclipse, libcommons-lang-java, libcommons-io-java, libjavassist-java,
  ${misc:Depends}
 Description: Japanese Language package for Eclipse using Dynamic AOP, Pleiades
diff --git a/debian/copyright b/debian/copyright
index 430c1f2..c42171c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,33 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/?rev=135
-Name: pleiades
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pleiades
 Source: http://sourceforge.jp/projects/mergedoc/
-Maintainer: Shinji Kashihara (柏原 真二) <cypher256 @ users.sourceforge.jp>
+Upstream-Contact: Shinji Kashihara (柏原 真二) <cypher256 @ users.sourceforge.jp>
 
 Files: *
-Copyright: 2005-2012 Shinji Kashihara
-License: Eclipse Public License v1.0
+Copyright: 2005-2012, Shinji Kashihara <cypher256 @ users.sourceforge.jp>
+License: EPL-1.0
 
- Eclipse Public License -v 1.0
+Files: debian/*
+Copyright: 2009-2012, Hideki Yamane <henrich at debian.org>
+License: EPL-1.0
 
+License: EPL-1.0
  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
  LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
  CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
+ .
  1. DEFINITIONS
-
+ .
  "Contribution" means:
-
+ .
  a) in the case of the initial Contributor, the initial code and documentation
  distributed under this Agreement, and
-
+ .
  b) in the case of each subsequent Contributor:
-
+ .
   i) changes to the Program, and
   ii) additions to the Program;
-
+ .
  where such changes and/or additions to the Program originate from and are
  distributed by that particular Contributor. A Contribution 'originates' from a
  Contributor if it was added to the Program by such Contributor itself or anyone
@@ -32,27 +35,27 @@ License: Eclipse Public License v1.0
  the Program which: (i) are separate modules of software distributed in
  conjunction with the Program under their own license agreement, and (ii) are
  not derivative works of the Program.
-
+ .
  "Contributor" means any person or entity that distributes the Program.
-
+ .
  "Licensed Patents " mean patent claims licensable by a Contributor which are
  necessarily infringed by the use or sale of its Contribution alone or when
  combined with the Program.
-
+ .
  "Program" means the Contributions distributed in accordance with this
  Agreement.
-
+ .
  "Recipient" means anyone who receives the Program under this Agreement,
  including all Contributors.
-
+ .
  2. GRANT OF RIGHTS
-
+ .
  a) Subject to the terms of this Agreement, each Contributor hereby grants
  Recipient a non-exclusive, worldwide, royalty-free copyright license to
  reproduce, prepare derivative works of, publicly display, publicly perform,
  distribute and sublicense the Contribution of such Contributor, if any, and
  such derivative works, in source code and object code form.
-
+ .
  b) Subject to the terms of this Agreement, each Contributor hereby grants
  Recipient a non-exclusive, worldwide, royalty-free patent license under
  Licensed Patents to make, use, sell, offer to sell, import and otherwise
@@ -63,7 +66,7 @@ License: Eclipse Public License v1.0
  covered by the Licensed Patents. The patent license shall not apply to any
  other combinations which include the Contribution. No hardware per se is
  licensed hereunder.
-
+ .
  c) Recipient understands that although each Contributor grants the licenses to
  its Contributions set forth herein, no assurances are provided by any
  Contributor that the Program does not infringe the patent or other intellectual
@@ -75,51 +78,51 @@ License: Eclipse Public License v1.0
  For example, if a third party patent license is required to allow Recipient to
  distribute the Program, it is Recipient's responsibility to acquire that
  license before distributing the Program.
-
+ .
  d) Each Contributor represents that to its knowledge it has sufficient
  copyright rights in its Contribution, if any, to grant the copyright license
  set forth in this Agreement.
-
+ .
  3. REQUIREMENTS
-
+ .
  A Contributor may choose to distribute the Program in object code form under
  its own license agreement, provided that:
-
+ .
   a) it complies with the terms and conditions of this Agreement; and
-
+ .
   b) its license agreement:
-
+ .
    i) effectively disclaims on behalf of all Contributors all warranties and
  conditions, express and implied, including warranties or conditions of title
  and non-infringement, and implied warranties or conditions of merchantability
  and fitness for a particular purpose;
-
+ .
    ii) effectively excludes on behalf of all Contributors all liability for
  damages, including direct, indirect, special, incidental and consequential
  damages, such as lost profits;
- 
+ . 
    iii) states that any provisions which differ from this Agreement are offered by
  that Contributor alone and not by any other party; and
-
+ .
    iv) states that source code for the Program is available from such Contributor,
  and informs licensees how to obtain it in a reasonable manner on or through a
  medium customarily used for software exchange.
-
+ .
  When the Program is made available in source code form:
-
+ .
   a) it must be made available under this Agreement; and
-
+ .
   b) a copy of this Agreement must be included with each copy of the Program.
-
+ .
  Contributors may not remove or alter any copyright notices contained within the
  Program.
-
+ .
  Each Contributor must identify itself as the originator of its Contribution, if
  any, in a manner that reasonably allows subsequent Recipients to identify the
  originator of the Contribution.
-
+ .
  4. COMMERCIAL DISTRIBUTION
-
+ .
  Commercial distributors of software may accept certain responsibilities with
  respect to end users, business partners and the like. While this license is
  intended to facilitate the commercial use of the Program, the Contributor who
@@ -139,7 +142,7 @@ License: Eclipse Public License v1.0
  to control, and cooperate with the Commercial Contributor in, the defense and
  any related settlement negotiations. The Indemnified Contributor may
  participate in any such claim at its own expense.
-
+ .
  For example, a Contributor might include the Program in a commercial product
  offering, Product X. That Contributor is then a Commercial Contributor. If that
  Commercial Contributor then makes performance claims, or offers warranties
@@ -149,9 +152,9 @@ License: Eclipse Public License v1.0
  Contributors related to those performance claims and warranties, and if a court
  requires any other Contributor to pay any damages as a result, the Commercial
  Contributor must pay those damages.
-
+ .
  5. NO WARRANTY
-
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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,
@@ -161,9 +164,9 @@ License: Eclipse Public License v1.0
  of rights under this Agreement , including but not limited to the risks and
  costs of program errors, compliance with applicable laws, damage to or loss of
  data, programs or equipment, and unavailability or interruption of operations.
-
+ .
  6. DISCLAIMER OF LIABILITY
-
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
@@ -171,21 +174,21 @@ License: Eclipse Public License v1.0
  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
  WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+ .
  7. GENERAL
-
+ .
  If any provision of this Agreement is invalid or unenforceable under applicable
  law, it shall not affect the validity or enforceability of the remainder of the
  terms of this Agreement, and without further action by the parties hereto, such
  provision shall be reformed to the minimum extent necessary to make such
  provision valid and enforceable.
-
+ .
  If Recipient institutes patent litigation against any entity (including a
  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
  (excluding combinations of the Program with other software or hardware)
  infringes such Recipient's patent(s), then such Recipient's rights granted
  under Section 2(b) shall terminate as of the date such litigation is filed.
-
+ .
  All Recipient's rights under this Agreement shall terminate if it fails to
  comply with any of the material terms or conditions of this Agreement and does
  not cure such failure in a reasonable period of time after becoming aware of
@@ -194,7 +197,7 @@ License: Eclipse Public License v1.0
  reasonably practicable. However, Recipient's obligations under this Agreement
  and any licenses granted by Recipient relating to the Program shall continue
  and survive.
-
+ .
  Everyone is permitted to copy and distribute copies of this Agreement, but in
  order to avoid inconsistency the Agreement is copyrighted and may only be
  modified in the following manner. The Agreement Steward reserves the right to
@@ -212,13 +215,9 @@ License: Eclipse Public License v1.0
  any Contributor under this Agreement, whether expressly, by implication,
  estoppel or otherwise. All rights in the Program not expressly granted under
  this Agreement are reserved.
-
+ .
  This Agreement is governed by the laws of the State of New York and the
  intellectual property laws of the United States of America. No party to this
  Agreement will bring a legal action under this Agreement more than one year
  after the cause of action arose. Each party waives its rights to a jury trial
  in any resulting litigation.
-
-Files: debian/*
-Copyright: 2009-2012 Hideki Yamane <henrich at debian.org>
-License: Eclipse Public License v1.0
diff --git a/debian/rules b/debian/rules
index 096997f..c1cde8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ override_dh_auto_install:
 	-rm -r $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/readme
 	-rm $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/*cmd
 
+override_dh_installchangelogs:
+	dh_installchangelogs $(CURDIR)/readme/readme_pleiades_changes.txt
+
 override_dh_clean:
 	debconf-updatepo
 	dh_clean

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



More information about the pkg-java-commits mailing list