[rfk-dev] Re: Package robotfindskitten does not build with automake 1.6

[Aaron Haviland]

--GID0FwUMdk1T2AWN
Content-Type: multipart/mixed; boundary="xHFwDpU9dbj6ez1V"
Content-Disposition: inline


--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

neale@debian.org said:
> Hi Steve.  Thanks for letting me know about the build problem.  I
> suspect that the crack team of robotfindskitten coders will probably
> want to update the build to work with automake 1.6--it looks like a
> simple shell problem that would be easily fixed.
> 
> I suspect that fixing the build problem in the configure script (and
> then adding a build-depend on automake <= 1.6) would be a sufficient fix
> to this problem, although I'm something of a new debian package
> maintainer.  We'll see what the upstream authors have to say.
> 
> Again, thanks a lot!
> 
> Neale Pickett, package maintainer in search of kitten

I've attached my updated diff. Don't you love it?

1) debian/rules clean: did not call dh_clean. Fixed.
2) debian/rules configure: did not call libtoolize. Fixed.
3) configure was not in the upstream tarball, but was in the .diff.gz,
and never got marked +x (ie, bad interpreter), even after it was
overwritten by autoconf. Fixed by removing it in debian/rules clean:
(and in the diff.)
4) Standards-Version 3.1.1 is outdated. Changed to 3.5.6.1
5) Added build-depends on texinfo, and removed robotfindskitten.info
from the .diff.

Tremendous decrease in size if the .diff. 184 lines instead of 4273.

Tested to build cleanly on booth woody and sid autotools setups.

-- 
Aaron Haviland      orion [at] tribble [dot] dyndns [dot] org
                                  orion [at] parsed [dot] net
 
It should be soft and cuddly, with lots of firepower.

--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="robotfindskitten_0.1600005.344b-2.1.diff"

