[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-35-g2c98fa6

Alexander Dreyer adreyer at gmx.de
Sun Dec 23 13:21:59 UTC 2012


The following commit has been merged in the master branch:
commit 2c98fa6f486f49ba0c8e4e5b6ca20826ad83caad
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Sun Dec 23 10:25:21 2012 +0100

    using dh

diff --git a/debian/python-polybori.install b/debian/python-polybori.install
index 1915927..7b39bb6 100644
--- a/debian/python-polybori.install
+++ b/debian/python-polybori.install
@@ -1,4 +1,4 @@
-usr/lib/python* 
+usr/lib/python*/
 usr/share/polybori
 usr/bin
 usr/share/man
diff --git a/debian/rules b/debian/rules
index b03b79c..586e106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,62 +7,51 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 NUMJOBS=$(filter parallel=%,$(DEB_BUILD_OPTIONS))
 SCONSPARFLAGS=$(subst parallel=,-j, $(NUMJOBS))
 
-build-stamp: $(PYVERS:%=stamp-build-python%)
-	touch $@
-build: build-arch build-indep
-	ipbori/ipbori -t || exit 1 # self test
+%:
+	dh $@ --with python2
 
-build-arch: build-stamp
-build-indep: build-stamp
+TMPDEST=debian/tmp/
+PYTHON=/usr/bin/python$*
+PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
 
-stamp-build-python%: build-python%
-	touch $@
-
-build-python%: TMPDEST=debian/python-polybori$*
-build-python%: PYTHON=/usr/bin/python$*
-build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
-
-build-python%:
-	scons $(SCONSPARFLAGS) prepare-install INSTALLDIR=$(TMPDEST)/usr/share/polybori \
+override_dh_auto_configure:
+	
+override_dh_auto_build:
+	scons $(SCONSPARFLAGS) prepare-install prepare-devel INSTALLDIR=$(TMPDEST)/usr/share/polybori \
 		PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
 		PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
 		DOCDIR=$(TMPDEST)/usr/share/doc/polybori PYTHON=$(PYTHON) \
-		LINKFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \
-		CCFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
-		CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
-		CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS)" \
+		LINKFLAGS="$(LDFLAGS)" \
+		CCFLAGS="$(CPPFLAGS)" \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
 		LIBRARY_VERSION="2.0.0" SHLIBVERSIONSUFFIX='-0.8.so.2.0.0' \
 		DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
 		PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST)
-	-mkdir -p $(TMPDEST)
+	
+override_dh_auto_install:
+	#	-mkdir -p $(TMPDEST)
 	scons $(SCONSPARFLAGS) install devel-install INSTALLDIR=$(TMPDEST)/usr/share/polybori \
 		PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
 		PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
 		DOCDIR=$(TMPDEST)/usr/share/doc/polybori PYTHON=$(PYTHON) \
-		LINKFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \
-		CCFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
-		CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
-		CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS)" \
+		LINKFLAGS="$(LDFLAGS)" \
+		CCFLAGS="$(CPPFLAGS)" \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
 		LIBRARY_VERSION="2.0.0" SHLIBVERSIONSUFFIX='-0.8.so.2.0.0' \
 		DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
                 PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST)
+override_dh_auto_test:
+	ipbori/ipbori -t 
 
 
-install-%:
-	-mkdir debian/tmp/
-	cp -a debian/python-polybori$*/* debian/tmp/
-
-install: PYTHONSITE=`/usr/bin/python${PYVERS} -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
-
-install: $(PYVERS:%=install-%)
-	-mkdir -p debian/tmp/
-	-mkdir -p debian/tmp/usr/
-	-mkdir -p debian/tmp/usr/lib/
-	-mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-	-mkdir -p debian/tmp/usr/share
-
-clean:
-	$(MAKE) -C doc clean
+override_dh_clean:
+	rm -f doc/tutorial/tutorial.4ct
+	rm -f doc/tutorial/tutorial.4tc doc/tutorial/tutorial.aux doc/tutorial/tutorial.dvi
+	rm -f doc/tutorial/tutorial.idv doc/tutorial/tutorial.l*g doc/tutorial/tutorial.tmp
+	rm -f doc/tutorial/tutorial.xref doc/tutorial/tutorial.css        
+	rm -f doc/tutorial/tutorial*.html
 	rm -f doc/python/polybori.*.html
 	rm -f M4RI/config.log
 	rm -rf $(PYVERS:%=debian/python-polybori%)
@@ -75,74 +64,11 @@ clean:
 	rm -f build-python*
 	rm -rf build
 
-# Build architecture-independent files here.
-binary-indep: build-stamp install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_install
-	dh_installexamples -i
-#	dh_installmenu -i
-#	dh_installdebconf -i
-#	dh_installemacsen -i
-#	dh_installcatalogs -i
-#	dh_installmime -i
-#	dh_installcron -i
-#	dh_installinfo -i
-#	dh_installwm -i
-#	dh_lintian -i
-#	dh_bugfiles -i
-#	dh_undocumented -i
-	dh_installman -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_python2 -ppython-polybori
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: build-stamp install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_install
-	dh_installexamples -a
-	dh_installmenu -a
-#	dh_installdebconf -a
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installcatalogs -a
-#	dh_installmime -a
-#	dh_installinit -a
-#	dh_installcron -a
-#	dh_installinfo -a
-#	dh_installwm -a
-#	dh_lintian -a
-#	dh_bugfiles -a
-#	dh_undocumented -a
-	dh_installman -a
+override_dh_strip:
 	dh_strip --exclude=groebner --exclude=PyPolyBoRi -plibpolybori-dev --dbg-package=libpolybori-dbg -a 
 	dh_strip --exclude=PyPolyBoRi -plibpolybori-groebner-dev  --dbg-package=libpolybori-groebner-dbg -a
-	dh_strip  -ppython-polybori -a 
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_python2 -ppython-polybori
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: $(PYVERS:%=build-python-%) build \
-    clean binary-indep binary-arch binary install install-%
+	dh_strip -ppython-polybori -a
 
 
 

-- 
polybori: Polynomials over Boolean Rings



More information about the debian-science-commits mailing list