Updated Debian build scripts

svn path=/trunk/ogg/; revision=2594

9 files changed, 41 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 4d50f09..ae43dd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libogg (1.0rc3-1) unstable; urgency=low
+
+  * New upstream.
+  * added autotools target (config.* updater) to rules
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Dec 2001 11:00:00 -0600
+
 libogg (1.0rc2-1) unstable; urgency=low
 
   * New upstream. 
@@ -40,5 +47,4 @@ libogg (1.0beta3-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address "ccheney@debian.org"
 End:
diff --git a/debian/control b/debian/control
index 8ebf966..ff8e69a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,9 @@ Source: libogg
 Section: libs
 Priority: optional
 Maintainer: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>> 3.0.0), autotools-dev, devscripts
 Standards-Version: 3.5.6.0
 
-Package: libogg-dev
-Architecture: any
-Section: devel
-Depends: libogg0 (= ${Source-Version}), libc6-dev
-Description: Ogg Bitstream Library Development
- The libogg-dev package contains the header files and documentation
- needed to develop applications with libogg.
-
 Package: libogg0
 Architecture: any
 Section: libs
@@ -20,3 +12,11 @@ Depends: ${shlibs:Depends}
 Description: Ogg Bitstream Library
  Libogg is a library for manipulating ogg bitstreams.  It handles
  both making ogg bitstreams and getting packets from ogg bitstreams.
+
+Package: libogg-dev
+Architecture: any
+Section: devel
+Depends: libogg0 (= ${Source-Version}), libc6-dev
+Description: Ogg Bitstream Library Development
+ The libogg-dev package contains the header files and documentation
+ needed to develop applications with libogg.
diff --git a/debian/copyright b/debian/copyright
index 8a25e4e..9e4e1e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Christopher L Cheney <ccheney@debian.org> on
 Sun, 29 Oct 2000 01:11:57 -0500.
 
-It was downloaded from http://www.xiph.org/ogg/vorbis/download/
+It was downloaded from http://www.vorbis.com/download_unix.psp
 
 Upstream Author(s): Monty <monty@xiph.org>
 
diff --git a/debian/libogg-dev.dirs b/debian/libogg-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/libogg-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/libogg-dev.docs b/debian/libogg-dev.docs
index e845566..8ade2cb 100644
--- a/debian/libogg-dev.docs
+++ b/debian/libogg-dev.docs
@@ -1 +1 @@
-README
+debian/tmp/usr/share/doc/libogg-1.0rc2/*
diff --git a/debian/README.Debian b/debian/libogg0.README.Debian
index f9b4d9f..f9b4d9f 100644
--- a/debian/README.Debian
+++ b/debian/libogg0.README.Debian
diff --git a/debian/libogg0.dirs b/debian/libogg0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libogg0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libogg0.docs b/debian/libogg0.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/libogg0.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/rules b/debian/rules
index 6948ef5..58a042d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,16 @@
 # This is the debhelper compatability version to use.
 export DH_COMPAT=3
 
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
 
 	# If compiling cvs version change to ./autogen.sh --prefix=/usr
-	./configure --prefix=/usr
+	./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+	--prefix=/usr
 
 	touch configure-stamp
 
@@ -22,17 +25,30 @@ build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
 
 	touch build-stamp
 
-clean:
+autotools:
+	OLDDATESUB=`./config.sub -t | tr -d -` ;\
+	OLDDATEGUESS=`./config.guess -t | tr -d -` ;\
+	NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\
+	NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\
+	if [ $$OLDDATESUB -lt $$NEWDATESUB -o \
+	     $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \
+	   dch -a -p "GNU config automated update: config.sub\
+	     ($$OLDDATESUB to $$NEWDATESUB), config.guess\
+	     ($$OLDDATEGUESS to $$NEWDATEGUESS)" ;\
+	   cp -f /usr/share/misc/config.sub config.sub ;\
+	   cp -f /usr/share/misc/config.guess config.guess ;\
+	   echo WARNING: GNU config scripts updated from master copies 1>&2 ;\
+	fi
+
+clean: autotools
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 
 	dh_clean
@@ -43,7 +59,6 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp.
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 
 
@@ -57,7 +72,7 @@ binary-arch: build install
 	dh_testroot
 	dh_movefiles
 
-	dh_installdocs debian/tmp/usr/share/doc/libogg-1.0rc2/*
+	dh_installdocs
 	dh_installexamples
 	dh_installman
 	dh_installchangelogs
@@ -73,4 +88,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: autotools build clean binary-indep binary-arch binary install configure