[med-svn] [r-bioc-geneplotter] 04/08: Merge tag 'upstream/1.48.0'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository r-bioc-geneplotter.

commit 240ffde8a9ca68a62ba330218799fca1100e1106
Merge: e6a73e0 888bc80
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Fri Jan 15 07:32:02 2016 -0800

    Merge tag 'upstream/1.48.0'
    
    Upstream version 1.48.0

 debian/copyright | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --cc debian/copyright
index 55f684a,0000000..efa5840
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,0 +1,62 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Upstream-Name: DESeq2
- Source: https://bioconductor.org/packages/DESeq2/
++Upstream-Name: geneplotter
++Source: https://bioconductor.org/packages/geneplotter/
 +
 +Files: *
- Copyright: © 2014 Michael Love, Simon Anders, Wolfgang Huber
- License: LGPL-3.0+
++Copyright: © 2001 R. Gentelman and biocore
++License: Artistic-2.0
 +
 +Files: debian/*
 +Copyright: © 2016 Regents of the University of California
- License: LGPL-3.0+
- 
++License: Artistic-2.0
 +
++License: Artistic-2.0
++			 The "Artistic License"
++ .
++				Preamble
++ .
++ 1. You may make and give away verbatim copies of the source form of the
++    Standard Version of this Package without restriction, provided that
++    you duplicate all of the original copyright notices and associated
++    disclaimers.
++ .
++ 2. You may apply bug fixes, portability fixes and other modifications
++    derived from the Public Domain or from the Copyright Holder.  A
++    Package modified in such a way shall still be considered the Standard
++    Version.
++ .
++ 3. You may otherwise modify your copy of this Package in any way,
++    provided that you insert a prominent notice in each changed file stating
++    how and when you changed that file, and provided that you do at least
++    ONE of the following:
++ .
++    a) place your modifications in the Public Domain or otherwise make them
++    Freely Available, such as by posting said modifications to Usenet or
++    an equivalent medium, or placing the modifications on a major archive
++    site such as uunet.uu.net, or by allowing the Copyright Holder to include
++    your modifications in the Standard Version of the Package.
++ .
++    b) use the modified Package only within your corporation or organization.
++ .
++    c) rename any non-standard executables so the names do not conflict
++    with standard executables, which must also be provided, and provide
++    a separate manual page for each non-standard executable that clearly
++    documents how it differs from the Standard Version.
++ .
++    d) make other distribution arrangements with the Copyright Holder.
++ .
++ 4. You may distribute the programs of this Package in object code or
++    executable form, provided that you do at least ONE of the following:
++ .
++    a) distribute a Standard Version of the executables and library files,
++    together with instructions (in the manual page or equivalent) on where
++    to get the Standard Version.
++ .
++    b) accompany the distribution with the machine-readable source of
++    the Package with your modifications.
++ .
++    c) give non-standard executables non-standard names, and clearly
++    document the differences in manual pages (or equivalent), together
++    with instructions on where to get the Standard Version.
++ .
++    d) make other distribution arrangements with the Copyright Holder.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-bioc-geneplotter.git