This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "librobert-hooke-clojure packaging".
The branch, master has been updated
via ecb0866a3c303ba5da5917d0a78f34df085afcf9 (commit)
via 96156c362b06a2b3f2d2857ec7e8889fa2111e2b (commit)
via b5ebf4c171bc237a4d68cbcac810d613b7aa3ee6 (commit)
via 95fc72d589ce68a5147890d7b4e699b4274e5660 (commit)
from ad0249192addb970f028ba45cb1bc676547a3ca9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ecb0866a3c303ba5da5917d0a78f34df085afcf9
Author: Wolodja Wentland <babi...@gmail.com>
Date: Sat Jul 16 22:47:00 2011 +0100
Depend on libtext-markdown-perl or markdown
We do not necessarily need markdown from the libtext-markdown-perl package,
but can also use the one from the original markdown one.
commit 96156c362b06a2b3f2d2857ec7e8889fa2111e2b
Author: Wolodja Wentland <babi...@gmail.com>
Date: Sat Jul 16 22:43:40 2011 +0100
B-D-Indep for build deps
Use Build-Depends-Indep for build dependencies that are not needed to
satisfy
the clean target.
commit b5ebf4c171bc237a4d68cbcac810d613b7aa3ee6
Author: Wolodja Wentland <babi...@gmail.com>
Date: Sat Jul 16 22:37:59 2011 +0100
Correct format URL for DEP5
We have been using a non-reachable URL in the Format: field due to the
alioth
migration, which is fixed in this patch. Once DEP5 is finalised and included
in the policy, we should use a URL like:
http://www.debian.org/doc/debian-policy/copyright-format/1.0
This patch also uses a different textwidth (78) for the licenses.
commit 95fc72d589ce68a5147890d7b4e699b4274e5660
Author: Wolodja Wentland <babi...@gmail.com>
Date: Sat Jul 16 22:20:15 2011 +0100
Generate valid HTML from Markdown
-----------------------------------------------------------------------
Summary of changes:
debian/clean | 2 -
debian/control | 6 +-
debian/copyright | 327 +++++++++++++++----------------
debian/doc-base | 10 -
debian/docs | 2 +-
debian/librobert-hooke-clojure.doc-base | 14 ++
debian/rules | 22 ++-
7 files changed, 196 insertions(+), 187 deletions(-)
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 6310558..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-README.html
-robert-hooke.jar
diff --git a/debian/control b/debian/control
index 820574f..158f04f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders: Daigo Moriwaki <da...@debian.org>,
Wolodja Wentland <babi...@gmail.com>
Build-Depends: debhelper (>> 8),
javahelper (>= 0.32),
- default-jdk,
- clojure1.2 | clojure,
- libtext-markdown-perl
+Build-Depends-Indep: default-jdk,
+ clojure1.2 | clojure,
+ libtext-markdown-perl | markdown
Standards-Version: 3.9.2
Homepage: https://github.com/technomancy/robert-hooke
Vcs-Git: git://git.debian.org/pkg-java/librobert-hooke-clojure.git
diff --git a/debian/copyright b/debian/copyright
index 4676f46..2902ecd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
Upstream-Contact: Phil Hagelberg <technoma...@gmail.com>
Upstream-Name: robert-hooke
Source: https://github.com/technomancy/robert-hooke.
@@ -21,8 +21,8 @@ License: EPL-1.0
License: BSD-2-clause
All rights reserved.
.
- Redistribution and use in source and binary forms, with or without
modification, are
- permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
.
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
@@ -35,21 +35,21 @@ License: BSD-2-clause
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 HOLDERS 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.
+ 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.
.
The views and conclusions contained in the software and documentation are
those of the authors and should not be interpreted as representing official
policies, either expressed or implied, of the copyright holders.
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.
+ 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
.
@@ -64,89 +64,85 @@ License: EPL-1.0
.
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 acting on such Contributor's
- behalf. Contributions do not include additions to 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.
+ 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 acting on such Contributor's behalf. Contributions do not include
+ additions to 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.
+ "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.
+ "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 transfer the Contribution of such Contributor, if
- any, in source code and object code form. This patent license shall
- apply to the combination of the Contribution and the Program if, at
- the time the Contribution is added by the Contributor, such addition
- of the Contribution causes such combination to be covered by the
- Licensed Patents. The patent license shall not apply to any other
- combinations which include the Contribution. No hardware per se is
+ 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
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of the
+ Contribution and the Program if, at the time the Contribution is added by the
+ Contributor, such addition of the Contribution causes such combination to be
+ 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 property rights of any other entity. Each
- Contributor disclaims any liability to Recipient for claims brought by
- any other entity based on infringement of intellectual property rights
- or otherwise. As a condition to exercising the rights and licenses
- granted hereunder, each Recipient hereby assumes sole responsibility
- to secure any other intellectual property rights needed, if any. For
- example, if a third party patent license is required to allow
- Recipient to distribute the Program, it is Recipient's responsibility
+ 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 property rights of any other entity. Each Contributor disclaims
+ any liability to Recipient for claims brought by any other entity based on
+ infringement of intellectual property rights or otherwise. As a condition to
+ exercising the rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual property rights
+ needed, if any. 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.
+ 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 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;
+ 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;
+ 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
+ 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.
+ 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:
.
@@ -154,121 +150,114 @@ License: EPL-1.0
.
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.
+ 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.
+ 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 includes the Program in a
- commercial product offering should do so in a manner which does not
- create potential liability for other Contributors. Therefore, if a
- Contributor includes the Program in a commercial product offering,
- such Contributor ("Commercial Contributor") hereby agrees to defend
- and indemnify every other Contributor ("Indemnified Contributor")
- against any losses, damages and costs (collectively "Losses") arising
- from claims, lawsuits and other legal actions brought by a third party
- against the Indemnified Contributor to the extent caused by the acts
- or omissions of such Commercial Contributor in connection with its
- distribution of the Program in a commercial product offering. The
- obligations in this section do not apply to any claims or Losses
- relating to any actual or alleged intellectual property
- infringement. In order to qualify, an Indemnified Contributor must: a)
- promptly notify the Commercial Contributor in writing of such claim,
- and b) allow the Commercial Contributor tocontrol, 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 related to Product X, those performance
- claims and warranties are such Commercial Contributor's responsibility
- alone. Under this section, the Commercial Contributor would have to
- defend claims against the other 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.
+ 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
+ includes the Program in a commercial product offering should do so in a
+ manner which does not create potential liability for other Contributors.
+ Therefore, if a Contributor includes the Program in a commercial product
+ offering, such Contributor ("Commercial Contributor") hereby agrees to defend
+ and indemnify every other Contributor ("Indemnified Contributor") against any
+ losses, damages and costs (collectively "Losses") arising from claims,
+ lawsuits and other legal actions brought by a third party against the
+ Indemnified Contributor to the extent caused by the acts or omissions of such
+ Commercial Contributor in connection with its distribution of the Program in
+ a commercial product offering. The obligations in this section do not apply
+ to any claims or Losses relating to any actual or alleged intellectual
+ property infringement. In order to qualify, an Indemnified Contributor must:
+ a) promptly notify the Commercial Contributor in writing of such claim, and
+ b) allow the Commercial Contributor tocontrol, 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 related to Product X, those performance claims and warranties are
+ such Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ 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, NON-INFRINGEMENT, MERCHANTABILITY
- OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
- responsible for determining the appropriateness of using and
- distributing the Program and assumes all risks associated with its
- exercise 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
+ 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, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+ PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all risks
+ associated with its exercise 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 PROFITS), 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 OR
- DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
- HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ 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 PROFITS), 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 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 such noncompliance. If all Recipient's
- rights under this Agreement terminate, Recipient agrees to cease use
- and distribution of the Program as soon as reasonably
- practicable. However, Recipient's obligations under this Agreement and
- any licenses granted by Recipient relating to the Program shall
+ 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 such noncompliance. If all Recipient's rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as 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 publish new versions (including revisions) of
- this Agreement from time to time. No one other than the Agreement
- Steward has the right to modify this Agreement. The Eclipse Foundation
- is the initial Agreement Steward. The Eclipse Foundation may assign
- the responsibility to serve as the Agreement Steward to a suitable
- separate entity. Each new version of the Agreement will be given a
- distinguishing version number. The Program (including Contributions)
- may always be distributed subject to the version of the Agreement
- under which it was received. In addition, after a new version of the
- Agreement is published, Contributor may elect to distribute the
- Program (including its Contributions) under the new version. Except as
- expressly stated in Sections 2(a) and 2(b) above, Recipient receives
- no rights or licenses to the intellectual property of 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 Washington 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.
+ 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
+ publish new versions (including revisions) of this Agreement from time to
+ time. No one other than the Agreement Steward has the right to modify this
+ Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+ Eclipse Foundation may assign the responsibility to serve as the Agreement
+ Steward to a suitable separate entity. Each new version of the Agreement will
+ be given a distinguishing version number. The Program (including
+ Contributions) may always be distributed subject to the version of the
+ Agreement under which it was received. In addition, after a new version of
+ the Agreement is published, Contributor may elect to distribute the Program
+ (including its Contributions) under the new version. Except as expressly
+ stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+ licenses to the intellectual property of 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 Washington 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.
diff --git a/debian/doc-base b/debian/doc-base
deleted file mode 100644
index 05b9d1a..0000000
--- a/debian/doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: robert-hooke
-Title: Robert-Hooke tutorial
-Author: Phil Hagelberg, Robert Downey
-Abstract: A short tutorial on the Clojure function wrapper library
- robert-hooke.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/librobert-hooke-clojure/README.html
-Files: /usr/share/doc/librobert-hooke-clojure/README.html
diff --git a/debian/docs b/debian/docs
index 93ebb92..551fde5 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-README.html
README.md
+doc/html
diff --git a/debian/librobert-hooke-clojure.doc-base
b/debian/librobert-hooke-clojure.doc-base
new file mode 100644
index 0000000..2f96b9d
--- /dev/null
+++ b/debian/librobert-hooke-clojure.doc-base
@@ -0,0 +1,14 @@
+Document: robert-hooke
+Title: Robert-Hooke tutorial
+Author: Phil Hagelberg, Robert Downey
+Abstract: A short tutorial on the Clojure function wrapper library
+ robert-hooke.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/librobert-hooke-clojure/html/README.html
+Files: /usr/share/doc/librobert-hooke-clojure/html/README.html
+
+Format: Text
+Index: /usr/share/doc/librobert-hooke-clojure/README.md
+Files: /usr/share/doc/librobert-hooke-clojure/README.md
diff --git a/debian/rules b/debian/rules
index 2f7f492..b4477f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,33 @@ include /usr/share/javahelper/java-vars.mk
DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d '
')
DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed
's/-[^-]*$$//')
+MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md))
PRODUCED_JAR=robert-hooke.jar
%:
dh $@ --with javahelper
-override_jh_build:
+override_jh_build: $(MDWN_DOCS)
jar cf $(PRODUCED_JAR) -C src .
- markdown README.md > README.html
+ mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html
+
+override_jh_clean:
+ jh_clean
+ rm -f $(CURDIR)/$(PRODUCED_JAR)
+ rm -rf $(CURDIR)/doc/html
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+
+%.html:%.md
+ @echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' \
+ '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>' > $@
+ @echo "<html>" >> $@
+ @echo "<head>" >> $@
+ @echo "<title>$(shell head -n 1 $< | sed 's/^#*\s*//')</title>" >> $@
+ @echo "</head>" >> $@
+ @echo "<body>" >> $@
+ markdown $< >> $@
+ @echo "</body>" >> $@
+ @echo "</html>" >> $@
hooks/post-receive
--
librobert-hooke-clojure packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
