From 4943724f73536a34b0bfc25bdb5cc33279caa8e4 Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Thu, 11 Jul 2013 15:56:06 +0200 Subject: [PATCH] deb changes for 0.9.10 --- application/config/default.ini | 4 +- debian/Makefile/Makefile | 11 ++- debian/changelog | 12 +++ debian/control | 6 +- debian/copyright | 171 ++++++++++++++++----------------- 5 files changed, 106 insertions(+), 98 deletions(-) diff --git a/application/config/default.ini b/application/config/default.ini index c4f59185e..9c91b664c 100644 --- a/application/config/default.ini +++ b/application/config/default.ini @@ -94,8 +94,8 @@ descriptionHelper.properties.skosEditorialNote = "http://www.w3.org/2004/02/skos ; Version info ;; version.label = "OntoWiki" -version.number = "0.9.9" -version.suffix = "git" +version.number = "0.9.10" +version.suffix = "" ;; ; Help Menu URLs diff --git a/debian/Makefile/Makefile b/debian/Makefile/Makefile index dd7a20199..072b4060a 100644 --- a/debian/Makefile/Makefile +++ b/debian/Makefile/Makefile @@ -3,13 +3,14 @@ default: prepare: rm -rf ../../build* - rm -rf ../../Makefile - rm -rf ../../web.config + rm -f ../../Makefile + rm -f ../../web.config rm -rf ../../libraries/Erfurt rm -rf ../../libraries/RDFauthor - rm -rf ../../extensions/themes/silverblue/scripts/libraries/jquery.js - rm -rf ../../extensions/exconf/pclzip.lib.php - rm -rf ../../extensions/markdown/parser/markdown.php + rm -f ../../extensions/themes/silverblue/scripts/libraries/jquery.js + rm -f ../../extensions/exconf/pclzip.lib.php + rm -rf ../../extensions/markdown/parser + rm -f ../../extensions/queries/resources/codemirror/LICENSE clean: rm -rf ../*.log diff --git a/debian/changelog b/debian/changelog index d2bd52a8d..3fb08e4b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +ontowiki (0.9.10-1) lod2; urgency=low + + * new model creation / add data procedure + * fixes in query editor + * performance issues in title helper + * unify CommentModule and LastcommentsModule, increase limit and set ordering + * +100 other commits + * depends on Erfurt 1.6 + * depends on RDFauthor 0.9.6 + + -- Sebastian Tramp Wed, 10 Jul 2013 14:22:14 +0200 + ontowiki (0.9.8-3) lod2; urgency=low * fix cors header diff --git a/debian/control b/debian/control index 2b64f3628..6b3d8e1a0 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/AKSW/OntoWiki Package: ontowiki-virtuoso Architecture: all -Depends: ontowiki-common, virtuoso-opensource-6.1 (>= 6.1.4), php5-odbc, ${misc:Depends} +Depends: ontowiki-common (>= 0.9.10), virtuoso-opensource-6.1 (>= 6.1.6), php5-odbc, ${misc:Depends} Provides: ontowiki Conflicts: ontowiki, ontowiki-mysql Replaces: ontowiki (<< 0.9.6-10) @@ -40,7 +40,7 @@ Description: Semantic Data Wiki enabling the publication of RDF data Package: ontowiki-mysql Architecture: all -Depends: ontowiki-common, mysql-server, php5-mysql | php5-mysqli, ${misc:Depends} +Depends: ontowiki-common (>= 0.9.10), mysql-server, php5-mysql | php5-mysqli, ${misc:Depends} Provides: ontowiki Conflicts: ontowiki, ontowiki-virtuoso Replaces: ontowiki (<< 0.9.6-10) @@ -70,7 +70,7 @@ Description: Semantic Data Wiki enabling the publication of RDF data Package: ontowiki-common Architecture: all -Depends: liberfurt-php (>= 1.5), libjs-rdfauthor (>= 0.9.5), php5-curl, libmarkdown-php, libphp-pclzip, libjs-jquery (>= 1.7.1), tinymce, ${misc:Depends} +Depends: liberfurt-php (>= 1.6), libjs-rdfauthor (>= 0.9.6), php5-curl, libmarkdown-php, libphp-pclzip, libjs-jquery (>= 1.7.1), tinymce, ${misc:Depends} Suggests: owcli Description: Application sources for all ontowiki packages OntoWiki is a tool providing support for agile, distributed knowledge diff --git a/debian/copyright b/debian/copyright index 4f54c37dc..1000034c6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,91 +1,86 @@ -This work was packaged for Debian by: - - Sebastian Tramp on Tue, 01 Feb 2011 15:37:27 +0100 - -It was downloaded from: - - - -Upstream Author(s): - - Christoph Rieß - Daniel Gerber - Jonas Brekle - Konrad Abicht - Michael Haschke - Michael Martin - Natanael Arndt - Norman Heino - Philipp Frischmuth - Rolland Brunec - Sebastian Tramp - Tim Ermilov +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Erfurt +Source: https://github.com/AKSW/Erfurt +Files: * Copyright: + 2013 Christian Würker + 2013 Christoph Rieß + 2013 Daniel Gerber + 2013 Jonas Brekle + 2013 Konrad Abicht + 2013 Michael Haschke + 2013 Michael Martin + 2013 Natanael Arndt + 2013 Norman Heino + 2013 Philipp Frischmuth + 2013 Rolland Brunec + 2013 Sebastian Tramp + 2013 Tim Ermilov +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 2 of the License, or (at your option) any later + version. + . + This program 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 package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +Files: extensions/queries/resources/codemirror/* +Copyright: 2013 Marijn Haverbeke +License: MIT2 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +Files: debian/* +Copyright: 2013 Sebastian Tramp +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 2 of the License, or (at your option) any later + version. + . + This program 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 package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. - - - - - - - - - - - - - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - 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 - -On Debian systems, the complete text of the GNU General -Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - - -Copright and License of the CodeMirror JavaScript Library: - - Copyright (c) 2007-2009 Marijn Haverbeke - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any - damages arising from the use of this software. - - Permission is granted to anyone to use this software for any - purpose, including commercial applications, and to alter it and - redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. - - Marijn Haverbeke - marijnh at gmail - - -The Debian packaging is: - - Copyright (C) 2011 Sebastian Tramp - -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 2 of the License, or -(at your option) any later version.