X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=0b3b5a1b33acf9cef3e01e03ee501cb415ec7a34;hb=c09664fb48b008394fa61ebaf4870c14d5fb1984;hp=66682a3af67752b97b8639c20cac5f311ccb0586;hpb=d201492ea7198dd89dbae087eec0363a8e64e089;p=metaproxy-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 66682a3..0b3b5a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,34 +6,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Force compat level four
-export DH_COMPAT=4
-
 # 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
-
+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 --with-yazpp=/usr/bin
-
-#--infodir=\$${prefix}/share/info --enable-shared --enable-static --with-xslt
-
+	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 \
+		--with-yazpp=/usr/bin --without-usemarcon \
+		--prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status
@@ -84,6 +77,7 @@ binary-arch: build install
 	mv debian/tmp/usr/share/doc/metaproxy debian/tmp/usr/share/doc/metaproxy-doc
 	mkdir -p debian/tmp/etc/metaproxy
 	cp debian/metaproxy.xml debian/tmp/etc/metaproxy/metaproxy.xml
+	cp rpm/metaproxy.user debian/tmp/etc/metaproxy/metaproxy.user
 	dh_install 
 #	dh_installmenu
 #	dh_installdebconf	
@@ -96,12 +90,12 @@ binary-arch: build install
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=libmetaproxy4-dbg
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libmetaproxy4 (>= 1.2.9)'
+	dh_makeshlibs -V 'libmetaproxy4 (>= 1.3.28)'
 	dh_installdeb
 	dh_shlibdeps  -l debian/libmetaproxy4/usr/lib
 	dh_gencontrol