[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.4+dfsg1-3-19-ge880599

Wed Jun 5 19:29:51 UTC 2013

The following commit has been merged in the master branch:
commit 95745fcc65dbe85644dbd7792dbddd3b1ac4a05b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jun 5 00:20:27 2013 +0200

    Migrate to dh 9.

diff --git a/debian/changelog b/debian/changelog
index 4e8636a..bd3b921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ virtuoso-opensource (6.1.6+dfsg-1) UNRELEASED; urgency=low
 
   [ Maximiliano Curia ]
   * Update aclocal and automake versions.
+  * Migrate to dh 9.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Jun 2013 12:39:58 +0200
 
diff --git a/debian/control b/debian/control
index e9cdb7e..24a4111 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: database
 Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://virtuoso.openlinksw.com/wiki/main/Main/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtuoso/pkg-virtuoso.git
 Vcs-Git: git://anonscm.debian.org/pkg-virtuoso/pkg-virtuoso.git
-Build-Depends: cdbs, debhelper (>= 9), autotools-dev, autoconf (>=2.57),
- automake (>=1.10), libtool (>=1.5.16), flex (>=2.5.4), bison (>=1.35),
- gperf (>=2.7.2), gawk (>=3.1.1), m4 (>=1.4.1), make (>=3.79.1),
- libssl-dev (>=0.9.7), libreadline-dev, zlib1g-dev, libxml2-dev, libpcre3-dev,
- libldap2-dev, net-tools,
+Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-kde-tools, autotools-dev,
+ autoconf (>= 2.57), automake (>= 1.10), libtool (>= 1.5.16), flex (>= 2.5.4),
+ bison (>= 1.35), gperf (>= 2.7.2), gawk (>= 3.1.1), m4 (>= 1.4.1),
+ make (>= 3.79.1), libssl-dev (>= 0.9.7), libreadline-dev, zlib1g-dev,
+ libxml2-dev, libpcre3-dev, libldap2-dev, net-tools,
  mono-devel (>= 2.4.3) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armhf armel sparc s390x ppc64],
  cli-common-dev (>= 0.8~) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armhf armel sparc s390x ppc64],
  docbook2x, po-debconf, libwbxml2-dev, libmagickwand-dev
diff --git a/debian/libvirtodbc0.install b/debian/libvirtodbc0.install
index 09523cb..6359a81 100644
--- a/debian/libvirtodbc0.install
+++ b/debian/libvirtodbc0.install
@@ -1,2 +1 @@
-usr/lib/virtodbc*.so usr/lib/odbc/
 ../odbcinst.ini usr/share/libvirtodbc0/
diff --git a/debian/rules b/debian/rules
index 2dcdff8..eef987f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,71 +1,47 @@
 #!/usr/bin/make -f
+export DEBIANPKG=virtuoso-opensource-6.1
+export MONO_DISABLE_SHM=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-DEB_AUTO_UPDATE_ACLOCAL = 1.13
-DEB_AUTO_UPDATE_AUTOCONF = 2.61
-DEB_AUTO_UPDATE_AUTOMAKE = 1.13
-DEB_AUTO_UPDATE_LIBTOOL = pre
-
-DEB_AUTOMAKE_ARGS += -Wno-portability --add-missing --copy
-
-DEB_CONFIGURE_EXTRA_FLAGS = --with-layout=debian \
-		--program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
-		--with-readline --without-internal-zlib
-
-ifeq ($(DEB_BUILD_ARCH),alpha)
-		EXTRA_LDFLAGS += -Wl,--no-relax
-endif
-
-EXTRA_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
-
-ifeq (hurd,$(findstring hurd,$(DEB_BUILD_ARCH)))
-		CFLAGS += -D_GNU_SOURCE
-endif
-
-ifeq (kfreebsd,$(findstring kfreebsd,$(DEB_BUILD_ARCH)))
-		CFLAGS += -D_GNU_SOURCE
+DH_WITH := --with autoreconf,pkgkde_symbolshelper
+ifneq (,$(filter %-cil, $(shell dh_listpackages)))
+	DH_WITH := $(DH_WITH),cli
+	VIRTUOSO_CIL = yes
 endif
 
-DEB_CONFIGURE_SCRIPT_ENV += \
-		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)" \
-		MONO_DISABLE_SHM=1 \
-        DEBIANPKG=virtuoso-opensource-6.1
+%:
+	dh $@ --parallel $(DH_WITH)
 
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-# update-rc.d is manually called in virtuoso-opensource-6.1.postinst
-# See note there.
-DEB_DH_INSTALLINIT_ARGS += --noscripts
+override_dh_auto_configure:
+	dh_auto_configure -- --with-layout=debian --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' --with-readline --without-internal-zlib
 
-# Disabled for now
-#DEB_MAKE_INVOKE += -j
-#.NOTPARALLEL:
-
-clean::
-	debconf-updatepo
-
-build/virtuoso-opensource-6.1::
-	cd debian; find . -name "*.?.xml" -exec docbook2x-man --solinks {} \;
-
-cleanbuilddir/virtuoso-opensource-6.1::
-	rm -f debian/*.1
-
-build/libvirtuoso5.5-cil::
-	$(MAKE) -C binsrc/VirtuosoClient.Net -f Makefile.mono
+override_dh_auto_build:
+	dh_auto_build
+	# manpages
+	find debian -maxdepth 1 -type f -name '*.1.xml' -execdir docbook2x-man --solinks {} \;
+	# libvirtuoso5.5-cil
+ifdef VIRTUOSO_CIL
+	make -C binsrc/VirtuosoClient.Net -f Makefile.mono
 	chmod -x binsrc/VirtuosoClient.Net/OpenLink.Data.Virtuoso.dll
+endif
 
-cleanbuilddir/libvirtuoso5.5-cil::
-	$(MAKE) -C binsrc/VirtuosoClient.Net -f Makefile.mono clean
+override_dh_install:
+	dh_install -plibvirtodbc0 usr/lib/*/virtodbc*.so usr/lib/$(DEB_HOST_MULTIARCH)/odbc
+	dh_install --remaining-packages
 
-binary-install/libvirtuoso5.5-cil::
-	dh_installcligac
+override_dh_installinit:
+	dh_installinit --noscripts
 
-binary-predeb/libvirtuoso5.5-cil::
-	dh_makeclilibs
-	dh_clideps -d
+override_dh_auto_clean:
+	# manpages clean
+	rm -f debian/*.1
+	# libvirtuoso5.5-cil clean
+ifdef VIRTUOSO_CIL
+	make -C binsrc/VirtuosoClient.Net -f Makefile.mono clean
+endif
+	dh_auto_clean
 
-get-orig-source:
-	-uscan --download --verbose
diff --git a/debian/virtuoso-opensource-6.1.install b/debian/virtuoso-opensource-6.1.install
index 8345ced..ab14362 100644
--- a/debian/virtuoso-opensource-6.1.install
+++ b/debian/virtuoso-opensource-6.1.install
@@ -1,3 +1,3 @@
-usr/lib/virtuoso-opensource-6.1/hosting/*.so
+usr/lib/*/virtuoso-opensource-6.1/hosting/*.so
 var/lib/virtuoso-opensource-6.1/db/virtuoso.ini usr/share/virtuoso-opensource-6.1/
 ../odbc.ini usr/share/virtuoso-opensource-6.1/

-- 
Git repository for pkg-virtuoso

