[xiph-cvs] cvs commit: vorbis/debian libvorbis-dev.install libvorbis0.install Makefile.am changelog control libvorbis-dev.docs rules libvorbis-dev.files libvorbis0.files

Chris Cheney calc at xiph.org
Wed Jul 3 14:54:54 PDT 2002



calc        02/07/03 14:54:53

  Modified:    debian   Makefile.am changelog control libvorbis-dev.docs
                        rules
  Added:       debian   libvorbis-dev.install libvorbis0.install
  Removed:     debian   libvorbis-dev.files libvorbis0.files
  Log:
  debian packaging updates

Revision  Changes    Path
1.5       +2 -2      vorbis/debian/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/debian/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	2001/12/13 22:27:57	1.4
+++ Makefile.am	2002/07/03 21:54:52	1.5
@@ -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

<p><p>1.17      +6 -0      vorbis/debian/changelog

Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/vorbis/debian/changelog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changelog	2001/12/24 16:54:03	1.16
+++ changelog	2002/07/03 21:54:52	1.17
@@ -1,3 +1,9 @@
+libvorbis (1.0.0-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  2 Jul 2002 22:00:00 -0500
+
 libvorbis (1.0rc3-1) unstable; urgency=low
 
   * New upstream. (Closes: #121995, #123472)

<p><p>1.22      +1 -1      vorbis/debian/control

Index: control
===================================================================
RCS file: /usr/local/cvsroot/vorbis/debian/control,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- control	2001/12/13 22:24:12	1.21
+++ control	2002/07/03 21:54:52	1.22
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Christopher L Cheney <ccheney at 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

<p><p>1.5       +1 -1      vorbis/debian/libvorbis-dev.docs

Index: libvorbis-dev.docs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/debian/libvorbis-dev.docs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libvorbis-dev.docs	2001/12/13 22:24:13	1.4
+++ libvorbis-dev.docs	2002/07/03 21:54:52	1.5
@@ -1 +1 @@
-debian/tmp/usr/share/doc/libvorbis-1.0rc3/*
+debian/tmp/usr/share/doc/libvorbis-*/*

<p><p>1.17      +86 -22    vorbis/debian/rules

Index: rules
===================================================================
RCS file: /usr/local/cvsroot/vorbis/debian/rules,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rules	2001/12/13 22:24:13	1.16
+++ rules	2002/07/03 21:54:52	1.17
@@ -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
+
+	# CVS does not have configure
+	#if test ! -f configure; then \
+		./autogen.sh ;\
+	fi
 
-	# If compiling cvs version change to ./autogen.sh --prefix=/usr
-	./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+	# 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 @@
            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
+
+	# Remove build tree
+	rm -rf $(objdir)
+
+	# if Makefile exists run distclean
+	if test -f Makefile; then \
+		$(MAKE) distclean; \
+	fi
 
-	-$(MAKE) distclean
+	#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
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+	dh_install
 
-# 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

<p><p>1.1                  vorbis/debian/libvorbis-dev.install

Index: libvorbis-dev.install
===================================================================
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

<p><p>1.1                  vorbis/debian/libvorbis0.install

Index: libvorbis0.install
===================================================================
debian/tmp/usr/lib/libvorbis.so.*
debian/tmp/usr/lib/libvorbisenc.so.*
debian/tmp/usr/lib/libvorbisfile.so.*

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list