[Git][haskell-team/DHG_packages][master] 2 commits: argon2: add missing build-dep on pkg-config
Sean Whitton
gitlab at salsa.debian.org
Tue Apr 17 05:30:55 BST 2018
Sean Whitton pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
4e6dd584 by Sean Whitton at 2018-04-16T21:29:14-07:00
argon2: add missing build-dep on pkg-config
- - - - -
09c5e728 by Sean Whitton at 2018-04-16T21:30:40-07:00
argon2: restore d/watch and d/copyright from 1.2.0-3
- - - - -
4 changed files:
- p/haskell-argon2/debian/changelog
- p/haskell-argon2/debian/control
- p/haskell-argon2/debian/copyright
- p/haskell-argon2/debian/watch
Changes:
=====================================
p/haskell-argon2/debian/changelog
=====================================
--- a/p/haskell-argon2/debian/changelog
+++ b/p/haskell-argon2/debian/changelog
@@ -1,3 +1,13 @@
+haskell-argon2 (1.3.0.1-2) UNRELEASED; urgency=medium
+
+ * Add missing build-dep on pkg-config.
+ * Restore d/watch and d/copyright from version 1.2.0-3.
+ The upstream source has not been repacked for the last few uploads so
+ these files were out of line with reality. The repack is not actually
+ needed because the embedded code copy is not used.
+
+ -- Sean Whitton <spwhitton at spwhitton.name> Mon, 16 Apr 2018 21:17:32 -0700
+
haskell-argon2 (1.3.0.1-1) unstable; urgency=medium
* New upstream version.
=====================================
p/haskell-argon2/debian/control
=====================================
--- a/p/haskell-argon2/debian/control
+++ b/p/haskell-argon2/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
libghc-text-short-dev (>= 0.1.2),
libghc-text-short-dev (<< 0.2),
libghc-text-short-prof,
+ pkg-config (>= 0.9.0),
Build-Depends-Indep: ghc-doc,
libghc-text-doc,
libghc-text-short-doc,
=====================================
p/haskell-argon2/debian/copyright
=====================================
--- a/p/haskell-argon2/debian/copyright
+++ b/p/haskell-argon2/debian/copyright
@@ -2,12 +2,31 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: argon2
Upstream-Contact: ollie at ocharles.org.uk
Source: https://hackage.haskell.org/package/argon2
-Files-Excluded: phc-winner-argon2
Files: *
-Copyright: 2016 Ollie Charles
+Copyright: (C) 2016 Ollie Charles
License: BSD-3-clause
+Files: phc-winner-argon2/*
+Copyright: (C) 2015 Daniel Dinu
+ (C) 2015 Dmitry Khovratovich
+ (C) 2015 Jean-Philippe Aumasson
+ (C) 2015 Samuel Neves
+License: CC0
+
+Files: phc-winner-argon2/src/blake2/*
+Copyright: (C) 2013-2015 Samuel Neves
+License: CC0
+
+Files: phc-winner-argon2/src/encoding.c
+Copyright: (C) 2015 Thomas Pornin
+License: CC0
+Comment:
+ This file is provided under the terms of Creative Commons CC0 1.0
+ Public Domain Dedication. To the extent possible under law, the
+ author (Thomas Pornin) has waived all copyright and related or
+ neighboring rights to this file. This work is published from: Canada.
+
Files: debian/*
Copyright: held by the contributors mentioned in debian/changelog
License: BSD-3-clause
@@ -41,3 +60,115 @@ License: BSD-3-clause
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.
+
+License: CC0
+ /Statement of Purpose/
+ .
+ The laws of most jurisdictions throughout the world automatically confer
+ exclusive Copyright and Related Rights (defined below) upon the creator
+ and subsequent owner(s) (each and all, an "owner") of an original work
+ of authorship and/or a database (each, a "Work").
+ .
+ Certain owners wish to permanently relinquish those rights to a Work for
+ the purpose of contributing to a commons of creative, cultural and
+ scientific works ("Commons") that the public can reliably and without
+ fear of later claims of infringement build upon, modify, incorporate in
+ other works, reuse and redistribute as freely as possible in any form
+ whatsoever and for any purposes, including without limitation commercial
+ purposes. These owners may contribute to the Commons to promote the
+ ideal of a free culture and the further production of creative, cultural
+ and scientific works, or to gain reputation or greater distribution for
+ their Work in part through the use and efforts of others.
+ .
+ For these and/or other purposes and motivations, and without any
+ expectation of additional consideration or compensation, the person
+ associating CC0 with a Work (the "Affirmer"), to the extent that he or
+ she is an owner of Copyright and Related Rights in the Work, voluntarily
+ elects to apply CC0 to the Work and publicly distribute the Work under
+ its terms, with knowledge of his or her Copyright and Related Rights in
+ the Work and the meaning and intended legal effect of CC0 on those rights.
+ .
+ *1. Copyright and Related Rights.* A Work made available under CC0 may
+ be protected by copyright and related or neighboring rights ("Copyright
+ and Related Rights"). Copyright and Related Rights include, but are not
+ limited to, the following:
+ .
+ 1. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ 2. moral rights retained by the original author(s) and/or performer(s);
+ 3. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ 4. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ 5. rights protecting the extraction, dissemination, use and reuse of
+ data in a Work;
+ 6. database rights (such as those arising under Directive 96/9/EC of
+ the European Parliament and of the Council of 11 March 1996 on the
+ legal protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+ 7. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+ .
+ *2. Waiver.* To the greatest extent permitted by, but not in
+ contravention of, applicable law, Affirmer hereby overtly, fully,
+ permanently, irrevocably and unconditionally waives, abandons, and
+ surrenders all of Affirmer's Copyright and Related Rights and associated
+ claims and causes of action, whether now known or unknown (including
+ existing as well as future claims and causes of action), in the Work (i)
+ in all territories worldwide, (ii) for the maximum duration provided by
+ applicable law or treaty (including future time extensions), (iii) in
+ any current or future medium and for any number of copies, and (iv) for
+ any purpose whatsoever, including without limitation commercial,
+ advertising or promotional purposes (the "Waiver"). Affirmer makes the
+ Waiver for the benefit of each member of the public at large and to the
+ detriment of Affirmer's heirs and successors, fully intending that such
+ Waiver shall not be subject to revocation, rescission, cancellation,
+ termination, or any other legal or equitable action to disrupt the quiet
+ enjoyment of the Work by the public as contemplated by Affirmer's
+ express Statement of Purpose.
+ .
+ *3. Public License Fallback.* Should any part of the Waiver for any
+ reason be judged legally invalid or ineffective under applicable law,
+ then the Waiver shall be preserved to the maximum extent permitted
+ taking into account Affirmer's express Statement of Purpose. In
+ addition, to the extent the Waiver is so judged Affirmer hereby grants
+ to each affected person a royalty-free, non transferable, non
+ sublicensable, non exclusive, irrevocable and unconditional license to
+ exercise Affirmer's Copyright and Related Rights in the Work (i) in all
+ territories worldwide, (ii) for the maximum duration provided by
+ applicable law or treaty (including future time extensions), (iii) in
+ any current or future medium and for any number of copies, and (iv) for
+ any purpose whatsoever, including without limitation commercial,
+ advertising or promotional purposes (the "License"). The License shall
+ be deemed effective as of the date CC0 was applied by Affirmer to the
+ Work. Should any part of the License for any reason be judged legally
+ invalid or ineffective under applicable law, such partial invalidity or
+ ineffectiveness shall not invalidate the remainder of the License, and
+ in such case Affirmer hereby affirms that he or she will not (i)
+ exercise any of his or her remaining Copyright and Related Rights in the
+ Work or (ii) assert any associated claims and causes of action with
+ respect to the Work, in either case contrary to Affirmer's express
+ Statement of Purpose.
+ .
+ *4. Limitations and Disclaimers.*
+ .
+ 1. No trademark or patent rights held by Affirmer are waived,
+ abandoned, surrendered, licensed or otherwise affected by this document.
+ 2. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy,
+ or the present or absence of errors, whether or not discoverable,
+ all to the greatest extent permissible under applicable law.
+ 3. Affirmer disclaims responsibility for clearing rights of other
+ persons that may apply to the Work or any use thereof, including
+ without limitation any person's Copyright and Related Rights in the
+ Work. Further, Affirmer disclaims responsibility for obtaining any
+ necessary consents, permissions or other rights required for any use
+ of the Work.
+ 4. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
=====================================
p/haskell-argon2/debian/watch
=====================================
--- a/p/haskell-argon2/debian/watch
+++ b/p/haskell-argon2/debian/watch
@@ -1,3 +1,2 @@
version=3
-opts=repacksuffix=+dfsg1,dversionmangle=s/\+dfsg1\d*$// \
https://hackage.haskell.org/package/argon2/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/46e0e31276005e6e2f11ace6460aaa43733a85ae...09c5e72870d96a3f81b855f4d426e334d02e9475
---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/46e0e31276005e6e2f11ace6460aaa43733a85ae...09c5e72870d96a3f81b855f4d426e334d02e9475
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180417/5251a8a3/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list