[xiph-commits] r3914 - liboggz/debian/debian

Sat May 2 06:41:25 PDT 2009

Author: johnf
Date: 2009-05-02 06:41:25 -0700 (Sat, 02 May 2009)
New Revision: 3914

Modified:
   liboggz/debian/debian/changelog
   liboggz/debian/debian/control
   liboggz/debian/debian/liboggz1.files
   liboggz/debian/debian/rules
   liboggz/debian/debian/watch
Log:
Update uscandebian/changelog

Modified: liboggz/debian/debian/changelog
===================================================================

--- liboggz/debian/debian/changelog	2009-05-02 12:39:01 UTC (rev 3913)
+++ liboggz/debian/debian/changelog	2009-05-02 13:41:25 UTC (rev 3914)
@@ -1,8 +1,9 @@
 liboggz (0.9.9-1) unstable; urgency=low
 
   * New upstream release.
+  * Update watch location to xiph.org address.
 
- -- John Francesco Ferlito <johnf at inodes.org>  Sat, 02 May 2009 22:33:18 +1000
+ -- John Francesco Ferlito <johnf at inodes.org>  Sat, 02 May 2009 22:50:24 +1000
 
 liboggz (0.9.8-1) unstable; urgency=low
 

Modified: liboggz/debian/debian/control
===================================================================
--- liboggz/debian/debian/control	2009-05-02 12:39:01 UTC (rev 3913)
+++ liboggz/debian/debian/control	2009-05-02 13:41:25 UTC (rev 3914)
@@ -1,7 +1,7 @@
 Source: liboggz
 Section: net
 Priority: optional
-Maintainer: John Ferlito <johnf at inodes.org>
+Maintainer: John Francesco Ferlito <johnf at inodes.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 5.0.0), libogg-dev, doxygen, docbook-to-man, binutils (>= 2.12.90.0.9)
 Standards-Version: 3.8.0

Modified: liboggz/debian/debian/liboggz1.files
===================================================================
--- liboggz/debian/debian/liboggz1.files	2009-05-02 12:39:01 UTC (rev 3913)
+++ liboggz/debian/debian/liboggz1.files	2009-05-02 13:41:25 UTC (rev 3914)
@@ -1,2 +1,2 @@
 usr/lib/liboggz.so.1
-usr/lib/liboggz.so.1.4.0
+usr/lib/liboggz.so.1.5.0

Modified: liboggz/debian/debian/rules
===================================================================
--- liboggz/debian/debian/rules	2009-05-02 12:39:01 UTC (rev 3913)
+++ liboggz/debian/debian/rules	2009-05-02 13:41:25 UTC (rev 3914)
@@ -1,40 +1,54 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
 # 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)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 else
-	CFLAGS += -O2
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
 
+
+
+
+# shared library versions, option 1
+#version=2.0.5
+#major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+version=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+major=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		|| cat config.log
+	# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
+
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir
+
+	# Add here commands to compile the package.
 	$(MAKE)
 	$(MAKE) check
 	touch $@
@@ -43,38 +57,57 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f config.sub config.guess
+
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
+
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
+# We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
-	dh_movefiles -a
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a --dbg-package=liboggz1-dbg --dbg-package=oggz-tools-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a -ldebian/liboggz1/usr/lib
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

Modified: liboggz/debian/debian/watch
===================================================================
--- liboggz/debian/debian/watch	2009-05-02 12:39:01 UTC (rev 3913)
+++ liboggz/debian/debian/watch	2009-05-02 13:41:25 UTC (rev 3914)
@@ -1,2 +1,2 @@
-version=2
-http://annodex.net/software/liboggz/download/ liboggz-([\d\.]+)\.tar\.gz debian uupdate
+version=3
+http://downloads.xiph.org/releases/liboggz/liboggz-([\d\.]+)\.tar\.gz debian uupdate

