diff -u acm-5.0/debian/changelog acm-5.0/debian/changelog --- acm-5.0/debian/changelog +++ acm-5.0/debian/changelog @@ -1,3 +1,29 @@ +acm (5.0-28ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #929012). Remaining changes: + - Kept the changed description in debian/control to be less confusing. + - Added call to fclose to close file pointer + - Test-rebuild FTFBS: type clash of float_t which is defined + by system. In acm, "float_t" is locally defined as float, I chose + to rename the type to "float_type"; upstream authors might possibly + want make use of system definition. Files affected: + src/interpolate.*, src/inventory.c + - Add .desktop file from Phil Bull + - Include converted icon suggested by Phill Bul as XPM + + -- Paolo Sammicheli Wed, 08 Feb 2012 18:32:43 +0100 + +acm (5.0-28) unstable; urgency=low + + * Merging revised description from 5.0-27ubuntu2 (closes: 588894). + Thanks, Sam L. + * Fix synposis. + * Bump standards-version to 3.9.2. + * Update debian/rules for recommended build targets and replace dh_clean + -k with dh_prep. + + -- Phil Brooke Wed, 07 Dec 2011 10:59:30 +0000 + acm (5.0-27ubuntu2) maverick; urgency=low * Changed the description in debian/control to be less confusing. diff -u acm-5.0/debian/control acm-5.0/debian/control --- acm-5.0/debian/control +++ acm-5.0/debian/control @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Bilal Akhtar -Build-Depends: debhelper (>> 6.0.0), libx11-dev, libxext-dev, libxt-dev, x11proto-core-dev, libgdbm-dev, libaudio-dev, libelfg0-dev -Standards-Version: 3.8.4 +Build-Depends: debhelper (>> 6.0.0), libx11-dev, libxext-dev, x11proto-core-dev, libgdbm-dev, libaudio-dev, libelfg0-dev [hurd-i386] +Standards-Version: 3.9.2 Package: acm Architecture: any diff -u acm-5.0/debian/rules acm-5.0/debian/rules --- acm-5.0/debian/rules +++ acm-5.0/debian/rules @@ -30,7 +30,12 @@ CFLAGS="$(DEBCFLAGS)" ./configure --prefix=/usr touch configure-stamp -build: configure-stamp build-stamp +build: build-arch build-indep + +build-arch: configure-stamp build-stamp + +build-indep: configure-stamp build-stamp + build-stamp: dh_testdir # ACM compilation. @@ -48,7 +53,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs usr/games usr/share/games/acm install -g root -m 755 -o root src/acm debian/acm/usr/games/acm cd objects && install -g root -m 644 -o root \