Changeset: 72cc1e3b2ebc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72cc1e3b2ebc
Modified Files:
MonetDB.spec
debian/control
Branch: Oct2014
Log Message:
Fixed dependency problems.
Bug 3721.
diffs (132 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -162,6 +162,8 @@ more client packages.
Summary: MonetDB development files
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: libatomic_ops-devel
%description devel
MonetDB is a database management system that is developed from a
@@ -672,6 +674,7 @@ fi
Summary: MonetDB development files
Group: Applications/Databases
Requires: MonetDB5-server = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
%description -n MonetDB5-server-devel
MonetDB is a database management system that is developed from a
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,11 @@ Vcs-Browser: http://dev.monetdb.org/hg/M
Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
# for Build-Depends and Depends syntax, see
# http://www.debian.org/doc/debian-policy/ch-relationships.html
-Build-Depends: debhelper (>= 5), autotools-dev, bison, libbz2-dev,
- libcurl4-gnutls-dev, libgeos-dev (>= 3.0.0), libgsl0-dev, libpcre3-dev,
- libreadline-gplv2-dev | libreadline-dev, libssl-dev, libxml2-dev, perl,
- ruby, rubygems | libyaml-0-2, unixodbc-dev, uuid-dev, zlib1g-dev,
- python, python3,
- libbam-dev, pkg-config
+Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev,
+ libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.0.0),
+ libgsl0-dev, libpcre3-dev, libreadline-gplv2-dev | libreadline-dev,
+ libssl-dev, libxml2-dev, perl, pkg-config, python, python3, ruby,
+ rubygems | libyaml-0-2, unixodbc-dev, uuid-dev, zlib1g-dev
# Build-Depends: libraptor1-dev
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
@@ -21,8 +20,6 @@ X-Python3-Version: >= 3.0
Package: libmonetdb11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb1, libmonetdb2
-Replaces: libmonetdb1, libmonetdb2
Description: MonetDB core library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -37,7 +34,8 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb11
+Depends: ${shlibs:Depends}, ${misc:Depends}, libatomic-ops-dev,
+ libmonetdb11, libmonetdb-stream-dev
Description: MonetDB development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -48,8 +46,6 @@ Description: MonetDB development files
functionality of MonetDB.
Package: libmonetdb-stream6
-Conflicts: libmonetdb-stream2
-Replaces: libmonetdb-stream2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -76,8 +72,6 @@ Description: MonetDB stream library deve
Package: libmonetdb-client7
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb-client1, libmonetdb-client2
-Replaces: libmonetdb-client1, libmonetdb-client2
Description: MonetDB client/server interface library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -128,8 +122,6 @@ Description: MonetDB database client
Package: libmonetdb-client-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb-client-odbc1, libmonetdb-client-odbc-dev
-Replaces: libmonetdb-client-odbc1, libmonetdb-client-odbc-dev
Description: MonetDB ODBC driver
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -154,8 +146,6 @@ Package: perl-monetdb-client
Architecture: any
Depends: ${shlibs:Depends}, ${perl:Depends}
Provides: ${perl:Provides}
-Conflicts: libmonetdb-client-perl
-Replaces: libmonetdb-client-perl
Description: MonetDB perl client code
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -194,8 +184,6 @@ Package: libmonetdb5-server-geom
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
-Conflicts: libmonetdb5-server-geom0, monetdb-geom, monetdb-geom-dev
-Replaces: libmonetdb5-server-geom0, monetdb-geom, monetdb-geom-dev
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -234,8 +222,6 @@ Description: MonetDB5 SQL GIS support mo
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: libmonetdb5-server5, libmonetdb5-server-dev, libmonetdb1,
libmonetdb-dev
-Replaces: libmonetdb5-server5, libmonetdb5-server-dev
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -248,7 +234,7 @@ Description: MonetDB database server ver
Package: monetdb5-server-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server, libmonetdb-dev
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -261,8 +247,6 @@ Description: MonetDB database server ver
Package: monetdb5-sql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server (=
${source:Version})
-Conflicts: libmonetdb5-sql2
-Replaces: libmonetdb5-sql2
Description: MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
