[med-svn] r9910 - trunk/packages/raster3d/trunk/debian

Andreas Tille tille at alioth.debian.org
Wed Mar 7 08:08:44 UTC 2012


Author: tille
Date: 2012-03-07 08:08:43 +0000 (Wed, 07 Mar 2012)
New Revision: 9910

Modified:
   trunk/packages/raster3d/trunk/debian/changelog
   trunk/packages/raster3d/trunk/debian/compat
   trunk/packages/raster3d/trunk/debian/control
   trunk/packages/raster3d/trunk/debian/copyright
   trunk/packages/raster3d/trunk/debian/upstream
Log:
- change Build-Depends of the package from libpng12-dev to libpng-dev
- debhelper 9 to enable hardening flags
- moved extra references from copyright to upstream_additional_references for later inclusion into upstream
- debian/copyright now DEP5 compatible
- Standards-Version 3.9.3


Modified: trunk/packages/raster3d/trunk/debian/changelog
===================================================================
--- trunk/packages/raster3d/trunk/debian/changelog	2012-03-07 08:06:17 UTC (rev 9909)
+++ trunk/packages/raster3d/trunk/debian/changelog	2012-03-07 08:08:43 UTC (rev 9910)
@@ -1,3 +1,26 @@
+raster3d (3.0-2-4) unstable; urgency=low
+
+  [ Charles Plessy ]
+  * debian/upstream-metadata.yaml renamed to debian/upstream
+
+  [ Andreas Tille ]
+  * debian/control:
+     - change Build-Depends of the package from libpng12-dev to libpng-dev
+       Closes: #662490
+     - Standards-Version: 3.9.3 (no changes needed)
+  * debian/copyright:
+     - Changed to DEP5 and checked via
+         cme fix dpkg-copyright
+     - moved extra references to debian/upstream_additional_references
+  * debian/upstream: Added DOI and URL fields
+  * debian/upstream_additional_references: Moved extra references
+    from debian/copyright to this file.  It will be included into
+    debian/upstream once is clarified how to handle more than one
+    reference
+  * Debhelper 9 (control+compat)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 07 Mar 2012 08:21:33 +0100
+
 raster3d (3.0-2-3) unstable; urgency=low
 
   * Standards-Version: 3.9.2

Modified: trunk/packages/raster3d/trunk/debian/compat
===================================================================
--- trunk/packages/raster3d/trunk/debian/compat	2012-03-07 08:06:17 UTC (rev 9909)
+++ trunk/packages/raster3d/trunk/debian/compat	2012-03-07 08:08:43 UTC (rev 9910)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/raster3d/trunk/debian/control
===================================================================
--- trunk/packages/raster3d/trunk/debian/control	2012-03-07 08:06:17 UTC (rev 9909)
+++ trunk/packages/raster3d/trunk/debian/control	2012-03-07 08:08:43 UTC (rev 9910)
@@ -5,13 +5,13 @@
 DM-Upload-Allowed: yes
 Uploaders: Nelson A. de Oliveira <naoliv at debian.org>,
            Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                gfortran,
                libgd2-xpm-dev,
                libjpeg-dev,
-               libpng12-dev,
+               libpng-dev,
                libtiff4-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/raster3d/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/raster3d/trunk/
 Homepage: http://www.bmsc.washington.edu/raster3d/raster3d.html

Modified: trunk/packages/raster3d/trunk/debian/copyright
===================================================================
--- trunk/packages/raster3d/trunk/debian/copyright	2012-03-07 08:06:17 UTC (rev 9909)
+++ trunk/packages/raster3d/trunk/debian/copyright	2012-03-07 08:08:43 UTC (rev 9910)
@@ -1,103 +1,102 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Ethan Merritt <merritt at u.washington.edu>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Raster3D
+Upstream-Contact: Ethan Merritt <merritt at u.washington.edu>
 Source: http://skuld.bmsc.washington.edu/raster3d/raster3d.html
-Name: Raster3D
 
 Files: *
-Copyright 1996-2011 © Ethan Merritt, David J. Bacon and Wayne F. Anderson
-License:  Artistic License 2.0
-
-   Copyright (c) 2000-2006, The Perl Foundation.
-
+Copyright: 1996-2011 Ethan Merritt, David J. Bacon and Wayne F. Anderson
+License: Artistic
+   Artistic License 2.0, Copyright (c) 2000-2006, The Perl Foundation.
+ .
    Everyone is permitted to copy and distribute verbatim copies of this
    license document, but changing it is not allowed.
