Hey Cyril, On Sat, Jul 21, 2012 at 01:33:21AM +0200, Cyril Brulebois wrote: > > alright, then you could just use (in addition to the build-dep tweak): > | %: > | dh $@ -Scmake
I have made the appropriate changes now: - call cmake through debhelper as suggested above, add build dependency for cmake - drop a patch to make the installation directory of the Makefile relocatable (the patch is not required anymore since the Makefile is overwritten by calling cmake anyway) - fix the version number in the upstream CMakeLists.txt (it still contains "pre1" which was the version number of the pre-release version); keeping the pre1 would add that to the .so-name - update the changelog accordingly > > Overriding dh_auto_configure without overring dh_auto_build (and > possibly others) would seem a bit strange to me, but that could just be > my being dumb. Well, no. I just didn't know better. Thanks for the heads up! ;) Cheers, Adrian
diff --git a/debian/changelog b/debian/changelog index da531e8..8ff83d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +z80ex (1.1.19-3) unstable; urgency=low + + * Force calling cmake through debhelper to make sure + endianness is set correctly (Closes: #682018) + * Add build dependency for cmake. + + -- John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> Fri, 20 Jul 2012 01:50:57 +0200 + z80ex (1.1.19-2) unstable; urgency=low [ John Paul Adrian Glaubitz ] diff --git a/debian/control b/debian/control index 83a4aec..cbf85d1 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: z80ex Priority: extra Maintainer: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 9), cmake Standards-Version: 3.9.2 Section: libs Homepage: http://z80ex.sourceforge.net/ diff --git a/debian/patches/0001-Fix-version-number-in-CMakeLists.txt-remove-pre1-suf.patch b/debian/patches/0001-Fix-version-number-in-CMakeLists.txt-remove-pre1-suf.patch new file mode 100644 index 0000000..62bf40c --- /dev/null +++ b/debian/patches/0001-Fix-version-number-in-CMakeLists.txt-remove-pre1-suf.patch @@ -0,0 +1,21 @@ +From: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> +Date: Sat, 21 Jul 2012 20:59:57 +0200 +Subject: Fix version number in CMakeLists.txt, remove pre1 suffix. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 41d42a3..7578f24 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ project (z80ex) + set (API_REVISION 1) + set (VERSION_MAJOR 1) + set (VERSION_MINOR 19) +-set (RELEASE_TYPE "pre1") ++set (RELEASE_TYPE "") + set (VERSION_STR "${API_REVISION}.${VERSION_MAJOR}.${VERSION_MINOR}${RELEASE_TYPE}") + + option (OPSTEP_FAST_AND_ROUGH "Fast and rough opcode step emulation mode" Off) diff --git a/debian/patches/relocatable_installation_directory-Makefile.patch b/debian/patches/relocatable_installation_directory-Makefile.patch deleted file mode 100644 index c98bbfb..0000000 --- a/debian/patches/relocatable_installation_directory-Makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -Subject: patch Makefile to enable installation in a configurable directory -Author: Adrian Glaubitz <glaub...@physik.fu-berlin.de> ---- a/Makefile -+++ b/Makefile -@@ -5,7 +5,8 @@ - ################################################################# - # You may tune these values to feet your setup: - ################################################################# --INSTALL_PREFIX := /usr/local -+INSTALL_PREFIX := $(DESTDIR)/usr -+#$(CURDIR)/debian/libz80ex/usr - CC := gcc - ALL_CFLAGS := -fPIC -fno-common -ansi -pedantic -Wall -pipe -O2 -I. -I./include - LINKER := gcc diff --git a/debian/patches/series b/debian/patches/series index e8ca69e..4e22770 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -relocatable_installation_directory-Makefile.patch +0001-Fix-version-number-in-CMakeLists.txt-remove-pre1-suf.patch diff --git a/debian/rules b/debian/rules index c0b85db..74a12c0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,4 +19,4 @@ override_dh_install: dh_install %: - dh $@ + dh $@ -Scmake