[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, debian, updated. upstream/1.0.1-8-g5c4ed76
Andreas Tille
tille at debian.org
Fri Nov 4 09:10:12 UTC 2011
The following commit has been merged in the debian branch:
commit 5c4ed769812a3f894b5eee9ede410c8b7a1c6c2e
Author: Andreas Tille <tille at debian.org>
Date: Fri Nov 4 10:09:22 2011 +0100
Debhelper 8; DEP5 related modification in copyright
diff --git a/debian/changelog b/debian/changelog
index c6d2d51..912f835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sitplus (1.0.1-2) unstable; urgency=low
+
+ * debian/patches/as-needed.patch: Fix FTBFS with --as-needed linker option.
+ (Thanks to Ilya Barygin <randomaction at ubuntu.com> for the patch)
+ Closes: #647401
+ * debian/control: Added myself to uploaders
+ * Debhelper 8 (control+compat)
+ * debian/copyright: Some DEP5 related reformating
+
+ -- Andreas Tille <tille at debian.org> Fri, 04 Nov 2011 09:24:12 +0100
+
sitplus (1.0.1-1) unstable; urgency=low
* Initial release (Closes: #635597)
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 25ec00e..9d52ede 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: misc
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Luis Rivas Vañó <luinix at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), cmake, libpoco-dev, libboost-dev, libboost-program-options-dev, libboost-thread-dev, libboost-system-dev, wx2.8-headers, libwxbase2.8-dev, libbluetooth-dev, libconfig8-dev, libsdl1.2-dev, libcv-dev, libcvaux-dev, libhighgui-dev, libv4l-dev, libportmidi-dev, libboost-filesystem-dev, asciidoc, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libwxgtk2.8-dev
+Uploaders: Luis Rivas Vañó <luinix at gmail.com>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 8), cmake, libpoco-dev, libboost-dev, libboost-program-options-dev, libboost-thread-dev, libboost-system-dev, wx2.8-headers, libwxbase2.8-dev, libbluetooth-dev, libconfig8-dev, libsdl1.2-dev, libcv-dev, libcvaux-dev, libhighgui-dev, libv4l-dev, libportmidi-dev, libboost-filesystem-dev, asciidoc, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libwxgtk2.8-dev
Standards-Version: 3.9.2
Homepage: http://sitplus.crea-si.com
Vcs-Git: git://git.debian.org/debian-med/sitplus.git
diff --git a/debian/copyright b/debian/copyright
index 7470d60..1a02e7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,25 @@ Source: http://sourceforge.net/projects/sitplus/files/
Files: *
Copyright: 2011 Cesar Mauri Loba <cesar at crea-si.com>
License: GPL-3.0+
+ 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
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
Files: src/mod_collage
Copyright: 2011 Jaume Singla Valls <jaume.singlavalls at gmail.com>
License: GPL-3.0+
-
-Files: graphics/pictures
-Copyright: 2011 Jordi Martorell Palliso & Lidia Porcar Tabernero
-License: CC-BY-SA
-
-Files: debian/*
-Copyright: 2011 Luis Rivas Vañó <luinix at gmail.com>
-License: GPL-3.0+
-
-License: GPL-3.0+
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
@@ -35,29 +40,31 @@ License: GPL-3.0+
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+Files: graphics/pictures
+Copyright: 2011 Jordi Martorell Palliso & Lidia Porcar Tabernero
License: CC-BY-SA
This software is released under a Creative Commons license:
-
+ .
"Attribution-ShareAlike 3.0"
-
+ .
You are free:
-
- * To copy, distribute, display, and perform the work
-
- * To make derivative works Under the following conditions:
-
- * Attribution. You must give the original author (Gabriele Magurno) credit.
-
- * Share Alike. If you alter, transform, or build upon this work, you may
- * distribute the resulting work only under a licence identical to this one.
-
- * For any reuse or distribution, you must make clear to others the licence terms
- * of this work.
-
- * Any of these conditions can be waived if you get permission from the copyright
- * holder.
-
+ .
+ * To copy, distribute, display, and perform the work
+ * To make derivative works Under the following conditions:
+ * Attribution. You must give the original author (Gabriele Magurno) credit.
+ * Share Alike. If you alter, transform, or build upon this work, you may
+ distribute the resulting work only under a licence identical to this one.
+ * For any reuse or distribution, you must make clear to others the licence terms
+ of this work.
+ * Any of these conditions can be waived if you get permission from the copyright
+ holder.
+ .
Your fair use and other rights are in no way affected by the above.
-
+ .
Full license (legal code) can be found at:
http://creativecommons.org/licenses/by-sa/3.0/legalcode
+
+Files: debian/*
+Copyright: 2011 Luis Rivas Vañó <luinix at gmail.com>
+License: GPL-3.0+
+ Same as sitplus itself.
--
Free software framework for ludic-therapeutic activities
More information about the debian-med-commit
mailing list