[xiph-commits] r3295 - liboggz/trunk/debian

johnf at svn.annodex.net johnf at svn.annodex.net
Fri Dec 7 01:00:09 PST 2007


Author: johnf
Date: 2007-12-07 01:00:07 -0800 (Fri, 07 Dec 2007)
New Revision: 3295

Added:
   liboggz/trunk/debian/oggz-tools.files
   liboggz/trunk/debian/watch
Modified:
   liboggz/trunk/debian/changelog
   liboggz/trunk/debian/control
   liboggz/trunk/debian/liboggz1-dev.files
   liboggz/trunk/debian/liboggz1.files
   liboggz/trunk/debian/rules
Log:
Apply changes made by Jaq in most recent debian packages


Modified: liboggz/trunk/debian/changelog
===================================================================
--- liboggz/trunk/debian/changelog	2007-12-07 05:01:04 UTC (rev 3294)
+++ liboggz/trunk/debian/changelog	2007-12-07 09:00:07 UTC (rev 3295)
@@ -1,3 +1,115 @@
+liboggz (0.9.5-4) unstable; urgency=low
+
+  * Added libtool .la file to the -dev package, from Ubuntu's diff of
+    liboggz 0.9.3-0ubuntu1.  Thanks Jeff.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Wed,  5 Apr 2006 09:58:11 +1000
+
+liboggz (0.9.5-3) unstable; urgency=low
+
+  * Dump config.log if configure blows up.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Mon,  3 Apr 2006 22:18:12 +1000
+
+liboggz (0.9.5-2) unstable; urgency=low
+
+  * Updated dependencies per recommednations in the Library Packaging
+    Guide:
+   - Don't replace liboggz0.
+   - Provide and conflict liboggz-dev.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Mon,  3 Apr 2006 21:39:06 +1000
+
+liboggz (0.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Mon,  3 Apr 2006 16:24:33 +1000
+
+liboggz (0.9.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated files list due to DSO filename change.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Mon,  3 Apr 2006 16:17:25 +1000
+
+liboggz (0.9.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Mon,  3 Apr 2006 15:54:57 +1000
+
+liboggz (0.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards version to 3.6.2 (no other changes necessary).
+
+ -- Jamie Wilkinson <jaq at debian.org>  Mon,  3 Apr 2006 15:51:28 +1000
+
+liboggz (0.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Sat, 16 Apr 2005 01:19:44 +1000
+
+liboggz (0.9.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Sat, 16 Apr 2005 01:09:49 +1000
+
+liboggz (0.8.6-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Sat, 16 Apr 2005 00:59:56 +1000
+
+liboggz (0.8.5-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Wed, 13 Oct 2004 15:34:08 +1000
+
+liboggz (0.8.3-2) unstable; urgency=low
+
+  * Added watchfile. 
+
+ -- Jamie Wilkinson <jaq at debian.org>  Wed, 13 Oct 2004 15:21:50 +1000
+
+liboggz (0.8.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Regenerate autogoat files.
+  * Added oggz-tools and liboggz-dbg packages.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Sun, 13 Jun 2004 14:50:43 +1000
+
+liboggz (0.8.2-2) unstable; urgency=low
+
+  * Loosen the files list for liboggz1-dev so that files don't get
+    inadvertently missed.  Thanks to Sebastian Muszynski for the patch.
+    (Closes: #242956)
+
+ -- Jamie Wilkinson <jaq at debian.org>  Tue, 13 Apr 2004 21:48:13 +1000
+
+liboggz (0.8.2-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Jamie Wilkinson <jaq at debian.org>  Thu, 11 Mar 2004 22:08:53 +1100
+
+liboggz (0.8.1-2) unstable; urgency=low
+
+  * Regenerate the autotools scripts.  (Closes: #237236)
+
+ -- Jamie Wilkinson <jaq at debian.org>  Thu, 11 Mar 2004 08:06:25 +1100
+
+liboggz (0.8.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Jamie Wilkinson <jaq at debian.org>  Wed, 10 Mar 2004 22:32:16 +1100
+
 liboggz (0.8.0-2) unstable; urgency=low
 
   * Add dependency on libogg-dev to liboggz1-dev. 

Modified: liboggz/trunk/debian/control
===================================================================
--- liboggz/trunk/debian/control	2007-12-07 05:01:04 UTC (rev 3294)
+++ liboggz/trunk/debian/control	2007-12-07 09:00:07 UTC (rev 3295)
@@ -2,14 +2,13 @@
 Section: net
 Priority: optional
 Maintainer: Jamie Wilkinson <jaq at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libogg-dev, doxygen, docbook-to-man
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 4.0.0), libogg-dev, doxygen, docbook-to-man, binutils (>= 2.12.90.0.9)
+Standards-Version: 3.6.2
 
 Package: liboggz1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: liboggz0
 Description: convenience interface for Ogg stream I/O
  Oggz provides a simple programming interface for reading and writing
  Ogg files and streams.
@@ -32,10 +31,32 @@
 Architecture: any
 Depends: liboggz1 (= ${Source-Version}), libc6-dev, libogg-dev
 Provides: liboggz-dev
-Replaces: liboggz0-dev
+Conflicts: liboggz-dev
 Description: convenience interface for Ogg stream I/O (development files)
  Oggz provides a simple programming interface for reading and writing
  Ogg files and streams.
  .
  This package contains the header files, static libraries, and stream
  debugging tools required for developing applications that use Oggz.
+
+Package: oggz-tools
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: utilities for mangling Ogg streams
+ Oggz provides a simple programming interface for reading and writing
+ Ogg files and streams.
+ .
+ This package contains some utilities useful for debugging and tweaking
+ Ogg streams, using liboggz
+
+Package: liboggz1-dbg
+Section: libdevel
+Architecture: any
+Depends: liboggz1 (= ${Source-Version})
+Description: convenience interface for Ogg stream I/O debugging symbols
+ Oggz provides a simple programming interface for reading and writing
+ Ogg files and streams.
+ .
+ This package contains debugging symbols useful for tracing bugs in
+ liboggz software.

Modified: liboggz/trunk/debian/liboggz1-dev.files
===================================================================
--- liboggz/trunk/debian/liboggz1-dev.files	2007-12-07 05:01:04 UTC (rev 3294)
+++ liboggz/trunk/debian/liboggz1-dev.files	2007-12-07 09:00:07 UTC (rev 3295)
@@ -1,13 +1,5 @@
-usr/include/oggz/oggz.h
-usr/include/oggz/oggz_constants.h
-usr/include/oggz/oggz_table.h
+usr/include/oggz/*
 usr/lib/liboggz.a
 usr/lib/liboggz.so
+usr/lib/liboggz.la
 usr/lib/pkgconfig/oggz.pc
-usr/bin/oggzdiff
-usr/bin/oggzdump
-usr/bin/oggzed
-usr/bin/oggzinfo
-usr/share/man/man1/oggzdiff.1
-usr/share/man/man1/oggzdump.1
-usr/share/doc/liboggz/html

Modified: liboggz/trunk/debian/liboggz1.files
===================================================================
--- liboggz/trunk/debian/liboggz1.files	2007-12-07 05:01:04 UTC (rev 3294)
+++ liboggz/trunk/debian/liboggz1.files	2007-12-07 09:00:07 UTC (rev 3295)
@@ -1,2 +1,2 @@
 usr/lib/liboggz.so.1
-usr/lib/liboggz.so.1.0.0
+usr/lib/liboggz.so.1.2.0

Added: liboggz/trunk/debian/oggz-tools.files
===================================================================
--- liboggz/trunk/debian/oggz-tools.files	                        (rev 0)
+++ liboggz/trunk/debian/oggz-tools.files	2007-12-07 09:00:07 UTC (rev 3295)
@@ -0,0 +1,2 @@
+usr/bin/oggz*
+usr/share/man/man1/oggz*

Modified: liboggz/trunk/debian/rules
===================================================================
--- liboggz/trunk/debian/rules	2007-12-07 05:01:04 UTC (rev 3294)
+++ liboggz/trunk/debian/rules	2007-12-07 09:00:07 UTC (rev 3295)
@@ -21,9 +21,6 @@
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
 
 config.status: configure
 	dh_testdir
@@ -32,7 +29,8 @@
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
+		--infodir=\$${prefix}/share/info \
+		|| cat config.log
 
 build: build-stamp
 build-stamp:  config.status
@@ -52,6 +50,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
+	rm -rf debian/oggz-tools-dbg
 	dh_clean 
 
 install: build
@@ -64,38 +63,28 @@
 # Build architecture-independent files here.
 binary-indep: build install
 
-
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_movefiles
-	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 -ldebian/liboggz1/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_movefiles -a
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_strip -a --keep-debug --dbg-package=liboggz1 --dbg-package=oggz-tools
+# move the oggz-tools-dbg stuff into liboggz-dbg
+	cp -a $(CURDIR)/debian/oggz-tools-dbg/* $(CURDIR)/debian/liboggz1-dbg/
+	rm -rf $(CURDIR)/debian/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
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

Added: liboggz/trunk/debian/watch
===================================================================
--- liboggz/trunk/debian/watch	                        (rev 0)
+++ liboggz/trunk/debian/watch	2007-12-07 09:00:07 UTC (rev 3295)
@@ -0,0 +1,2 @@
+version=2
+http://annodex.net/software/liboggz/download/ liboggz-([\d\.]+)\.tar\.gz debian uupdate



More information about the commits mailing list