[xiph-cvs] cvs commit: ogg/debian libogg-dev.install libogg0.install Makefile.am changelog control rules libogg-dev.files libogg0.files
Chris Cheney
calc at xiph.org
Tue Jul 2 21:50:38 PDT 2002
calc 02/07/02 21:50:38
Modified: debian Makefile.am changelog control rules
Added: debian libogg-dev.install libogg0.install
Removed: debian libogg-dev.files libogg0.files
Log:
debian packaging updates
Revision Changes Path
1.5 +2 -2 ogg/debian/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ogg/debian/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 2001/12/13 16:14:11 1.4
+++ Makefile.am 2002/07/03 04:50:37 1.5
@@ -2,5 +2,5 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = changelog control copyright libogg-dev.docs libogg-dev.files \
- libogg0.README.Debian libogg0.files rules
+EXTRA_DIST = changelog control copyright libogg-dev.docs libogg-dev.install \
+ libogg0.README.Debian libogg0.install rules
<p><p>1.14 +6 -0 ogg/debian/changelog
Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/ogg/debian/changelog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changelog 2001/12/24 16:54:03 1.13
+++ changelog 2002/07/03 04:50:37 1.14
@@ -1,3 +1,9 @@
+libogg (1.0.0-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Christopher L Cheney <ccheney at debian.org> Tue, 2 Jul 2002 22:00:00 -0500
+
libogg (1.0rc3-1) unstable; urgency=low
* New upstream.
<p><p>1.12 +1 -1 ogg/debian/control
Index: control
===================================================================
RCS file: /usr/local/cvsroot/ogg/debian/control,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- control 2001/12/13 16:11:51 1.11
+++ control 2002/07/03 04:50:37 1.12
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Christopher L Cheney <ccheney at debian.org>
-Build-Depends: debhelper (>> 3.0.0), autotools-dev, devscripts
+Build-Depends: debhelper (>> 4.0.0), autotools-dev, devscripts, gawk
Standards-Version: 3.5.6.0
Package: libogg0
<p><p>1.10 +85 -21 ogg/debian/rules
Index: rules
===================================================================
RCS file: /usr/local/cvsroot/ogg/debian/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rules 2001/12/13 16:11:51 1.9
+++ rules 2002/07/03 04:50:37 1.10
@@ -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
+
+ # make build directory
+ mkdir $(objdir)
- # If compiling cvs version change to ./autogen.sh --prefix=/usr
- ./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+ # 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)
- -$(MAKE) distclean
+ # 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_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+# dh_undocumented
dh_installman
- dh_installchangelogs
- dh_link
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 ogg/debian/libogg-dev.install
Index: libogg-dev.install
===================================================================
debian/tmp/usr/include/ogg/config_types.h
debian/tmp/usr/include/ogg/ogg.h
debian/tmp/usr/include/ogg/os_types.h
debian/tmp/usr/lib/libogg.a
debian/tmp/usr/lib/libogg.la
debian/tmp/usr/lib/libogg.so
debian/tmp/usr/share/aclocal/ogg.m4
<p><p>1.1 ogg/debian/libogg0.install
Index: libogg0.install
===================================================================
debian/tmp/usr/lib/libogg.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