Changeset: 9fda1be9c35f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9fda1be9c35f
Modified Files:
        MonetDB.spec
        debian/control
Branch: Jun2016
Log Message:

Packaging errors and improvements.
Mtest.py is actually architecture-dependent (because of the
conditionals).
Add version checks to Debian/Ubuntu packages.


diffs (195 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -910,7 +910,6 @@ Group: Applications/Databases
 Requires: %{name}-testing = %{version}-%{release}
 Requires: %{name}-client-tests = %{version}-%{release}
 Requires: python
-BuildArch: noarch
 
 %description testing-python
 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
@@ -19,6 +19,7 @@ X-Python3-Version: >= 3.0
 Package: libmonetdb13
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmonetdb5-server-geom (< ${source:Version})
 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,
@@ -58,7 +59,8 @@ Description: MonetDB stream library
 
 Package: libmonetdb-stream-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream8
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libmonetdb-stream8 (= ${source:Version})
 Description: MonetDB stream library development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -82,7 +84,8 @@ Description: MonetDB client/server inter
 
 Package: libmonetdb-client-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client8
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libmonetdb-client8 (= ${source:Version})
 Description: MonetDB client/server interface library development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -95,7 +98,7 @@ Description: MonetDB client/server inter
 Package: monetdb-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: monetdb5-sql
+Recommends: monetdb5-sql (= ${source:Version})
 Description: MonetDB database client
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -109,7 +112,8 @@ Description: MonetDB database client
 
 Package: monetdb-client-tools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb-client
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb-client (= ${source:Version})
 Description: MonetDB database client
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -143,7 +147,7 @@ Description: MonetDB php5 client module
  program.
 
 Package: perl-monetdb-client
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${perl:Depends}, libdbi-perl
 Provides: ${perl:Provides}
 Description: MonetDB perl client code
@@ -157,7 +161,12 @@ Description: MonetDB perl client code
 
 Package: monetdb-client-testing
 Architecture: any
-Depends: ${shlibs:Depends}, libmonetdb-client-odbc, monetdb5-server, 
perl-monetdb-client, php5-monetdb-client, python-monetdb, monetdb5-sql
+Depends: ${shlibs:Depends}, libmonetdb-client-odbc (= ${source:Version}),
+ monetdb5-server (= ${source:Version}),
+ perl-monetdb-client (= ${source:Version}),
+ php5-monetdb-client (= ${source:Version}),
+ python-monetdb (= ${source:Version}),
+ monetdb5-sql (= ${source:Version})
 Description: MonetDB client testing tools
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -171,7 +180,8 @@ Description: MonetDB client testing tool
 Package: libmonetdb5-server-geom
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
 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,
@@ -184,7 +194,8 @@ Description: MonetDB5 SQL GIS support mo
 Package: libmonetdb5-server-lidar
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
 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,
@@ -196,7 +207,8 @@ Description: MonetDB5 SQL GIS support mo
 Package: libmonetdb5-server-gsl
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
 Description: MonetDB5 SQL interface to the gsl library
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -209,7 +221,8 @@ Description: MonetDB5 SQL interface to t
 Package: libmonetdb5-server-bam
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
 Description: MonetDB5 SQL interface to the bam library
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -222,8 +235,9 @@ Description: MonetDB5 SQL interface to t
 Package: monetdb5-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: monetdb5-server-hugeint [amd64], monetdb5-sql
-Suggests: monetdb-client
+Recommends: monetdb5-server-hugeint [amd64] (= ${source:Version}),
+ monetdb5-sql (= ${source:Version})
+Suggests: monetdb-client (= ${source:Version})
 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 +262,8 @@ Description: MonetDB - 128-bit integer s
 
 Package: monetdb5-server-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server, libmonetdb-dev
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-server (= ${source:Version}), libmonetdb-dev (= ${source:Version})
 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,
@@ -260,9 +275,10 @@ Description: MonetDB database server ver
 
 Package: monetdb5-sql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server (= 
${source:Version})
-Recommends: monetdb5-sql-hugeint [amd64]
-Suggests: monetdb-client
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-server (= ${source:Version})
+Recommends: monetdb5-sql-hugeint [amd64] (= ${source:Version})
+Suggests: monetdb-client (= ${source:Version})
 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,
@@ -273,7 +289,8 @@ Description: MonetDB SQL support for mon
 
 Package: monetdb5-sql-hugeint
 Architecture: amd64
-Depends: monetdb5-sql (= ${source:Version}), monetdb5-server-hugeint (= 
${source:Version})
+Depends: monetdb5-sql (= ${source:Version}),
+ monetdb5-server-hugeint (= ${source:Version})
 Description: MonetDB5 128 bit integer (hugeint) support for SQL
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -285,8 +302,9 @@ Description: MonetDB5 128 bit integer (h
 
 Package: monetdb-r
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql (= ${source:Version})
-Description: MonetDB5 128 bit integer (hugeint) support for SQL
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
+Description: Integration of MonetDB and R, allowing use of R from within SQL
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
  automatic index management, extensibility of data types and search
@@ -313,8 +331,10 @@ Description: MonetDB testing programs
  developer.  If you do want to test, install monetdb-testing-python.
 
 Package: monetdb-testing-python
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, monetdb-testing (= 
${source:Version}), monetdb-client-testing (= ${source:Version})
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+ monetdb-testing (= ${source:Version}),
+ monetdb-client-testing (= ${source:Version})
 Description: MonetDB testing Python programs
  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

Reply via email to