r43 - trunk/packages/libogg/debian

Wed Jan 18 02:40:57 UTC 2006

Author: adeodato
Date: 2006-01-18 02:40:56 +0000 (Wed, 18 Jan 2006)
New Revision: 43

Added:
   trunk/packages/libogg/debian/compat
Removed:
   trunk/packages/libogg/debian/Makefile.am
   trunk/packages/libogg/debian/Makefile.in
Modified:
   trunk/packages/libogg/debian/changelog
   trunk/packages/libogg/debian/control
   trunk/packages/libogg/debian/rules
Log:
Update debian/rules, add quilt as build-dep, add compat file, delete
spurious debian/Makefile.* files.


Deleted: trunk/packages/libogg/debian/Makefile.am

Deleted: trunk/packages/libogg/debian/Makefile.in

Modified: trunk/packages/libogg/debian/changelog
===================================================================

--- trunk/packages/libogg/debian/changelog	2006-01-18 02:27:30 UTC (rev 42)
+++ trunk/packages/libogg/debian/changelog	2006-01-18 02:40:56 UTC (rev 43)
@@ -12,6 +12,11 @@
     + drop version restriction on debhelper build-dependency, since it's
       already satisfied with stable.
 
+  * Overhaul debian/rules, and switch to quilt for patch management. (This
+    closes: #347418, FTBFS with the previous rules file and the new make.)
+
+  * Add debian/compat file, instead of exporting DH_COMPAT.
+
   * Update download URL in debian/copyright.
 
   * Add debian/watch file.

Added: trunk/packages/libogg/debian/compat
===================================================================
--- trunk/packages/libogg/debian/compat	2006-01-18 02:27:30 UTC (rev 42)
+++ trunk/packages/libogg/debian/compat	2006-01-18 02:40:56 UTC (rev 43)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/libogg/debian/control
===================================================================
--- trunk/packages/libogg/debian/control	2006-01-18 02:27:30 UTC (rev 42)
+++ trunk/packages/libogg/debian/control	2006-01-18 02:40:56 UTC (rev 43)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders: Christopher L Cheney <ccheney at debian.org>, Adeodato Simó <dato at net.com.org.es>
-Build-Depends: autotools-dev, debhelper
+Build-Depends: autotools-dev, debhelper, quilt
 Standards-Version: 3.6.2
 
 Package: libogg0

Modified: trunk/packages/libogg/debian/rules
===================================================================
--- trunk/packages/libogg/debian/rules	2006-01-18 02:27:30 UTC (rev 42)
+++ trunk/packages/libogg/debian/rules	2006-01-18 02:40:56 UTC (rev 43)
@@ -1,26 +1,31 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+###
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
+# Configure arguments
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+confflags = --prefix=/usr --enable-static
 
-# 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)
+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)
+confflags += --build $(DEB_BUILD_GNU_TYPE)
 
+# Only specify --host when cross-compiling
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+    confflags += --host $(DEB_HOST_GNU_TYPE)
+endif
+
+###
+
+# Directory to make the build on
+
+objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
+
+###
+
+# CFLAGS
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -28,113 +33,82 @@
 else
 	CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
 
+###
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	# make build directory
-	mkdir $(objdir)
+	ln -sf /usr/share/misc/config.sub .
+	ln -sf /usr/share/misc/config.guess .
 
-	# run configure with build tree $(objdir)
-	# change ../configure to ../autogen.sh for CVS build
+	ln -sf debian/patches
+	quilt push -a || test $$? = 2
+
+	-mkdir $(objdir)
 	cd $(objdir) && \
-	../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-	--prefix=/usr --enable-static
+	env CFLAGS="$(CFLAGS)" ../configure $(confflags)
 
-	touch configure-stamp
+	touch $@
 
-#Architecture
-build: build-arch build-indep
+#
 
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
+build: build-stamp
+build-stamp: configure-stamp
 	cd $(objdir) && \
 	$(MAKE)
 
-	touch build-arch-stamp
+	touch $@
 
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
+#
 
-	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
-	touch build-indep-stamp
-
-debian-clean:
+clean:
 	dh_testdir
 	dh_testroot
 
-	dh_clean
+	quilt pop -a -R || test $$? = 2
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	# remove quilt cruft
+	rm -f   patches
+	rm -rf .pc
 
+	rm -f configure-stamp build-stamp install-stamp
+	rm -f config.guess config.sub
+
 	# 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: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-#	dh_clean -k -i
-#	dh_installdirs -i
+#
 
-#	dh_install -i --list-missing
-
-install-arch:
+install: install-stamp
+install-stamp:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
+	dh_clean
+	dh_installdirs
+	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --list-missing $(DH_INSTALL_EXCLUDE)
+	touch $@ 
 
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+#
 
-	dh_install -s --list-missing
+binary: binary-arch
 
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_installmime
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
 	dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps
@@ -142,13 +116,9 @@
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-#	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+binary-indep:
+	@echo "Nothing to do."
 
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+#
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: configure build clean install binary binary-arch binary-indep


