Skip to content
Permalink
Browse files
remove references to networkanalysis from scrips and packaging files
  • Loading branch information
alexbruy committed Nov 21, 2016
1 parent 14c930a commit 5cbf9d51297f92c2c606f3fe4df3ae5aaf65cce7
@@ -22,7 +22,7 @@ ENDIF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
# add qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant
FILE(APPEND "${QGIS_PYTHON_API_FILE}" "qgis.core.NULL?7\n")

FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.networkanalysis.api qgis.server.api)
FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.server.api)
SET(api "${CMAKE_BINARY_DIR}/python/${apiFile}")
IF(EXISTS "${api}")
FILE(READ "${api}" FILE_CONTENT)
@@ -129,18 +129,6 @@ Description: QGIS - shared analysis library
.
This package contains the shared analysis library.

Package: libqgis-networkanalysis2.99.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Description: QGIS - shared network analysis library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared network analysis library.

Package: libqgisgrass7-2.99.0
Architecture: any
Section: libs
@@ -204,7 +192,6 @@ Depends:
libqgis-core2.99.0 (= ${binary:Version}),
libqgis-gui2.99.0 (= ${binary:Version}),
libqgis-analysis2.99.0 (= ${binary:Version}),
libqgis-networkanalysis2.99.0 (= ${binary:Version}),
libqgisgrass7-2.99.0 (= ${binary:Version}),
libqgispython2.99.0 (= ${binary:Version}),
libsqlite3-dev,
@@ -241,7 +228,6 @@ Depends:
libqgis-core2.99.0 (= ${binary:Version}),
libqgis-gui2.99.0 (= ${binary:Version}),
libqgis-analysis2.99.0 (= ${binary:Version}),
libqgis-networkanalysis2.99.0 (= ${binary:Version}),
libqgisgrass7-2.99.0 (= ${binary:Version}),
libqgispython2.99.0 (= ${binary:Version}),
${misc:Depends}
@@ -132,18 +132,6 @@ Description: QGIS - shared analysis library
.
This package contains the shared analysis library.

Package: libqgis-networkanalysis{QGIS_ABI}
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Description: QGIS - shared network analysis library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared network analysis library.

Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
Architecture: any
Section: libs
@@ -207,7 +195,6 @@ Depends:
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
libsqlite3-dev,
@@ -244,7 +231,6 @@ Depends:
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
${misc:Depends}
@@ -3,7 +3,6 @@ usr/lib/libqgis_app.so
usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so
#server#usr/lib/libqgis_server.so
usr/lib/libqgisgrass{GRASSVER}.so
usr/lib/libqgispython.so

This file was deleted.

This file was deleted.

@@ -3,7 +3,6 @@ usr/lib/python*/*-packages/qgis/*.so
usr/lib/python*/*-packages/qgis/core/*
usr/lib/python*/*-packages/qgis/gui/*
usr/lib/python*/*-packages/qgis/analysis/*
usr/lib/python*/*-packages/qgis/networkanalysis/*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/testing/*
usr/lib/python*/*-packages/pyspatialite/*
@@ -12,14 +12,10 @@ The GUI library is build on top of the CORE library and adds reusable GUI widget

/** @defgroup analysis analysis library

The ANALYSIS library is built on top of CORE library and provides
The ANALYSIS library is built on top of CORE library and provides
high level tools for carrying out spatial analysis on vector and raster data.
*/

/** @defgroup networkanalysis network analysis library

The NETWORK_ANALYSIS library provides high level tools for building network
topologies and analysing them.
It also contains high level tools for building network topologies and analysing
them.
*/

/** @defgroup server server library
@@ -299,7 +299,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
--exclude "*.pyc" ^
"apps/%PACKAGENAME%/bin/qgispython.dll" ^
"apps/%PACKAGENAME%/bin/qgis_analysis.dll" ^
"apps/%PACKAGENAME%/bin/qgis_networkanalysis.dll" ^
"apps/%PACKAGENAME%/bin/qgis_core.dll" ^
"apps/%PACKAGENAME%/bin/qgis_gui.dll" ^
"apps/%PACKAGENAME%/doc/" ^
@@ -4,7 +4,7 @@
%End

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsArcProperter
* \brief QgsArcProperter is a strategy pattern.
* You can use it for customize arc property. For example look at QgsDistanceArcProperter or QgsSpeedArcProperter
@@ -1,5 +1,5 @@
/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraphArc
* \brief This class implements a graph edge
*/
@@ -38,7 +38,7 @@ class QgsGraphArc
typedef QList< int > QgsGraphArcIdList;

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraphVertex
* \brief This class implements a graph vertex
*/
@@ -77,7 +77,7 @@ class QgsGraphVertex
};

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraph
* \brief Mathematics graph representation
*/
@@ -1,5 +1,5 @@
/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraphBuilder
* \brief This class making the QgsGraph object
*/
@@ -3,7 +3,7 @@
%End

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraphBuilderInterface
* \brief Determine interface for creating a graph. Contains the settings of the graph. QgsGraphBuilder and QgsGraphDirector is a Builder pattern
*/
@@ -3,7 +3,7 @@
%End

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraphDirector
* \brief Determine making the graph. QgsGraphBuilder and QgsGraphDirector is a builder patter.
*/
@@ -1,5 +1,5 @@
/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsLineVectorLayerDirector
* \brief Determine making the graph from vector line layer
*/
@@ -134,11 +134,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# the soname might stay the same, it won't work anymore.
#http://hub.qgis.org/issues/5274
Requires: grass = 6.4.4

%description grass
GRASS plugin for QGIS required to interface with the GRASS system.

%package python
%package python
Summary: Python integration and plug-ins for QGIS
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -158,7 +158,7 @@ Requires: qscintilla-python
%description python
Python integration and plug-ins for QGIS.

%package server
%package server
Summary: FCGI-based OGC web map server
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -167,7 +167,7 @@ Provides: mapserver = %{version}-%{release}
Obsoletes: mapserver < 2.8.1-1

%description server
This FastCGI OGC web map server implements OGC WMS 1.3.0 and 1.1.1.
This FastCGI OGC web map server implements OGC WMS 1.3.0 and 1.1.1.
The services are prepared as regular projects in QGIS. They're rendered using
the QGIS libraries. The server also supports SLD (Styled Layer Descriptor)
for styling. Sample configurations for Httpd and Lighttpd are included.
@@ -343,7 +343,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/lib%{name}_analysis.so.*
%{_libdir}/lib%{name}_core.so.*
%{_libdir}/lib%{name}_gui.so.*
%{_libdir}/lib%{name}_networkanalysis.so.*
%{_libdir}/lib%{name}_server.so.*
%{_libdir}/%{name}/
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
@@ -2,7 +2,7 @@

set -e

codepaths=$(echo python/{analysis,console,core,custom_widgets,gui,networkanalysis,plugins,pyplugin_installer,server,sip_helpers,testing} src/ tests/)
codepaths=$(echo python/{analysis,console,core,custom_widgets,gui,plugins,pyplugin_installer,server,sip_helpers,testing} src/ tests/)
repl=

s=$(mktemp -t skipped.XXXX.log)
@@ -79,7 +79,7 @@ class ANALYSIS_EXPORT QgsGraphArc
typedef QList< int > QgsGraphArcIdList;

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraphVertex
* \brief This class implements a graph vertex
*/
@@ -122,7 +122,7 @@ class ANALYSIS_EXPORT QgsGraphVertex
};

/**
* \ingroup networkanalysis
* \ingroup analysis
* \class QgsGraph
* \brief Mathematics graph representation
*/

0 comments on commit 5cbf9d5

Please sign in to comment.