rev 7258 - in branches/kde4/packages/soprano/debian: . patches

Sune Vuorela pusling-guest at alioth.debian.org
Thu Sep 27 12:44:05 UTC 2007 

Author: pusling-guest
Date: 2007-09-27 12:44:05 +0000 (Thu, 27 Sep 2007)
New Revision: 7258

Added:
   branches/kde4/packages/soprano/debian/libsoprano4.install
   branches/kde4/packages/soprano/debian/patches/
   branches/kde4/packages/soprano/debian/patches/02_hack_away_sesame_and_non-free_stuff.diff
   branches/kde4/packages/soprano/debian/patches/series
   branches/kde4/packages/soprano/debian/prune-nonfree
Removed:
   branches/kde4/packages/soprano/debian/libsoprano3.install
Modified:
   branches/kde4/packages/soprano/debian/changelog
   branches/kde4/packages/soprano/debian/control
   branches/kde4/packages/soprano/debian/copyright
   branches/kde4/packages/soprano/debian/libsoprano-dev.install
Log:
update to new upstream snapshot


Modified: branches/kde4/packages/soprano/debian/changelog
===================================================================
--- branches/kde4/packages/soprano/debian/changelog	2007-09-27 12:39:44 UTC (rev 7257)
+++ branches/kde4/packages/soprano/debian/changelog	2007-09-27 12:44:05 UTC (rev 7258)
@@ -1,3 +1,16 @@
+soprano (1.93.0~svn717188) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * New upstream snapshot.
+    - Soprano2
+    - Now a client-server model, but both used on same computer.
+  * Soname bump.
+  * Patch away java backend and remove jar files from upstream.
+  * Update copyright.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Sep 2007 13:33:03 +0200
+
 soprano (0.9.0~snapshot20070728-1) unstable; urgency=low
 
   * First upload to Debian. (Closes: #422206)

Modified: branches/kde4/packages/soprano/debian/control
===================================================================
--- branches/kde4/packages/soprano/debian/control	2007-09-27 12:39:44 UTC (rev 7257)
+++ branches/kde4/packages/soprano/debian/control	2007-09-27 12:44:05 UTC (rev 7258)
@@ -6,7 +6,7 @@
 Build-Depends: cdbs, debhelper (>= 5), cmake, librdf0-dev, libqt4-dev (>> 4.3.0), quilt
 Standards-Version: 3.7.2
 
-Package: libsoprano3
+Package: libsoprano4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Qt interface to RDF storage

Modified: branches/kde4/packages/soprano/debian/copyright
===================================================================
--- branches/kde4/packages/soprano/debian/copyright	2007-09-27 12:39:44 UTC (rev 7257)
+++ branches/kde4/packages/soprano/debian/copyright	2007-09-27 12:44:05 UTC (rev 7258)
@@ -29,10 +29,35 @@
 On Debian systems, the complete text of the GNU Library General
 Public License can be found in `/usr/share/common-licenses/LGPL-2'.
 
+The following files are under the terms of the GNU General Public License version 2 or later:
+tools/sopranocmd.cpp
+tools/sopranod.cpp
+test/parsertest.cpp
+test/tstringtest.cpp
+test/tstringtest.h
 
+    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 program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+
 The following files are under the terms of the BSD license:
     | cmake/modules/FindGNUWIN32.cmake  
     | cmake/modules/ FindRedland.cmake
+    | cmake/modules/FindQt4.cmake
 
 On Debian systems, the complete text of the BSD License can be
 found in `/usr/share/common-licenses/BSD'

Modified: branches/kde4/packages/soprano/debian/libsoprano-dev.install
===================================================================
--- branches/kde4/packages/soprano/debian/libsoprano-dev.install	2007-09-27 12:39:44 UTC (rev 7257)
+++ branches/kde4/packages/soprano/debian/libsoprano-dev.install	2007-09-27 12:44:05 UTC (rev 7258)
@@ -1,2 +1,112 @@
-./usr/include/soprano/*.h
+./usr/include/soprano/RdfSchemaWrapper
+./usr/include/soprano/queryparser.h
+./usr/include/soprano/Error
+./usr/include/soprano/Error/Error
+./usr/include/soprano/Error/ParserError
+./usr/include/soprano/Error/ErrorCache
+./usr/include/soprano/Error/ErrorCode
+./usr/include/soprano/Error/Locator
+./usr/include/soprano/Iterator
+./usr/include/soprano/nao.h
+./usr/include/soprano/inferenceruleset.h
+./usr/include/soprano/BackendOption
+./usr/include/soprano/statementiterator.h
+./usr/include/soprano/Vocabulary
+./usr/include/soprano/Vocabulary/NAO
+./usr/include/soprano/Vocabulary/RDFS
+./usr/include/soprano/Vocabulary/RDF
+./usr/include/soprano/Vocabulary/SIL
+./usr/include/soprano/Vocabulary/XMLSchema
+./usr/include/soprano/Vocabulary/NRL
+./usr/include/soprano/node.h
+./usr/include/soprano/serializer.h
+./usr/include/soprano/Query
+./usr/include/soprano/Query/QueryLanguage
+./usr/include/soprano/Query/Query
+./usr/include/soprano/Query/Serializer
+./usr/include/soprano/Query/Parser
+./usr/include/soprano/Inference
+./usr/include/soprano/Inference/RuleParser
+./usr/include/soprano/Inference/StatementPattern
+./usr/include/soprano/Inference/NodePattern
+./usr/include/soprano/Inference/Rule
+./usr/include/soprano/Inference/InferenceModel
+./usr/include/soprano/Inference/StandardRuleSet
+./usr/include/soprano/Inference/InferenceRuleSet
+./usr/include/soprano/soprano.h
+./usr/include/soprano/Node
+./usr/include/soprano/BackendFeature
+./usr/include/soprano/Backend
+./usr/include/soprano/bindingset.h
+./usr/include/soprano/rdfs.h
+./usr/include/soprano/FilterModel
+./usr/include/soprano/sil.h
+./usr/include/soprano/NodeIterator
+./usr/include/soprano/filtermodel.h
+./usr/include/soprano/LiteralValue
+./usr/include/soprano/inferencerule.h
+./usr/include/soprano/nodepattern.h
+./usr/include/soprano/servercore.h
+./usr/include/soprano/dbusclient.h
+./usr/include/soprano/xmls.h
+./usr/include/soprano/version.h
+./usr/include/soprano/RdfSerialization
+./usr/include/soprano/PluginManager
+./usr/include/soprano/Server
+./usr/include/soprano/Server/ServerCore
+./usr/include/soprano/iteratorbackend.h
+./usr/include/soprano/sopranotypes.h
+./usr/include/soprano/cluceneindex.h
+./usr/include/soprano/query.h
+./usr/include/soprano/parser.h
+./usr/include/soprano/BackendSetting
+./usr/include/soprano/IteratorBackend
+./usr/include/soprano/nodeiterator.h
+./usr/include/soprano/rdfschemawrapper.h
+./usr/include/soprano/plugin.h
+./usr/include/soprano/dummymodel.h
+./usr/include/soprano/iterator.h
+./usr/include/soprano/StorageModel
+./usr/include/soprano/statement.h
+./usr/include/soprano/Serializer
+./usr/include/soprano/indexfiltermodel.h
+./usr/include/soprano/model.h
+./usr/include/soprano/global.h
+./usr/include/soprano/indexqueryhit.h
+./usr/include/soprano/queryresultiterator.h
+./usr/include/soprano/backend.h
+./usr/include/soprano/storagemodel.h
+./usr/include/soprano/tcpclient.h
+./usr/include/soprano/error.h
+./usr/include/soprano/DummyModel
+./usr/include/soprano/inferencemodel.h
+./usr/include/soprano/BindingSet
+./usr/include/soprano/soprano_export.h
+./usr/include/soprano/vocabulary.h
+./usr/include/soprano/queryserializer.h
+./usr/include/soprano/queryresultiteratorbackend.h
+./usr/include/soprano/dbusmodel.h
+./usr/include/soprano/literalvalue.h
+./usr/include/soprano/statementpattern.h
+./usr/include/soprano/inferenceruleparser.h
+./usr/include/soprano/Parser
+./usr/include/soprano/QueryResultIteratorBackend
+./usr/include/soprano/Statement
+./usr/include/soprano/simplestatementiterator.h
+./usr/include/soprano/pluginmanager.h
+./usr/include/soprano/Model
+./usr/include/soprano/rdf.h
+./usr/include/soprano/SimpleStatementIterator
+./usr/include/soprano/Plugin
+./usr/include/soprano/Client
+./usr/include/soprano/Client/TcpClient
+./usr/include/soprano/Client/DBusClient
+./usr/include/soprano/Client/DBusModel
+./usr/include/soprano/nrl.h
+./usr/include/soprano/StatementIterator
+./usr/include/soprano/QueryResultIterator
+./usr/include/Soprano
+./usr/lib/libsopranoserver.so
+./usr/lib/libsopranoindex.so
 ./usr/lib/libsoprano.so
+./usr/lib/libsopranoclient.so

Deleted: branches/kde4/packages/soprano/debian/libsoprano3.install

Added: branches/kde4/packages/soprano/debian/libsoprano4.install
===================================================================
--- branches/kde4/packages/soprano/debian/libsoprano4.install	                        (rev 0)
+++ branches/kde4/packages/soprano/debian/libsoprano4.install	2007-09-27 12:44:05 UTC (rev 7258)
@@ -0,0 +1,21 @@
+./usr/share/dbus-1/interfaces/org.soprano.NodeIterator.xml
+./usr/share/dbus-1/interfaces/org.soprano.Model.xml
+./usr/share/dbus-1/interfaces/org.soprano.StatementIterator.xml
+./usr/share/dbus-1/interfaces/org.soprano.QueryResultIterator.xml
+./usr/share/dbus-1/interfaces/org.soprano.Server.xml
+./usr/share/soprano/rules/rdfs.rules
+./usr/share/soprano/rules/nrl.rules
+./usr/bin/sopranocmd
+./usr/bin/sopranod
+./usr/lib/libsoprano.so.4.0.0
+./usr/lib/libsopranoclient.so.1.0.0
+./usr/lib/libsopranoclient.so.1
+./usr/lib/libsopranoindex.so.1.0.0
+./usr/lib/libsopranoindex.so.1
+./usr/lib/soprano/libsoprano_redlandbackend.so
+./usr/lib/soprano/libsoprano_rasqalqueryparser.so
+./usr/lib/soprano/libsoprano_raptorparser.so
+./usr/lib/soprano/libsoprano_raptorserializer.so
+./usr/lib/libsopranoserver.so.1.0.0
+./usr/lib/libsoprano.so.4
+./usr/lib/libsopranoserver.so.1

Added: branches/kde4/packages/soprano/debian/patches/02_hack_away_sesame_and_non-free_stuff.diff
===================================================================
--- branches/kde4/packages/soprano/debian/patches/02_hack_away_sesame_and_non-free_stuff.diff	                        (rev 0)
+++ branches/kde4/packages/soprano/debian/patches/02_hack_away_sesame_and_non-free_stuff.diff	2007-09-27 12:44:05 UTC (rev 7258)
@@ -0,0 +1,64 @@
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,18 +19,6 @@
+ find_package(Redland)
+ find_package(TStore)
+ 
+-find_package(JNI)
+-if(JAVA_INCLUDE_PATH)
+-  file(READ ${JAVA_INCLUDE_PATH}/jni.h jni_header_data)
+-  string(REGEX MATCH "JNI_VERSION_1_6" JNI_1_6_FOUND "${jni_header_data}")
+-  if(JNI_1_6_FOUND)
+-    message(STATUS "Found Java JNI >= 1.6: ${JAVA_INCLUDE_PATH}, ${JAVA_JVM_LIBRARY}")
+-  else(JNI_1_6_FOUND)
+-    message( "Need JRE version 1.6 or higher for the Sesame2 backend.")
+-  endif(JNI_1_6_FOUND)
+-else(JAVA_INCLUDE_PATH)
+-  message(STATUS "Could not find Java JNI")
+-endif(JAVA_INCLUDE_PATH)
+ 
+ set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+ set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
+@@ -79,16 +67,13 @@
+ 
+ message("---------------------------------------------------------------------------------------")
+ message("-- Soprano Components that will be built:")
+-if(NOT REDLAND_FOUND AND JNI_1_6_FOUND AND TSTORE_FOUND)
++if(NOT REDLAND_FOUND AND TSTORE_FOUND)
+   message("   WARNING: No Soprano backends will be compiled due to missing dependancies!")
+   message("   WARNING: Soprano will not be very useful without storage backends!")
+-endif(NOT REDLAND_FOUND AND JNI_1_6_FOUND AND TSTORE_FOUND)
++endif(NOT REDLAND_FOUND AND TSTORE_FOUND)
+ if(REDLAND_FOUND)
+   message("   * Redland storage backend")
+ endif(REDLAND_FOUND)
+-if(JNI_1_6_FOUND)
+-  message("   * Sesame2 storage backend (java-based)")
+-endif(JNI_1_6_FOUND)
+ if(TSTORE_FOUND)
+   message("   * 3Store storage backend (the 3Store backend depends on a running and configured MySQL DB")
+   message("     and does not support removing of statements")
+@@ -112,9 +97,6 @@
+ if(NOT REDLAND_FOUND)
+   message("   * Redland storage backend")
+ endif(NOT REDLAND_FOUND)
+-if(NOT JNI_1_6_FOUND)
+-  message("   * Sesame2 storage backend (java-based)")
+-endif(NOT JNI_1_6_FOUND)
+ if(NOT TSTORE_FOUND)
+   message("   * 3Store storage backend")
+ endif(NOT TSTORE_FOUND)
+Index: b/backends/CMakeLists.txt
+===================================================================
+--- a/backends/CMakeLists.txt
++++ b/backends/CMakeLists.txt
+@@ -7,7 +7,3 @@
+ if(TSTORE_FOUND)
+   add_subdirectory(3store)
+ endif(TSTORE_FOUND)
+-
+-if(JNI_1_6_FOUND)
+-  add_subdirectory(sesame2)
+-endif(JNI_1_6_FOUND)

Added: branches/kde4/packages/soprano/debian/patches/series
===================================================================
--- branches/kde4/packages/soprano/debian/patches/series	                        (rev 0)
+++ branches/kde4/packages/soprano/debian/patches/series	2007-09-27 12:44:05 UTC (rev 7258)
@@ -0,0 +1 @@
+02_hack_away_sesame_and_non-free_stuff.diff

Added: branches/kde4/packages/soprano/debian/prune-nonfree
===================================================================
--- branches/kde4/packages/soprano/debian/prune-nonfree	                        (rev 0)
+++ branches/kde4/packages/soprano/debian/prune-nonfree	2007-09-27 12:44:05 UTC (rev 7258)
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+# Removes non-free files from the source tree. Must be done before
+# creating the orig.tar.gz.
+
+TOPLEVEL="$1"
+
+if [ "$TOPLEVEL" = "" ]; then
+	echo "Please provide the toplevel directory as the argument."
+	exit 1
+else
+	rm -r $TOPLEVEL/backends/sesame2
+fi
+
+exit 0


Property changes on: branches/kde4/packages/soprano/debian/prune-nonfree
___________________________________________________________________
Name: svn:executable
   + *

More information about the pkg-kde-commits mailing list