-
+ .
  Preamble
-
+ .
    This license establishes the terms under which a given free software
    Package may be copied, modified, distributed, and/or redistributed. The
    intent is that the Copyright Holder maintains some artistic control
    over the development of that Package while still keeping the Package
    available as open source and free software.
-
+ .
    You are always permitted to make arrangements wholly outside of this
    license directly with the Copyright Holder of a given Package. If the
    terms of this license do not permit the full use that you propose to
    make of the Package, you should contact the Copyright Holder and seek a
    different licensing arrangement.
-
+ .
  Definitions
-
+ .
    "Copyright Holder" means the individual(s) or organization(s) named in
    the copyright notice for the entire Package.
-
+ .
    "Contributor" means any party that has contributed code or other
    material to the Package, in accordance with the Copyright Holder's
    procedures.
-
+ .
    "You" and "your" means any person who would like to copy, distribute,
    or modify the Package.
-
+ .
    "Package" means the collection of files distributed by the Copyright
    Holder, and derivatives of that collection and/or of those files. A
    given Package may consist of either the Standard Version, or a Modified
    Version.
-
+ .
    "Distribute" means providing a copy of the Package or making it
    accessible to anyone else, or in the case of a company or organization,
    to others outside of your company or organization.
-
+ .
    "Distributor Fee" means any fee that you charge for Distributing this
    Package or providing support for this Package to another party. It does
    not mean licensing fees.
-
+ .
    "Standard Version" refers to the Package if it has not been modified,
    or has been modified only in ways explicitly requested by the Copyright
    Holder.
-
+ .
    "Modified Version" means the Package, if it has been changed, and such
    changes were not explicitly requested by the Copyright Holder.
-
+ .
    "Original License" means this Artistic License as Distributed with the
    Standard Version of the Package, in its current version or as it may be
    modified by The Perl Foundation in the future.
-
+ .
    "Source" form means the source code, documentation source, and
    configuration files for the Package.
-
+ .
    "Compiled" form means the compiled bytecode, object code, binary, or
    any other form resulting from mechanical transformation or translation
    of the Source form.
-
+ .
  Permission for Use and Modification Without Distribution
-
+ .
    (1) You are permitted to use the Standard Version and create and use
    Modified Versions for any purpose without restriction, provided that
    you do not Distribute the Modified Version.
-
+ .
  Permissions for Redistribution of the Standard Version
-
+ .
    (2) You may Distribute verbatim copies of the Source form of the
    Standard Version of this Package in any medium without restriction,
    either gratis or for a Distributor Fee, provided that you duplicate all
    of the original copyright notices and associated disclaimers. At your
    discretion, such verbatim copies may or may not include a Compiled form
    of the Package.
-
+ .
    (3) You may apply any bug fixes, portability changes, and other
    modifications made available from the Copyright Holder. The resulting
    Package will still be considered the Standard Version, and as such will
    be subject to the Original License.
-
+ .
  Distribution of Modified Versions of the Package as Source
-
+ .
    (4) You may Distribute your Modified Version as Source (either gratis
    or for a Distributor Fee, and with or without a Compiled form of the
    Modified Version) provided that you clearly document how it differs
    from the Standard Version, including, but not limited to, documenting
    any non-standard features, executables, or modules, and provided that
    you do at least ONE of the following:
-
+ .
    (a) make the Modified Version available to the Copyright Holder of the
    Standard Version, under the Original License, so that the Copyright
    Holder may include your modifications in the Standard Version.
@@ -116,7 +115,7 @@
    Distributor Fees are allowed.
    Distribution of Compiled Forms of the Standard Version or Modified
    Versions without the Source
-
+ .
    (5) You may Distribute Compiled forms of the Standard Version without
    the Source, provided that you include complete instructions on how to
    get the Source of the Standard Version. Such instructions must be valid
@@ -126,13 +125,13 @@
    you provide valid instructions or cease distribution within thirty days
    after you become aware that the instructions are invalid, then you do
    not forfeit any of your rights under this license.
-
+ .
    (6) You may Distribute a Modified Version in Compiled form without the
    Source, provided that you comply with Section 4 with respect to the
    Source of the Modified Version.
