[tryton-debian-vcs] tryton-sao branch debian updated. debian/4.0.3-1-2-g3c37c8e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Aug 30 11:15:43 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-sao.git;a=commitdiff;h=debian/4.0.3-1-2-g3c37c8e
commit 3c37c8e7d9be56b1b7a654458dfa373931c111be
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 30 13:09:24 2016 +0200
Adapting d/copyright for the next release.
This commit prepares for the next upstream release of sao, that will
especially contain http://hg.tryton.org/sao/rev/5b6089a3ffa3 making
tryton-sao DFSG-compatible.
References:
http://bugs.tryton.org/issue5788
http://codereview.tryton.org/31461002/
diff --git a/debian/copyright b/debian/copyright
index a42ee00..405f342 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,38 @@ Files: debian/*
Copyright: 2016 Mathias Behrle <mbehrle at debian.org>
License: GPL-3+
+Files: images/*
+Copyright: not applicable
+License: public-domain
+
+Files: images/tryton-ok.svg
+ images/tryton-cancel.svg
+Copyright: Peter Mattis <petm at xcf.berkeley.edu>
+ Spencer Kimball <spencer at xcf.berkeley.edu>
+ Josh MacDonald <jmacd at xcf.berkeley.edu>
+ Shawn T. Amundson <amundson at gtk.org>
+ Jerome Bolliet <bolliet at gtk.org>
+ Damon Chaplin <damon at gtk.org>
+ Tony Gale <gale at gtk.org>
+ Jeff Garzik <jgarzik at gtk.org>
+ Lars Hamann <lars at gtk.org>
+ Raja R Harinath <harinath at gtk.org>
+ Carsten Haitzler <raster at gtk.org>
+ Tim Janik <timj at gtk.org>
+ Stefan Jeske <stefan at gtk.org>
+ Elliot Lee <sopwith at gtk.org>
+ Raph Levien <raph at gtk.org>
+ Ian Main <imain at gtk.org>
+ Federico Mena <quartic at gtk.org>
+ Paolo Molaro <lupus at gtk.org>
+ Jay Painter <jpaint at gtk.org>
+ Manish Singh <manish at gtk.org>
+ Owen Taylor <otaylor at gtk.org>
+License: GPL-3+
+Comment: Source https://git.gnome.org/browse/gtk+/tree/
+ Originally licensed under LGPL-2+, redistributed by the Tryton project
+ under GPL-3+ (https://bugs.tryton.org/issue5788).
+
License: GPL-3+
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
@@ -27,3 +59,68 @@ License: GPL-3+
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
+
+License: public-domain
+ The icons used are generally taken from
+ http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+ .
+ Some icons were adapted by Cedric Krier 2011
+ .
+ Upstream Authors: 2005-2009
+ .
+ Ulisse Perusin <uli.peru at gmail.com>
+ Steven Garrity <sgarrity at silverorange.com>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Ryan Collier <rcollier at novell.com>
+ Rodney Dawes <dobey at novell.com>
+ Andreas Nilsson <nisses.mail at home.se>
+ Tuomas Kuosmanen <tigert at tigert.com>
+ Garrett LeSage <garrett at novell.com>
+ Jakub Steiner <jimmac at novell.com>
+ .
+ In the preparation of the 0.8.90 release Novell took care of tracking
+ down all the contributors to get them to relicense their artwork
+ into Public Domain.
+ .
+ The COPYING file of the tarball states the following:
+ | The icons in this repository are herefore released into the Public Domain.
+ .
+ Additionally the copyright status of the files was tracked in the CVS and the
+ rdf properties of the SVGs adjusted for all files that were put into Public
+ Domain (see rdf:about and rdf:resource). Both fields contain a link to the
+ Creative Commons Public Domain Dediciation[0] as reproduced below:
+ | Public Domain Dedication
+ |
+ | Copyright-Only Dedication (based on United States law) or Public Domain
+ | Certification
+ |
+ | The person or persons who have associated work with this document (the
+ | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
+ | of his knowledge, the work of authorship identified is in the public
+ | domain of the country from which the work is published, or (b)
+ | hereby dedicates whatever copyright the dedicators holds in the work
+ | of authorship identified below (the "Work") to the public domain. A
+ | certifier, moreover, dedicates any copyright interest he may have in
+ | the associated work, and for these purposes, is described as a
+ | "dedicator" below.
+ |
+ | A certifier has taken reasonable steps to verify the copyright
+ | status of this work. Certifier recognizes that his good faith efforts
+ | may not shield him from liability if in fact the work certified is not
+ | in the public domain.
+ |
+ | Dedicator makes this dedication for the benefit of the public at
+ | large and to the detriment of the Dedicator's heirs and successors.
+ | Dedicator intends this dedication to be an overt act of relinquishment
+ | in perpetuity of all present and future rights under copyright law,
+ | whether vested or contingent, in the Work. Dedicator understands that
+ | such relinquishment of all rights includes the relinquishment of all
+ | rights to enforce (by lawsuit or otherwise) those copyrights in the
+ | Work.
+ |
+ | Dedicator recognizes that, once placed in the public domain, the Work
+ | may be freely reproduced, distributed, transmitted, used, modified,
+ | built upon, or otherwise exploited by anyone for any purpose, commercial
+ | or non-commercial, and in any way, including by methods that have not
+ | yet been invented or conceived.
+ [0] http://creativecommons.org/licenses/publicdomain/
commit 3ebdea5d0161cb398d3a35c20096ca6d0d6fdc55
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 30 12:24:37 2016 +0200
Adding the same copyright header to the generated minified file like upstream does.
diff --git a/debian/rules b/debian/rules
index d19256b..f6a4ff0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,13 @@
#export DH_VERBOSE=1
MAJOR = $(shell dpkg-parsechangelog -SVersion | cut -d'.' -f 1,2)
+VERSION = $(shell dpkg-parsechangelog -SVersion | cut -d'-' -f 1)
+define BANNER
+/*! tryton-sao-$(VERSION) | GPL-3
+This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. */
+endef
+export BANNER
# The sequence of the files matters, so we can not just use a wildcard
JSFILES = src/sao.js src/rpc.js src/pyson.js src/session.js src/model.js \
@@ -30,7 +37,7 @@ override_dh_install:
for FILE in $(JSFILES); do cat $$FILE >> dist/tryton-sao.js; done
# Grunt task uglify: Minify the js file
- uglifyjs -o dist/tryton-sao.min.js dist/tryton-sao.js
+ uglifyjs --preamble "$$BANNER" -o dist/tryton-sao.min.js dist/tryton-sao.js
# Grunt task less: Compile and compress the css files
lessc --include-path=src:/usr/share/javascript/bootstrap/less/ src/*.less dist/tryton-sao.css
--
tryton-sao
More information about the tryton-debian-vcs
mailing list