[27054] in Source-Commits
Re: /svn/athena r25915 - trunk/athena/lib/athdir/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri Apr 12 16:31:36 2013
Date: Fri, 12 Apr 2013 13:31:26 -0700 (PDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Alexander Chernyakhovsky <achernya@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201304122023.r3CKN8wW001990@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.02.1304121331180.27256@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK with r25916
--
Geoffrey Thomas
geofft@mit.edu
On Fri, 12 Apr 2013, Alexander Chernyakhovsky wrote:
> Author: achernya
> Date: 2013-04-12 16:23:08 -0400 (Fri, 12 Apr 2013)
> New Revision: 25915
>
> Modified:
> trunk/athena/lib/athdir/debian/control
> trunk/athena/lib/athdir/debian/rules
> Log:
>
>
> Modified: trunk/athena/lib/athdir/debian/control
> ===================================================================
> --- trunk/athena/lib/athdir/debian/control 2013-04-11 17:16:46 UTC (rev 25914)
> +++ trunk/athena/lib/athdir/debian/control 2013-04-12 20:23:08 UTC (rev 25915)
> @@ -2,7 +2,7 @@
> Section: debathena/libs
> Priority: extra
> Maintainer: Debathena Project <debathena@mit.edu>
> -Build-Depends: cdbs, debhelper, dh-buildinfo, libtool, automake1.9, autoconf, autotools-dev, debathena-machtype
> +Build-Depends: debhelper (>= 7), autotools-dev, dh-autoreconf, debathena-machtype
> Standards-Version: 3.9.3
>
> Package: debathena-libathdir0
>
> Modified: trunk/athena/lib/athdir/debian/rules
> ===================================================================
> --- trunk/athena/lib/athdir/debian/rules 2013-04-11 17:16:46 UTC (rev 25914)
> +++ trunk/athena/lib/athdir/debian/rules 2013-04-12 20:23:08 UTC (rev 25915)
> @@ -1,33 +1,6 @@
> #!/usr/bin/make -f
>
> -DEB_AUTO_UPDATE_AUTOCONF = 2.50
> -DEB_AUTO_UPDATE_ACLOCAL = 1.9
> -DEB_AUTO_UPDATE_LIBTOOL = pre
> -
> -include /usr/share/cdbs/1/rules/debhelper.mk
> -include /usr/share/cdbs/1/class/autotools.mk
> -
> -DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
> -
> -debian/stamp-autotools-files: aclocal.m4 config.guess config.sub install-sh missing
> -aclocal.m4:
> - aclocal-1.9
> -config.guess config.sub:
> - cp /usr/share/misc/$@ $@
> -install-sh missing:
> - -automake-1.9 --foreign --add-missing
> -
> -common-configure-arch:: verify-versions
> -verify-versions: debian/stamp-autotools-files
> - if ! $(DEB_CONFIGURE_SCRIPT) --version | \
> - grep -Fqx "libathdir configure $(DEB_UPSTREAM_VERSION)"; then \
> - echo "E: Debian and upstream version numbers don't match." >&2 ; \
> - echo "E: Did you forget to update the version number in configure.ac?" >&2 ; \
> - exit 1 ; \
> - fi
> -
> export ATHENA_SYS=$(shell machtype -S)
> -export ATHENA_HOSTTYPE=$(shell machtype)
>
> -clean::
> - rm -f configure aclocal.m4 install-sh missing libtool ltmain.sh config.guess config.sub
> +%:
> + dh $@ --with autoreconf
>
>