-
+ .
  Aggregating or Linking the Package
-
+ .
    (7) You may aggregate the Package (either the Standard Version or
    Modified Version) with other packages and Distribute the resulting
    aggregation provided that you do not charge a licensing fee for the
@@ -140,37 +139,37 @@
    components in the aggregation are permitted. The terms of this license
    apply to the use and Distribution of the Standard or Modified Versions
    as included in the aggregation.
-
+ .
    (8) You are permitted to link Modified and Standard Versions with other
    works, to embed the Package in a larger work of your own, or to build
    stand-alone binary or bytecode versions of applications that include
    the Package, and Distribute the result without restriction, provided
    the result does not expose a direct interface to the Package.
-
+ .
  Items That are Not Considered Part of a Modified Version
-
+ .
    (9) Works (including, but not limited to, modules and scripts) that
    merely extend or make use of the Package, do not, by themselves, cause
    the Package to be a Modified Version. In addition, such works are not
    considered parts of the Package itself, and are not subject to the
    terms of this license.
-
+ .
  General Provisions
-
+ .
    (10) Any use, modification, and distribution of the Standard or
    Modified Versions is governed by this Artistic License. By using,
    modifying or distributing the Package, you accept this license. Do not
    use, modify, or distribute the Package, if you do not accept this
    license.
-
+ .
    (11) If your Modified Version has been derived from a Modified Version
    made by someone other than you, you are nevertheless required to ensure
    that your Modified Version complies with the requirements of this
    license.
-
+ .
    (12) This license does not grant you the right to use any trademark,
    service mark, tradename, or logo of the Copyright Holder.
-
+ .
    (13) This license includes the non-exclusive, worldwide, free-of-charge
    patent license to make, have made, use, offer to sell, sell, import and
    otherwise transfer the Package with respect to any patent claims
@@ -180,7 +179,7 @@
    Package constitutes direct or contributory patent infringement, then
    this Artistic License to you shall terminate on the date that such
    litigation is filed.
-
+ .
    (14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT
    HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED
    WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
@@ -196,14 +195,9 @@
    The next upstream version will feature the license change also in the
    source code.
 
-REFERENCES
-Bacon, D.J., & Anderson, W.F. (1988) ``A Fast Algorithm for
-Rendering Space-Filling Molecule Pictures''. (abstract of paper
-presented at the Seventh Annual Meeting of the Molecular Graphics
-Society). J. Molec. Graphics 6, 219-220.
-Kraulis, P.J. (1991) ``MOLSCRIPT: a program to produce both detailed
-and schematic plots of protein structures''. J. Appl. Cryst. 24, 946-950.
-Merritt, E.A. & Murphy, M.E.P. (1994) ``Raster3D Version 2.0 - A Program
-for Photorealistic Molecular Graphics''. Acta Cryst. D50, 869-873.
-Merritt, E.A. & Bacon, D.J. (1997) ``Raster3D Photorealistic Molecular
-Graphics''. Methods in Enzymology 277, 505-524.
+Files: debian/*
+Copyright: 2005-2008 Nelson A. de Oliveira <naoliv at gmail.com>
+           2008-2012 Andreas Tille <tille at debian.org>
+License: Artistic
+ Same as program itself
+

Modified: trunk/packages/raster3d/trunk/debian/upstream
===================================================================
--- trunk/packages/raster3d/trunk/debian/upstream	2012-03-07 08:06:17 UTC (rev 9909)
+++ trunk/packages/raster3d/trunk/debian/upstream	2012-03-07 08:08:43 UTC (rev 9910)
@@ -1,11 +1,13 @@
 Homepage: http://skuld.bmsc.washington.edu/raster3d/
 Name: Raster3D
-Reference-PMID: 18488322
 Reference:
  Article: MerrittBacon1997
  Author: Merritt, E.A. and Bacon, D.J.
  Title: Raster3D Photorealistic Molecular Graphics
  Journal: Methods in Enzymology
+ PMID: 18488322
+ DOI: 10.1016/S0076-6879(97)77028-9
  Volume: 277
  Pages: 505-524
  Year: 1997
+ URL: http://www.sciencedirect.com/science/article/pii/S0076687997770289




More information about the debian-med-commit mailing list