X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=10ac5ec30e0ab3524d00c0ac2fc11aaea7a1fd1e;hb=1f342ea4ef1128240f7830cc6055333aa1afbb47;hp=ef1309cb6022dad046820d56934cccbf8404429d;hpb=8d0d83a86d852bfe5166f4f6913c7c5a9817b510;p=yazpp-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index ef1309c..10ac5ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,38 +6,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+ 
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --with-xml2=/usr
-
+	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-shared --with-yaz=/usr/bin \
+		--prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status
@@ -84,10 +73,11 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	cp LICENSE debian/copyright
-	dh_installdocs -A README.txt
-	dh_installchangelogs ChangeLog
+	dh_installdocs -A README
+	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installexamples
+	mv debian/tmp/usr/share/doc/yazpp debian/tmp/usr/share/doc/yazpp-doc
 	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
@@ -100,14 +90,14 @@ binary-arch: build install
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=libyazpp5-dbg
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libyaz++ (>= 0.7.8)'
+	dh_makeshlibs -V 'libyazpp5 (>= 1.4.1)'
 	dh_installdeb
-	dh_shlibdeps -l debian/libyaz++/usr/lib
+	dh_shlibdeps -l debian/libyazpp5/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb