diff -Nru firebird2.5-2.5.6.27020.ds4/debian/changelog firebird2.5-2.5.6.27020.ds4/debian/changelog --- firebird2.5-2.5.6.27020.ds4/debian/changelog 2016-12-13 13:45:10.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/changelog 2016-12-13 13:49:04.000000000 +0000 @@ -1,3 +1,9 @@ +firebird2.5 (2.5.6.27020.ds4-2ubuntu7) precise; urgency=medium + + * use rules fom 2.5.5 , no export + + -- Popa Adrian Marius (Mariuz) Tue, 13 Dec 2016 15:48:43 +0200 + firebird2.5 (2.5.6.27020.ds4-2ubuntu6) precise; urgency=medium * remove export diff -Nru firebird2.5-2.5.6.27020.ds4/debian/rules firebird2.5-2.5.6.27020.ds4/debian/rules --- firebird2.5-2.5.6.27020.ds4/debian/rules 2016-12-13 13:44:49.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/rules 2016-12-13 13:47:29.000000000 +0000 @@ -115,7 +115,7 @@ -sh debian/clean-after-build.sh chmod u+x ./configure - export $(shell dpkg-buildflags); CFLAGS= CXXFLAGS="$$CXXFLAGS -std=gnu++98" ./configure $(confflags) --enable-superserver + CFLAGS= CXXFLAGS="-std=gnu++98" ./configure $(confflags) --enable-superserver awk '/^# stored/, /^fb_version/ { print }' gen/firebird/bin/fb_config @@ -132,7 +132,7 @@ -sh debian/clean-after-build.sh chmod u+x ./configure - export $(shell dpkg-buildflags); CFLAGS= CXXFLAGS="$$CXXFLAGS -std=gnu++98" ./configure $(confflags) + CFLAGS= CXXFLAGS="-std=gnu++98" ./configure $(confflags) touch $@ @@ -171,23 +171,13 @@ echo Starting build-super-server dh_testdir [ -d $(FIREBIRD_TMP) ] || mkdir $(FIREBIRD_TMP) - export $(shell dpkg-buildflags); $(MAKE) $(NJOBS) + $(shell dpkg-buildflags --export=sh); export CXXFLAGS="$$(CXXFLAGS) -std=gnu++98"; $(MAKE) $(NJOBS) # moving to SuperServer target rm -rf ./debian/firebird-super $(FAKEROOT) $(MAKE) -C gen -f Makefile.install buildRoot mv ./gen/buildroot ./debian/firebird-super - #g++ -I. -Isrc/include -Idebian/firebird-super/usr/include \ - -Wall \ - -o debian/fdb-r15y-prune debian/fdb-r15y-prune.cpp \ - -lfbclient -Ldebian/firebird-super/usr/lib/$(DEB_HOST_MULTIARCH) \ - $(shell dpkg-buildflags --get CXXFLAGS) \ - $(shell dpkg-buildflags --get CPPFLAGS) \ - $(shell dpkg-buildflags --get LDFLAGS) - #LD_LIBRARY_PATH=debian/firebird-super/usr/lib/$(DEB_HOST_MULTIARCH) debian/fdb-r15y-prune debian/firebird-super/var/lib/firebird/$(FB_VER)/system/help.fdb "$(SOURCE_DATE)" - #LD_LIBRARY_PATH=debian/firebird-super/usr/lib/$(DEB_HOST_MULTIARCH) debian/fdb-r15y-prune debian/firebird-super/var/lib/firebird/$(FB_VER)/system/security2.fdb "$(SOURCE_DATE)" - #LD_LIBRARY_PATH=debian/firebird-super/usr/lib/$(DEB_HOST_MULTIARCH) debian/fdb-r15y-prune debian/firebird-super/usr/share/doc/firebird2.5-common-doc/examples/empbuild/employee.fdb "$(SOURCE_DATE)" - + touch $@ .PHONY: build-classic @@ -196,7 +186,7 @@ echo Starting build-classic-server dh_testdir [ -d $(FIREBIRD_TMP) ] || mkdir $(FIREBIRD_TMP) - export $(shell dpkg-buildflags); $(MAKE) $(NJOBS) + $(shell dpkg-buildflags --export=sh); export CXXFLAGS="$$(CXXFLAGS) -std=gnu++98"; $(MAKE) $(NJOBS) # moving to ClassicServer target rm -rf ./debian/firebird-classic