[med-svn] [relion] 02/04: Fixed d/copyright

Tue Oct 21 14:14:33 UTC 2014

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

rfehren-guest pushed a commit to branch master
in repository relion.

commit db37829f993934d98b303e0e711ab8fd747f010c
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Tue Oct 21 14:04:02 2014 +0000

    Fixed d/copyright
---
 debian/copyright | 172 +++----------------------------------------------------
 1 file changed, 7 insertions(+), 165 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a992881..22abd18 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,165 +4,9 @@ Upstream-Contact: scheres at mrc-lmb.cam.ac.uk
 Source: http://www2.mrc-lmb.cam.ac.uk/groups/scheres/download_relion.html
 Files-Excluded: external
 
-Files: ./README
- ./NEWS
- ./AUTHORS
- ./COPYING
- ./ChangeLog
- ./INSTALL
- ./INSTALL.sh
- ./autogen.sh
- ./Makefile.am
- ./Makefile.in
- ./aclocal.m4
- ./compile
- ./config.guess
- ./config.h.in
- ./config.sub
- ./configure
- ./configure.ac
- ./depcomp
- ./install-sh
- ./missing
- ./relion.pc.in
- ./scripts/qsub.csh
- ./scripts/star_datablock_ctfdat
- ./scripts/star_datablock_singlef
- ./scripts/star_datablock_stack
- ./scripts/star_loopheader
- ./scripts/star_plottable
- ./scripts/star_printtable
- ./scripts/star_datablock_singlefiles
- ./relion.h
- ./src/assembly.cpp
- ./src/assembly.h
- ./src/autopicker.h
- ./src/autopicker_mpi.h
- ./src/gui_entries.h
- ./src/Healpix_2.15a/lsconstants.h
- ./src/apps/autopick.cpp
- ./src/apps/autopick_mpi.cpp
- ./src/apps/display.cpp
- ./src/apps/find_tiltpairs.cpp
- ./src/apps/image_handler.cpp
- ./src/apps/maingui.cpp
- ./src/apps/manualpick.cpp
- ./src/apps/mask_create.cpp
- ./src/apps/particle_polish.cpp
- ./src/apps/particle_polish_mpi.cpp
- ./src/apps/particle_sort.cpp
- ./src/apps/particle_sort_mpi.cpp
- ./src/apps/postprocess.cpp
- ./src/apps/preprocess.cpp
- ./src/apps/preprocess_mpi.cpp
- ./src/apps/project.cpp
- ./src/apps/reconstruct.cpp
- ./src/apps/refine.cpp
- ./src/apps/refine_mpi.cpp
- ./src/apps/run_ctffind.cpp
- ./src/apps/run_ctffind_mpi.cpp
- ./src/apps/stack_create.cpp
- ./src/args.cpp
- ./src/args.h
- ./src/autopicker.cpp
- ./src/autopicker_mpi.cpp
- ./src/backprojector.cpp
- ./src/backprojector.h
- ./src/complex.cpp
- ./src/complex.h
- ./src/ctf.cpp
- ./src/ctf.h
- ./src/ctffind_runner.cpp
- ./src/ctffind_runner.h
- ./src/ctffind_runner_mpi.cpp
- ./src/ctffind_runner_mpi.h
- ./src/displayer.cpp
- ./src/displayer.h
- ./src/error.cpp
- ./src/error.h
- ./src/euler.cpp
- ./src/euler.h
- ./src/exp_model.cpp
- ./src/exp_model.h
- ./src/fftw.h
- ./src/filename.cpp
- ./src/filename.h
- ./src/funcs.cpp
- ./src/funcs.h
- ./src/gcc_version.h
- ./src/gui_entries.cpp
- ./src/gui_jobwindow.cpp
- ./src/gui_jobwindow.h
- ./src/gui_mainwindow.cpp
- ./src/gui_mainwindow.h
- ./src/healpix_sampling.cpp
- ./src/healpix_sampling.h
- ./src/image.cpp
- ./src/image.h
- ./src/macros.h
- ./src/manualpicker.cpp
- ./src/manualpicker.h
- ./src/mask.cpp
- ./src/mask.h
- ./src/matrix1d.cpp
- ./src/matrix1d.h
- ./src/matrix2d.cpp
- ./src/matrix2d.h
- ./src/memory.cpp
- ./src/memory.h
- ./src/metadata_container.cpp
- ./src/metadata_container.h
- ./src/metadata_label.cpp
- ./src/metadata_label.h
- ./src/metadata_table.cpp
- ./src/metadata_table.h
- ./src/ml_model.cpp
- ./src/ml_model.h
- ./src/ml_optimiser.cpp
- ./src/ml_optimiser.h
- ./src/ml_optimiser_mpi.cpp
- ./src/ml_optimiser_mpi.h
- ./src/mpi.cpp
- ./src/mpi.h
- ./src/multidim_array.cpp
- ./src/multidim_array.h
- ./src/numerical_recipes.cpp
- ./src/numerical_recipes.h
- ./src/parallel.cpp
- ./src/parallel.h
- ./src/particle_polisher.cpp
- ./src/particle_polisher.h
- ./src/particle_polisher_mpi.cpp
- ./src/particle_polisher_mpi.h
- ./src/particle_sorter.cpp
- ./src/particle_sorter.h
- ./src/particle_sorter_mpi.cpp
- ./src/particle_sorter_mpi.h
- ./src/postprocessing.cpp
- ./src/postprocessing.h
- ./src/preprocessing.cpp
- ./src/preprocessing.h
- ./src/preprocessing_mpi.cpp
- ./src/preprocessing_mpi.h
- ./src/projector.cpp
- ./src/projector.h
- ./src/rwIMAGIC.h
- ./src/rwMRC.h
- ./src/rwSPIDER.h
- ./src/strings.cpp
- ./src/strings.h
- ./src/symmetries.cpp
- ./src/symmetries.h
- ./src/tabfuncs.cpp
- ./src/tabfuncs.h
- ./src/time.cpp
- ./src/time.h
- ./src/transformations.cpp
- ./src/transformations.h
- ./src/fftw.cpp
-Copyright: *No copyright*
+Files: *
+Copyright: 2014, Sjors Scheres at the MRC Laboratory of Molecular Biology
 License: GPL-2+
- FIXME
 
 Files: ./src/Healpix_2.15a/arr.h
  ./src/Healpix_2.15a/cxxutils.cc
@@ -183,21 +27,19 @@ Copyright: 2002-2007, Max-Planck-Society
   2004, Max-Planck-Society
   2005-2007, Max-Planck-Society
 License: GPL-2+
- FIXME
 
 Files: ./ltmain.sh
 Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
 License: GPL-2+
- FIXME
 
 Files: debian/*
 Copyright: 2014 Q-Leap Networks GmbH <info at q-leap.de>
-License: GPL-3+
+License: GPL-2+
 
-License: GPL-3+
+License: GPL-2+
  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
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
  (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -209,5 +51,5 @@ License: GPL-3+
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.

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