--- robotfindskitten-0.1600005.344b.orig/debian/changelog
+++ robotfindskitten-0.1600005.344b/debian/changelog
@@ -1,8 +1,39 @@
+robotfindskitten (0.1600005.344b-2.1) unstable; urgency=low
+
+  * Update debian/rules to build with automake1.6 or automake
+  * Updated Standards-Version to 3.5.6.1
+
+ -- Aaron Haviland <orion@tribble.dyndns.org>  Tue,  2 Jul 2002 12:34:34 -0400
+
+robotfindskitten (0.1600005.344b-2) unstable; urgency=low
+
+  * Added build-depends on libtool (closes: #121595)
+
+ -- Neale Pickett <neale@debian.org>  Thu,  6 Dec 2001 08:12:10 -0800
+
+robotfindskitten (0.1600005.344b-1) unstable; urgency=low
+
+  * New version number, to be more in-line with upstream
+  * Changed maintainer in control file, so I get bug reports instead of
+    Nick Moffitt
+  * Added build-depends: automake and autoconf (closes: #120862)
+  * Updated info file to reflect current version
+
+ -- Neale Pickett <neale@debian.org>  Tue, 27 Nov 2001 09:26:36 -0800
+
+robotfindskitten (0.0.1600005-1) unstable; urgency=low
+  
+  * Initial packaging for woody
+  * Changed versioning scheme to pass lintian check
+
+ -- Neale Pickett <neale@debian.org>  Tue,  6 Nov 2001 21:59:24 -0800
+
 robotfindskitten (v1600005_344b-1) unstable; urgency=low
 
   * Added contrib NKI
 
  -- Nick Moffitt <nick@zork.net>  Tue, 14 Aug 2001 11:16:08 -0700
+    
 robotfindskitten (v1600005_248b-1) unstable; urgency=low
 
   * Fixed stray null info file
@@ -21,7 +52,4 @@
 
  -- Nick Moffitt <nick@zork.net>  Wed, 21 Feb 2001 11:27:27 -0800
 
-Local variables:
-mode: debian-changelog
-add-log-mailing-address "nick@zork.net"
-End:
+
--- robotfindskitten-0.1600005.344b.orig/debian/control
+++ robotfindskitten-0.1600005.344b/debian/control
@@ -1,9 +1,9 @@
 Source: robotfindskitten
 Section: games
 Priority: optional
-Maintainer: Nick Moffitt <nick@zork.net>
-Build-Depends: debhelper, libncurses5-dev
-Standards-Version: 3.1.1
+Maintainer: Neale Pickett <neale@debian.org>
+Build-Depends: debhelper, libncurses5-dev, automake | automake1.6, autoconf, libtool, texinfo
+Standards-Version: 3.5.6.1
 
 Package: robotfindskitten
 Architecture: any
--- robotfindskitten-0.1600005.344b.orig/debian/copyright
+++ robotfindskitten-0.1600005.344b/debian/copyright
@@ -1,7 +1,9 @@
 This package was debianized by Nick Moffitt <nick@beaujolais.zork.net> on
 Tue, 21 Nov 2000 11:27:27 -0800.
+The maintainer is presently Neale Pickett <neale@debian.org>.
 
-It was downloaded from http://crummy.com/devel/robotfindskitten/
+The latest source can be found at
+http://www.robotfindskitten.org/
 
 Upstream Author(s): Leonard Richardson <leonardr@segfault.org>
 
--- robotfindskitten-0.1600005.344b.orig/debian/docs
+++ robotfindskitten-0.1600005.344b/debian/docs
@@ -1,4 +1,3 @@
-INSTALL
 NEWS
 README
 AUTHORS
--- robotfindskitten-0.1600005.344b.orig/debian/rules
+++ robotfindskitten-0.1600005.344b/debian/rules
@@ -9,9 +9,14 @@
 export DH_COMPAT=2
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: 
 	dh_testdir
-	# Add here commands to configure the package.
+#	Add here commands to configure the package.
+	aclocal
+	libtoolize
+	autoheader
+	automake --add-missing
+	autoconf
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 	touch configure-stamp
@@ -20,9 +25,9 @@
 build-stamp:
 	dh_testdir
 
-	# Add here commands to compile the package.
+#	Add here commands to compile the package.
 	$(MAKE)
-	#/usr/bin/docbook-to-man debian/robotfindskitten-v1600003.sgml > robotfindskitten-v1600003.1
+#	/usr/bin/docbook-to-man debian/robotfindskitten-v1600003.sgml > robotfindskitten-v1600003.1
 
 	touch build-stamp
 
@@ -31,10 +36,16 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
+#	Add here commands to clean up after the build process.
+	-([ -f Makefile ] && $(MAKE) distclean) || true
 	dh_clean
+	rm -f COPYING INSTALL config.guess config.sub install-sh \
+		ltconfig ltmain.sh missing mkinstalldirs doc/texinfo.tex \
+		Makefile config.status conftest conftest.o \
+		configure depcomp config.h.in aclocal.m4 \
+		Makefile.in doc/Makefile.in src/Makefile.in doc/robotfindskitten.info \
+		src/robotfindskitten.o src/robotfindskitten
+	rm -rf autom4te.cache
 
 install: build
 	dh_testdir
@@ -42,7 +53,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp.
+#	Add here commands to install the package into debian/tmp.
 	$(MAKE) install prefix=$(CURDIR)/debian/robotfindskitten/usr
 
 
@@ -71,8 +82,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	# You may want to make some executables suid here.
-	dh_suidregister
+#	You may want to make some executables suid here.
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl
--- robotfindskitten-0.1600005.344b.orig/debian/postinst
+++ robotfindskitten-0.1600005.344b/debian/postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ]; then
+	if [ -d /usr/doc -a ! -e /usr/doc/robotfindskitten -a -d /usr/share/doc/robotfindskitten ]; then
+		ln -sf ../share/doc/robotfindskitten /usr/doc/robotfindskitten
+	fi
+fi
+
+if [ "$1" = "configure" ]; then
+	install-info --section Games Games --quiet /usr/share/info/robotfindskitten.info
+fi
+
--- robotfindskitten-0.1600005.344b.orig/doc/robotfindskitten.texi
+++ robotfindskitten-0.1600005.344b/doc/robotfindskitten.texi
@@ -35,7 +35,7 @@
 @end ifinfo
 
 @titlepage
-@title robotfindskitten v1600003-201b
+@title robotfindskitten v1600005-344b
 @subtitle Leonard: In Bakersfield they have an art gallery in the mall.
 @subtitle Al: That's where they belong.
 @author by Leonard Richardson 

--xHFwDpU9dbj6ez1V--

--GID0FwUMdk1T2AWN
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD4DBQE9Id9jNL5skATtxLERApbmAJdGGHZLiGf/rJI550EnhJ8/RCv0AKCtannn
+HQuxC9hyPI79qPAUUPwKg==
=j91+
-----END PGP SIGNATURE-----

--GID0FwUMdk1T2AWN--