debian packaging updates

svn path=/trunk/vorbis/; revision=3512

diff --git a/debian/Makefile.am b/debian/Makefile.am
index d28d8b9..7c383a2 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -3,5 +3,5 @@
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = changelog control copyright libvorbis-dev.docs \
-       libvorbis-dev.examples libvorbis-dev.files libvorbis0.README.Debian \
-       libvorbis0.files rules
+       libvorbis-dev.examples libvorbis-dev.install libvorbis0.README.Debian \
+       libvorbis0.install rules

diff --git a/debian/changelog b/debian/changelog
index 0925472..63c7536 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libvorbis (1.0.0-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue,  2 Jul 2002 22:00:00 -0500
+
 libvorbis (1.0rc3-1) unstable; urgency=low
 
   * New upstream. (Closes: #121995, #123472)

diff --git a/debian/control b/debian/control
index 45e9e03..b02bda4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libvorbis
 Section: libs
 Priority: optional
 Maintainer: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: debhelper (>> 3.0.0), libogg-dev (>> 1.0rc3), autotools-dev, devscripts
+Build-Depends: debhelper (>> 4.0.0), libogg-dev (>> 1.0.0), autotools-dev, devscripts
 Standards-Version: 3.5.6.0
 
 Package: libvorbis0

diff --git a/debian/libvorbis-dev.docs b/debian/libvorbis-dev.docs
index 58ee487..d1df571 100644 (file)
--- a/debian/libvorbis-dev.docs
+++ b/debian/libvorbis-dev.docs
@@ -1 +1 @@
-debian/tmp/usr/share/doc/libvorbis-1.0rc3/*
+debian/tmp/usr/share/doc/libvorbis-*/*

diff --git a/debian/libvorbis-dev.files b/debian/libvorbis-dev.files
deleted file mode 100644 (file)
index dbbf15c..0000000
--- a/debian/libvorbis-dev.files
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/vorbis/*.h
-usr/include/vorbis/book/*.vqh
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/*.so
-usr/share/aclocal/vorbis.m4

diff --git a/debian/libvorbis-dev.install b/debian/libvorbis-dev.install
new file mode 100644 (file)
index 0000000..bfdc286
--- /dev/null
+++ b/debian/libvorbis-dev.install
@@ -0,0 +1,13 @@
+debian/tmp/usr/include/vorbis/codec.h
+debian/tmp/usr/include/vorbis/vorbisenc.h
+debian/tmp/usr/include/vorbis/vorbisfile.h
+debian/tmp/usr/lib/libvorbis.a
+debian/tmp/usr/lib/libvorbis.la
+debian/tmp/usr/lib/libvorbis.so
+debian/tmp/usr/lib/libvorbisenc.a
+debian/tmp/usr/lib/libvorbisenc.la
+debian/tmp/usr/lib/libvorbisenc.so
+debian/tmp/usr/lib/libvorbisfile.a
+debian/tmp/usr/lib/libvorbisfile.la
+debian/tmp/usr/lib/libvorbisfile.so
+debian/tmp/usr/share/aclocal/vorbis.m4

diff --git a/debian/libvorbis0.files b/debian/libvorbis0.files
deleted file mode 100644 (file)
index 093956b..0000000
--- a/debian/libvorbis0.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*

diff --git a/debian/libvorbis0.install b/debian/libvorbis0.install
new file mode 100644 (file)
index 0000000..852c4f6
--- /dev/null
+++ b/debian/libvorbis0.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libvorbis.so.*
+debian/tmp/usr/lib/libvorbisenc.so.*
+debian/tmp/usr/lib/libvorbisfile.so.*

diff --git a/debian/rules b/debian/rules
index 0c5bbef..c4a0686 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,26 +5,50 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
 
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE     ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTALL_PROGRAM += -s
+endif
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 
-       # If compiling cvs version change to ./autogen.sh --prefix=/usr
-       ./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+       # CVS does not have configure
+       #if test ! -f configure; then \
+               ./autogen.sh ;\
+       fi
+
+       # make build directory
+       mkdir $(objdir)
+
+       # run configure with build tree $(objdir)
+       cd $(objdir) && \
+       ../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
        --prefix=/usr
 
        touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp 
        dh_testdir
 
+       cd $(objdir) && \
        $(MAKE)
 
        touch build-stamp
@@ -44,48 +68,88 @@ autotools:
           echo WARNING: GNU config scripts updated from master copies 1>&2 ;\
        fi
 
+debian-clean:
+       dh_testdir
+       dh_testroot
+
+       dh_clean
+
 clean: autotools
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
 
-       -$(MAKE) distclean
+       # Remove build tree
+       rm -rf $(objdir)
+
+       # if Makefile exists run distclean
+       if test -f Makefile; then \
+               $(MAKE) distclean; \
+       fi
+
+       #if test -d CVS; then \
+               $(MAKE) cvs-clean ;\
+       fi
 
        dh_clean
 
+install: DH_OPTIONS=
 install: build
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
 
-       $(MAKE) install DESTDIR=`pwd`/debian/tmp
+       cd $(objdir) && \
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
+       dh_install
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
        dh_testdir
        dh_testroot
-       dh_movefiles
-
+#      dh_installxfonts
+       dh_installchangelogs
        dh_installdocs
        dh_installexamples
-       dh_installmanpages
-       dh_installchangelogs 
-       dh_link
+#      dh_installmenu
+#      dh_installdebconf
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
+#      dh_undocumented
+       dh_installman
        dh_strip
+       dh_link
        dh_compress
        dh_fixperms
        dh_makeshlibs -V
        dh_installdeb
+#      dh_perl
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
+# Build architecture independant packages using the common target.
+binary-indep: build install
+#      $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+       $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+       $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
+
 binary: binary-indep binary-arch
-.PHONY: autotools build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure