Merge branch 'release/7.2.2' into develop/7

ChangeLog

@@ -1,3 +1,21 @@
+2015-12-09  VOS Maintainer  <[email protected]>
+
+	Updated version to 7.2.2
+
+	Fixed typo
+
+	Fixed build speed
+
+2015-12-09  Patrick van Kleef  <[email protected]>
+
+	Updated changelog
+
+	Fixed packaging of Virtuoso .NET adapter on debian/ubuntu
+
+2015-12-09  VOS Maintainer  <[email protected]>
+
+	Fixed missing files from distribution
+
 2015-12-08  VOS Maintainer  <[email protected]>
 
 	Show a more realistic disk space consumption by testsuite

NEWS

@@ -20,6 +20,7 @@ December 09, 2015, V7.2.2:
     - Fixed issue with cascaded delete
     - Fixed allow identity to start with 0
     - Fixed memory leaks
+    - Updated debian packaging
     - Updated testsuite
     - Updated documentation
 

binsrc/driver/Makefile.am

@@ -22,7 +22,7 @@
 #
 #  Driver version and description
 #
-DRIVER_VERS	= 07.00.3214
+DRIVER_VERS	= 07.02.3215
 DRIVER_DESC	= OpenLink Virtuoso ODBC Driver
 
 

binsrc/tests/biftest/Makefile.am

@@ -28,13 +28,13 @@ LIBMONO=
 endif
 
 if WITH_IODBC
-IODBC_EXTRA = virtuoso-iodbc-sample-t
+XIODBC_EXTRA = virtuoso-iodbc-sample-t
 endif
 
 if INTEG_JDK
 INTEG_JDK_PROGS = virtuoso-javavm-t
 if WITH_IODBC
-IODBC_JDK_EXTRA	= virtuoso-iodbc-javavm_t
+XIODBC_JDK_EXTRA	= virtuoso-iodbc-javavm_t
 endif
 endif
 

binsrc/virtuoso/Makefile.am

@@ -32,9 +32,9 @@ else
 endif
 
 if WITH_IODBC
-    IODBC_LIBS=libvirtuoso-iodbc-t.la
-    IODBC_PROGS=virtuoso-iodbc-t
-    VIRTUOSO_BIN=virtuoso-iodbc-t
+    XIODBC_LIBS=libvirtuoso-iodbc-t.la
+    XIODBC_PROGS=virtuoso-iodbc-t
+    VIRTUOSO_BIN=virtuoso-t
 else
     VIRTUOSO_BIN=virtuoso-t
 endif

configure.in

@@ -32,7 +32,7 @@ AC_REVISION($Id$)
 m4_define(vos_major,	[7])
 m4_define(vos_minor,	[2])
 m4_define(vos_patch,	[2])
-m4_define(vos_devel,	[-rc2])
+m4_define(vos_devel,	[])
 
 AC_INIT([Virtuoso Open Source Edition (Column Store)],
 	vos_major.vos_minor.vos_patch[]vos_devel,

debian/changelog

@@ -1,3 +1,9 @@
+virtuoso-opensource (7.2.2) unstable; urgency=medium
+
+  * Fixed debian packaging of the Virtuoso .NET adapter
+
+ -- OpenLink Virtuoso Maintainer <[email protected]>  Wed, 09 Dec 2015 21:00:00 +0100
+
 virtuoso-opensource (7.2) unstable; urgency=low
 
   * Remove openjdk-6-jdk and virtjdbc4.jar from libvirtjdbc0 target

debian/control

@@ -293,7 +293,9 @@ Description: high-performance database - ODBC libraries
  .
  This package contains the Virtuoso ODBC client libraries.
 
-Package: libvirtuoso5.5-cil
+Package: libvirtmono0-cil
+Replaces: libvirtuoso5.5-cil
+Breaks: libvirtuoso5.5-cil
 Section: cli-mono
 Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: ${cli:Depends}, ${misc:Depends}

debian/libvirtmono0-cil.install

@@ -0,0 +1,2 @@
+../../binsrc/VirtuosoClient.Net/*.dll /usr/lib/cli/virtuoso-opensource-7
+../virtuoso-mono.pc /usr/lib/pkgconfig

debian/rules

@@ -24,7 +24,8 @@ endif
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-layout=debian \
 		--program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
-		--with-readline --without-internal-zlib \
+		--with-readline \
+		--without-internal-zlib \
 		--enable-maintainer-mode \
 		--without-iodbc \
 		--enable-demo-vad \
@@ -66,17 +67,17 @@ pre-build::
 build/virtuoso-opensource-7::
 	cd debian; find . -name "*.?.xml" -exec docbook2x-man --solinks {} \;
 
-build/libvirtuoso5.5-cil::
-	$(MAKE) -C binsrc/VirtuosoClient.Net -f Makefile.mono
+build/libvirtmono0-cil::
+	$(MAKE) -C binsrc/VirtuosoClient.Net
 	chmod -x binsrc/VirtuosoClient.Net/OpenLink.Data.Virtuoso.dll
 
-cleanbuilddir/libvirtuoso5.5-cil::
-	$(MAKE) -C binsrc/VirtuosoClient.Net -f Makefile.mono clean
+cleanbuilddir/libvirtmono0-cil::
+	$(MAKE) -C binsrc/VirtuosoClient.Net clean
 
-binary-install/libvirtuoso5.5-cil::
+binary-install/libvirtmono0-cil::
 	dh_installcligac
 
-binary-predeb/libvirtuoso5.5-cil::
+binary-predeb/libvirtmono0-cil::
 	dh_makeclilibs
 	dh_clideps -d
 

debian/virtuoso-5.5.pc → debian/virtuoso-mono.pc

@@ -1,8 +1,8 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib/cli/virtuoso-5.5
+libdir=${prefix}/lib/cli/virtuoso-opensource-7
 
 Name: OpenLink.Data
 Description: Virtuoso .NET Data Connector
-Version: 5.5.3015.1
+Version: 07.02.3215
 Libs: -r:${libdir}/OpenLink.Data.Virtuoso.dll

debian/virtuoso-opensource-7.init

@@ -30,7 +30,7 @@
 # Should-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Virtuoso OpenSource Edition
+# Short-Description: Virtuoso Open Source Edition
 # Description:       This file should be used to start/stop the virtuoso-t
 #                    daemon for the default installed database.
 ### END INIT INFO
@@ -40,7 +40,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/virtuoso-t
 NAME=virtuoso-opensource-7
 SHORTNAME=virtuoso
-DESC="Virtuoso OpenSource Edition 7.2"
+DESC="Virtuoso Open Source Edition 7.2"
 DBPATH=/var/lib/virtuoso-opensource-7/db
 LOGDIR=/var/log/virtuoso-opensource-7  # Log directory to use
 

libsrc/Wi/Makefile.am

@@ -44,7 +44,7 @@ endif
 GEN=$(SHELL) ${top_srcdir}/bin/generate
 
 
-noinst_LTLIBRARIES = libwi.la libwic.la $(IODBC_LIBS)
+noinst_LTLIBRARIES = libwi.la libwic.la # $(IODBC_LIBS)
 noinst_HEADERS = \
 	2pc_client.h 2pc.h arith.h bif_text.h bif_xper.h blobio.h CLI.h \
 	crsr.h date.h datesupp.h eqlcomp.h hosting.h http_client.h http.h \