[xiph-commits] r3590 - libannodex/trunk/debian

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-05-04 22:24:07 -0700 (Sun, 04 May 2008)
New Revision: 3590

Modified:
   libannodex/trunk/debian/changelog
   libannodex/trunk/debian/compat
   libannodex/trunk/debian/control
   libannodex/trunk/debian/libannodex0.files
   libannodex/trunk/debian/rules
Log:
Changes required for upcoming debian packages

Modified: libannodex/trunk/debian/changelog
===================================================================
--- libannodex/trunk/debian/changelog	2008-05-05 05:16:11 UTC (rev 3589)
+++ libannodex/trunk/debian/changelog	2008-05-05 05:24:07 UTC (rev 3590)
@@ -1,3 +1,10 @@
+libannodex (0.7.4-1) unstable; urgency=low
+
+  * New upstream.
+  * New Maintainer.
+
+ -- John Ferlito <johnf at inodes.org>  Mon, 05 May 2008 15:09:07 +1000
+
 libannodex (0.7.3-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: libannodex/trunk/debian/compat
===================================================================
--- libannodex/trunk/debian/compat	2008-05-05 05:16:11 UTC (rev 3589)
+++ libannodex/trunk/debian/compat	2008-05-05 05:24:07 UTC (rev 3590)
@@ -1 +1 @@
-4
+5

Modified: libannodex/trunk/debian/control
===================================================================
--- libannodex/trunk/debian/control	2008-05-05 05:16:11 UTC (rev 3589)
+++ libannodex/trunk/debian/control	2008-05-05 05:24:07 UTC (rev 3590)
@@ -1,9 +1,9 @@
 Source: libannodex
 Section: net
 Priority: optional
-Maintainer: Jamie Wilkinson <jaq at debian.org>
-Build-Depends: debhelper (>> 4.0.0), liboggz1-dev (>= 0.9.1), libcmml1-dev, pkg-config, libsndfile1-dev, doxygen, docbook-to-man
-Standards-Version: 3.6.2
+Maintainer: John Ferlito <johnf at inodes.org>
+Build-Depends: debhelper (>> 5.0.0), liboggz1-dev (>= 0.9.1), libcmml1-dev, pkg-config, libsndfile1-dev, doxygen, docbook-to-man
+Standards-Version: 3.7.3
 
 Package: libannodex0
 Section: libs
@@ -17,7 +17,7 @@
 Package: libannodex0-dev
 Section: libdevel
 Architecture: any
-Depends: libannodex0 (= ${Source-Version}), libc6-dev, liboggz1-dev (>= 0.9.1), libcmml1-dev, libsndfile1-dev
+Depends: libannodex0 (= ${binary:Version}), libc6-dev, liboggz1-dev (>= 0.9.1), libcmml1-dev, libsndfile1-dev
 Provides: libannodex-dev
 Conflicts: libannodex-dev
 Description: annotated and indexed media library (develoment files)
@@ -33,7 +33,7 @@
 Package: libannodex0-dbg
 Section: libdevel
 Architecture: any
-Depends: libannodex0 (= ${Source-Version})
+Depends: libannodex0 (= ${binary:Version})
 Description: annotated and indexed media library debugging information
  This library provides an interface to the Annodex media format.  The Annodex
  media format allows annotations and indexes on streaming media and other
@@ -46,7 +46,7 @@
 Package: annodex-tools
 Section: utils
 Architecture: any
-Depends: libannodex0 (= ${Source-Version})
+Depends: libannodex0 (= ${binary:Version})
 Description: tools for fiddling with annotated and indexed media streams
  This package contains tools that can be used to create and modify Annodex
  media.  The Annodex media format allows annotations and indexes in streaming

Modified: libannodex/trunk/debian/libannodex0.files
===================================================================
--- libannodex/trunk/debian/libannodex0.files	2008-05-05 05:16:11 UTC (rev 3589)
+++ libannodex/trunk/debian/libannodex0.files	2008-05-05 05:24:07 UTC (rev 3590)
@@ -1,4 +1,4 @@
-usr/lib/libannodex.so.0
-usr/lib/libannodex.so.0.4.0
-usr/lib/annodex/importers/*.so.0.4.0
-usr/lib/annodex/importers/*.so.0
+usr/lib/libannodex.so.5
+usr/lib/libannodex.so.5.0.0
+usr/lib/annodex/importers/*.so.5.0.0
+usr/lib/annodex/importers/*.so.5

Modified: libannodex/trunk/debian/rules
===================================================================
--- libannodex/trunk/debian/rules	2008-05-05 05:16:11 UTC (rev 3589)
+++ libannodex/trunk/debian/rules	2008-05-05 05:24:07 UTC (rev 3590)
@@ -41,7 +41,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 #	# clean up generated files
 	rm -f doc/libannodex/html/*.html
 	rm -f doc/libannodex/html/doxygen.png
@@ -49,14 +49,6 @@
 		doc/libannodex/latex/refman.tex
 #	# clean up turds
 	find . -name '.deps' -type d -print0 | xargs -r0 rm -rf
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-	cp -f /usr/share/misc/config.sub libltdl/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-	cp -f /usr/share/misc/config.guess libltdl/config.guess
-endif
 	dh_clean
 
 install: build
@@ -91,9 +83,7 @@
 	dh_installman -a
 	dh_installchangelogs -a ChangeLog
 	dh_link -a
-	dh_strip -a --keep-debug --dbg-package=libannodex0
-	# remove debug info from annodex-tools
-	rm -rf debian/annodex-tools/usr/lib
+	dh_strip -a --dbg-package=libannodex0-dbg --dbg-package=annodex-tools-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a