diff -Nru cdbs-0.4.93ubuntu3/1/class/hbuild.mk.in cdbs-0.4.94ubuntu1/1/class/hbuild.mk.in --- cdbs-0.4.93ubuntu3/1/class/hbuild.mk.in 2011-05-04 14:09:37.000000000 +0000 +++ cdbs-0.4.94ubuntu1/1/class/hbuild.mk.in 2011-05-31 07:29:20.000000000 +0000 @@ -27,10 +27,12 @@ cdbs_hugs_packages = $(filter %-hugs,$(DEB_PACKAGES)) cdbs_ghc_packages = $(filter %-ghc,$(DEB_PACKAGES)) -DEB_HBUILD_INVOKE ?= $(DEB_SRCDIR)/Setup.lhs --noreg --runfrom="" --prefix=debian/$(cdbs_curpkg) +DEB_HBUILD_SETUPFILE ?= $(firstword $(wildcard $(DEB_SRCDIR)/Setup.lhs $(DEB_SRCDIR)/Setup.hs)) + +DEB_HBUILD_INVOKE ?= $(DEB_HBUILD_SETUPFILE) --noreg --runfrom="" --prefix=debian/$(cdbs_curpkg) clean:: - $(DEB_SRCDIR)/Setup.lhs allclean + $(DEB_HBUILD_SETUPFILE) allclean $(patsubst %,install/%,$(cdbs_hugs_packages)) :: install/% : $(DEB_HBUILD_INVOKE) install-hugs diff -Nru cdbs-0.4.93ubuntu3/1/class/makefile.mk.in cdbs-0.4.94ubuntu1/1/class/makefile.mk.in --- cdbs-0.4.93ubuntu3/1/class/makefile.mk.in 2011-05-04 14:09:37.000000000 +0000 +++ cdbs-0.4.94ubuntu1/1/class/makefile.mk.in 2011-05-31 07:29:20.000000000 +0000 @@ -38,7 +38,7 @@ # Tighten to versions supporting multiflavors if feature actually used CDBS_BUILD_DEPENDS_class_autotools_flavors ?= cdbs (>= 0.4.72~) -CDBS_BUILD_DEPENDS += $(if $(cdbs_make_flavors),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools-flavors)) +CDBS_BUILD_DEPENDS += $(if $(cdbs_make_flavors),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools_flavors)) pre-build:: $(if $(cdbs_make_flavors),mkdir -p debian/stamp-makefile-build debian/stamp-makefile-install) diff -Nru cdbs-0.4.93ubuntu3/1/rules/debhelper.mk.in cdbs-0.4.94ubuntu1/1/rules/debhelper.mk.in --- cdbs-0.4.93ubuntu3/1/rules/debhelper.mk.in 2011-05-06 07:22:48.000000000 +0000 +++ cdbs-0.4.94ubuntu1/1/rules/debhelper.mk.in 2011-05-31 07:29:20.000000000 +0000 @@ -219,7 +219,6 @@ dh_installpam -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLPAM_ARGS) dh_installlogrotate -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLLOGROTATE_ARGS) dh_installlogcheck -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLLOGCHECK_ARGS) - $(if $(wildcard /usr/bin/dh_installgsettings),dh_installgsettings -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLGSETTINGS_ARGS)) dh_installchangelogs -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLCHANGELOGS_ARGS) $(call cdbs_expand_curvar,DEB_INSTALL_CHANGELOGS) $(if $(wildcard /usr/bin/dh_installudev),dh_installudev -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLUDEV_ARGS)) $(if $(wildcard /usr/bin/dh_lintian),dh_lintian -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_LINTIAN_ARGS)) @@ -229,6 +228,7 @@ dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) $(DEB_DH_LINK_$(cdbs_curpkg)) $(if $(wildcard /usr/bin/dh_buildinfo),dh_buildinfo -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUILDINFO_ARGS)) dh_installmime -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLMIME_ARGS) + $(if $(wildcard /usr/bin/dh_installgsettings),dh_installgsettings -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLGSETTINGS_ARGS)) # This rule is called after all packages have been installed, and their # post-install hooks have been run. @@ -286,9 +286,6 @@ # only call dh_scour for packages in main if grep -q '^Component:[[:space:]]*main' /CurrentlyBuilding 2>/dev/null; then dh_scour -p$(cdbs_curpkg) $(DEB_DH_SCOUR_ARGS); fi - # fix absolute symlinks created above to be relative - dh_link -p $(cdbs_curpkg) - dh_md5sums -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_MD5SUMS_ARGS) $(DEB_DH_BUILDDEB_ENV) dh_builddeb -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUILDDEB_ARGS) diff -Nru cdbs-0.4.93ubuntu3/debian/cdbs.lintian-overrides cdbs-0.4.94ubuntu1/debian/cdbs.lintian-overrides --- cdbs-0.4.93ubuntu3/debian/cdbs.lintian-overrides 2011-05-04 14:09:37.000000000 +0000 +++ cdbs-0.4.94ubuntu1/debian/cdbs.lintian-overrides 2011-05-31 07:29:20.000000000 +0000 @@ -1,2 +1,2 @@ # script used by waf.mk class which declare Python dependency itself. -cdbs: python-script-but-no-python-dep ./usr/lib/cdbs/waf-unpack +cdbs: python-script-but-no-python-dep usr/lib/cdbs/waf-unpack diff -Nru cdbs-0.4.93ubuntu3/debian/changelog cdbs-0.4.94ubuntu1/debian/changelog --- cdbs-0.4.93ubuntu3/debian/changelog 2011-05-18 14:17:26.000000000 +0000 +++ cdbs-0.4.94ubuntu1/debian/changelog 2011-05-31 07:51:31.000000000 +0000 @@ -1,3 +1,35 @@ +cdbs (0.4.94ubuntu1) oneiric; urgency=low + + * 1/rules/debhelper.mk.in: Drop leftover dh_link invocation from our removed + documentation symlinking. + * debian/control.in: Drop unneeded fdupes dependency. + * Merge with Debian unstable. Remaining Ubuntu changes: + - 1/rules/utils.mk.in: add some text before listing missing file to make + it easier to see from the build log (LP #509249, Debian #565771) + - 1/class/gnome.mk.in: Call dh_translations. + - test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail + with pkgstriptranslations installed. (Ubuntu specific) + - 1/rules/debhelper.mk.in: Call dh_scour. debian/control.in: Add scour + build and binary dependency (build dep for test suite). + - 1/class/python-distutils.mk.in, 1/class/python-module.mk.in: Add + --prefix support for pysupport by DEB_PYTHON_PREFIX_ARG (LP #625581) + + -- Martin Pitt Tue, 31 May 2011 09:51:31 +0200 + +cdbs (0.4.94) unstable; urgency=low + + * Update lintian override. + * Fix typo in multiflavor build-dependency autoresolving for + makefile.mk. + Closes: bug#623883. Thanks to Jérémy Lal. + * Invoke dh_installgsettings after dh_install. + Closes: bug#627735. Thanks to Michael Biebl. + * Detect Setup.hs as fallback for Setup.lhs in hbuild.mk snippet, and + add new variable DEB_HBUILD_SETUPFILE to override explicitly. + Closes: bug#412388. Thanks to Trent Buck. + + -- Jonas Smedegaard Tue, 24 May 2011 09:56:03 +0200 + cdbs (0.4.93ubuntu3) oneiric; urgency=low * 1/class/python-module.mk.in: Only specify --prefix argument if we are diff -Nru cdbs-0.4.93ubuntu3/debian/control cdbs-0.4.94ubuntu1/debian/control --- cdbs-0.4.93ubuntu3/debian/control 2011-05-04 14:10:47.000000000 +0000 +++ cdbs-0.4.94ubuntu1/debian/control 2011-05-31 07:28:20.000000000 +0000 @@ -28,7 +28,7 @@ Package: cdbs Architecture: all -Depends: debhelper (>= 5.0.30), fdupes, dh-translations, python-scour +Depends: debhelper (>= 5.0.30), dh-translations, python-scour Recommends: autotools-dev Suggests: devscripts Description: common build system for Debian packages diff -Nru cdbs-0.4.93ubuntu3/debian/control.in cdbs-0.4.94ubuntu1/debian/control.in --- cdbs-0.4.93ubuntu3/debian/control.in 2011-05-04 14:10:39.000000000 +0000 +++ cdbs-0.4.94ubuntu1/debian/control.in 2011-05-31 07:27:23.000000000 +0000 @@ -27,7 +27,7 @@ Package: cdbs Architecture: all -Depends: debhelper (>= 5.0.30), fdupes, dh-translations, python-scour +Depends: debhelper (>= 5.0.30), dh-translations, python-scour Recommends: autotools-dev Suggests: devscripts Description: common build system for Debian packages