diff -Nru cdbs-0.4.51ubuntu1/1/class/autotools-files.mk.in cdbs-0.4.51ubuntu2/1/class/autotools-files.mk.in --- cdbs-0.4.51ubuntu1/1/class/autotools-files.mk.in 2007-05-21 08:30:47.000000000 +0200 +++ cdbs-0.4.51ubuntu2/1/class/autotools-files.mk.in 2008-03-03 22:37:41.000000000 +0100 @@ -47,7 +47,7 @@ common-configure-arch common-configure-indep:: debian/stamp-autotools-files debian/stamp-autotools-files: $(if $(filter pre,$(DEB_AUTO_UPDATE_LIBTOOL)),cd $(DEB_SRCDIR) && libtoolize -c -f) - $(if $(DEB_AUTO_UPDATE_ACLOCAL),if [ -d $(DEB_SRCDIR)/m4 ]; then m4="-I m4"; fi; if [ -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_ACLOCAL) $$m4; fi,$(if $(DEB_AUTO_UPDATE_AUTOMAKE), if [ -d $(DEB_SRCDIR)/m4 ]; then m4="-I m4"; fi; if [ -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_AUTOMAKE) $$m4; fi)) + $(if $(DEB_AUTO_UPDATE_ACLOCAL),if [ -d $(DEB_SRCDIR)/m4 ]; then m4="-I m4"; fi; if [ ! -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_ACLOCAL) $$m4; fi,$(if $(DEB_AUTO_UPDATE_AUTOMAKE), if [ -d $(DEB_SRCDIR)/m4 ]; then m4="-I m4"; fi; if [ ! -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_AUTOMAKE) $$m4; fi)) $(if $(DEB_AUTO_UPDATE_AUTOCONF),if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then cd $(DEB_SRCDIR) && `which autoconf$(DEB_AUTO_UPDATE_AUTOCONF) || which autoconf`; fi) $(if $(DEB_AUTO_UPDATE_AUTOHEADER),if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then cd $(DEB_SRCDIR) && `which autoheader$(DEB_AUTO_UPDATE_AUTOHEADER) || which autoheader` ; fi) $(if $(DEB_AUTO_UPDATE_AUTOMAKE),if [ -e $(DEB_SRCDIR)/Makefile.am ]; then cd $(DEB_SRCDIR) && automake-$(DEB_AUTO_UPDATE_AUTOMAKE) ; fi) diff -Nru /tmp/wOSREOC94U/cdbs-0.4.51ubuntu1/debian/changelog /tmp/mlgFItnJVf/cdbs-0.4.51ubuntu2/debian/changelog --- cdbs-0.4.51ubuntu1/debian/changelog 2008-02-20 09:06:54.000000000 +0100 +++ cdbs-0.4.51ubuntu2/debian/changelog 2008-03-03 22:42:02.000000000 +0100 @@ -1,3 +1,13 @@ +cdbs (0.4.51ubuntu2) hardy; urgency=low + + * When attempting to generate aclocal.m4 from cdbs, this step was + paradoxically skipped unless aclocal.m4 already exists (in which case + there is no reason to build it) (LP: #162015). + As this package does not use any patch management system, the fix was + made directly in the source. + + -- Morten Kjeldgaard Mon, 03 Mar 2008 22:34:45 +0100 + cdbs (0.4.51ubuntu1) hardy; urgency=low * Merge with Debian unstable. See 0.4.50ubuntu1 for remaining changes.