Changeset: 605388211d34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/605388211d34
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (252 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -780,3 +780,4 @@ bdd04053973daa8a786a30e07b2bf1bd8aa6ebf1
bdd04053973daa8a786a30e07b2bf1bd8aa6ebf1 Jul2021_SP8_release
688ff09b2edc3d637f658f3e7ef3d5f07e3e8f9c Sep2022_1
ea797696d5e8d8d550f21f09b98d3bcade1d001d Sep2022_3
+68c0e35095ad6a58766c6c1e77229d73148433e2 Sep2022_5
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -855,6 +855,9 @@ fi
%endif
%changelog
+* Thu Sep 22 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.5-20220922
+- Rebuilt.
+
* Wed Sep 21 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.3-20220921
- Rebuilt.
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -44,9 +44,9 @@ set(GDK_VERSION_PATCH "1")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
-set(MAPI_VERSION_MAJOR "14")
+set(MAPI_VERSION_MAJOR "26")
set(MAPI_VERSION_MINOR "0")
-set(MAPI_VERSION_PATCH "4")
+set(MAPI_VERSION_PATCH "0")
set(MAPI_VERSION
"${MAPI_VERSION_MAJOR}.${MAPI_VERSION_MINOR}.${MAPI_VERSION_PATCH}")
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
@@ -56,13 +56,13 @@ set(MONETDB5_VERSION_PATCH "0")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
-set(MONETDBE_VERSION_MAJOR "3")
-set(MONETDBE_VERSION_MINOR "1")
+set(MONETDBE_VERSION_MAJOR "26")
+set(MONETDBE_VERSION_MINOR "0")
set(MONETDBE_VERSION_PATCH "0")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
-set(STREAM_VERSION_MAJOR "17")
+set(STREAM_VERSION_MAJOR "26")
set(STREAM_VERSION_MINOR "0")
set(STREAM_VERSION_PATCH "0")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.45.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Thu, 22 Sep 2022 17:59:36 +0200
+
monetdb (11.45.3) unstable; urgency=low
* Rebuilt.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ X-Python-Version: >= 2.6
Package: libmonetdb26
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream17 (= ${source:Version})
+ libmonetdb-stream26 (= ${source:Version})
Conflicts: libmonetdb5-server-geom (<< ${source:Version})
Description: MonetDB core library
MonetDB is a database management system that is developed from a
@@ -46,7 +46,7 @@ Description: MonetDB development files
This package contains files needed to develop extensions to the core
functionality of MonetDB.
-Package: libmonetdb-stream17
+Package: libmonetdb-stream26
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -61,7 +61,7 @@ Description: MonetDB stream library
Package: libmonetdb-stream-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream17 (= ${source:Version})
+ libmonetdb-stream26 (= ${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,
@@ -69,12 +69,12 @@ Description: MonetDB stream library deve
accelerators. It also has an SQL front end.
.
This package contains the files to develop with the
- libmonetdb-stream17 library.
+ libmonetdb-stream26 library.
-Package: libmonetdb-client14
+Package: libmonetdb-client26
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream17 (= ${source:Version})
+ libmonetdb-stream26 (= ${source:Version})
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,
@@ -87,21 +87,21 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-client14 (= ${source:Version})
+ libmonetdb-client26 (= ${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,
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
.
- This package contains the files to develop with the libmonetdb-client14
+ This package contains the files to develop with the libmonetdb-client26
library.
Package: monetdb-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-client14 (= ${source:Version}),
- libmonetdb-stream17 (= ${source:Version})
+ libmonetdb-client26 (= ${source:Version}),
+ libmonetdb-stream26 (= ${source:Version})
Recommends: monetdb5-sql (= ${source:Version}),
monetdb5-server (= ${source:Version})
Description: MonetDB database client
@@ -118,7 +118,7 @@ Description: MonetDB database client
Package: libmonetdb-client-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, odbcinst,
- libmonetdb-client14 (= ${source:Version})
+ libmonetdb-client26 (= ${source:Version})
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,
@@ -130,8 +130,8 @@ Description: MonetDB ODBC driver
Package: monetdb-client-testing
Architecture: any
Depends: ${shlibs:Depends}, libmonetdb-client-odbc (= ${source:Version}),
- libmonetdb-client14 (= ${source:Version}),
- libmonetdb-stream17 (= ${source:Version}),
+ libmonetdb-client26 (= ${source:Version}),
+ libmonetdb-stream26 (= ${source:Version}),
libmonetdb26 (= ${source:Version}),
monetdb5-server (= ${source:Version}),
libdbd-monetdb-perl (>= 1.0),
@@ -152,7 +152,7 @@ Package: libmonetdb5-server-geom
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream17 (= ${source:Version}),
+ libmonetdb-stream26 (= ${source:Version}),
libmonetdb26 (= ${source:Version}),
monetdb5-server (= ${source:Version})
Description: MonetDB5 SQL GIS support module
@@ -182,8 +182,8 @@ Description: MonetDB5 add on module for
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
- libmonetdb-client14 (= ${source:Version}),
- libmonetdb-stream17 (= ${source:Version}),
+ libmonetdb-client26 (= ${source:Version}),
+ libmonetdb-stream26 (= ${source:Version}),
libmonetdb26 (= ${source:Version}),
Recommends: monetdb5-sql (= ${source:Version})
Suggests: monetdb-client (= ${source:Version})
@@ -217,8 +217,8 @@ Description: MonetDB database server ver
Package: monetdb5-sql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-client14 (= ${source:Version}),
- libmonetdb-stream17 (= ${source:Version}),
+ libmonetdb-client26 (= ${source:Version}),
+ libmonetdb-stream26 (= ${source:Version}),
monetdb5-server (= ${source:Version})
Conflicts: monetdb5-sql-hugeint (<< 11.38.0)
Replaces: monetdb5-sql-hugeint (<< 11.38.0)
@@ -281,10 +281,10 @@ Description: Integration of MonetDB and
know how this package affects the security of your system, do not
install it.
-Package: libmonetdbe3
+Package: libmonetdbe26
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream17 (= ${source:Version}),
+ libmonetdb-stream26 (= ${source:Version}),
libmonetdb26 (= ${source:Version}),
monetdb5-server (= ${source:Version})
Description: MonetDB as an embedded library
@@ -299,7 +299,7 @@ Description: MonetDB as an embedded libr
Package: libmonetdbe-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdbe3 (= ${source:Version}),
+ libmonetdbe26 (= ${source:Version}),
libmonetdb-dev (= ${source:Version})
Description: MonetDB development files
MonetDB is a database management system that is developed from a
@@ -313,7 +313,7 @@ Description: MonetDB development files
Package: monetdb-embedded-testing
Architecture: any
Depends: ${shlibs:Depends},
- libmonetdbe3 (= ${source:Version}),
+ libmonetdbe26 (= ${source:Version}),
libmonetdbe (= ${source:Version})
Description: MonetDB embedded testing tools
MonetDB is a database management system that is developed from a
diff --git a/debian/libmonetdb-client14.install
b/debian/libmonetdb-client26.install
rename from debian/libmonetdb-client14.install
rename to debian/libmonetdb-client26.install
diff --git a/debian/libmonetdb-stream17.install
b/debian/libmonetdb-stream26.install
rename from debian/libmonetdb-stream17.install
rename to debian/libmonetdb-stream26.install
diff --git a/debian/libmonetdbe3.install b/debian/libmonetdbe26.install
rename from debian/libmonetdbe3.install
rename to debian/libmonetdbe26.install
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,9 @@
+monetdb (11.45.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Thu, 22 Sep 2022 17:59:36 +0200
+
monetdb (11.45.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,6 @@
+* Thu Sep 22 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.5-20220922
+- Rebuilt.
+
* Wed Sep 21 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.3-20220921
- Rebuilt.
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
