[xiph-commits] r3433 - libannodex/trunk/debian
johnf at svn.annodex.net
johnf at svn.annodex.net
Sat Feb 9 05:00:07 PST 2008
Author: johnf
Date: 2008-02-09 05:00:04 -0800 (Sat, 09 Feb 2008)
New Revision: 3433
Modified:
libannodex/trunk/debian/annodex-tools.files
libannodex/trunk/debian/changelog
libannodex/trunk/debian/control
libannodex/trunk/debian/libannodex0-dev.files
libannodex/trunk/debian/libannodex0.files
libannodex/trunk/debian/rules
Log:
Import newer debian dir
Modified: libannodex/trunk/debian/annodex-tools.files
===================================================================
--- libannodex/trunk/debian/annodex-tools.files 2008-02-09 12:22:17 UTC (rev 3432)
+++ libannodex/trunk/debian/annodex-tools.files 2008-02-09 13:00:04 UTC (rev 3433)
@@ -1,8 +1,2 @@
-usr/bin/anxenc
-usr/bin/anxrip
-usr/bin/anxcheck
-usr/bin/anxed
-usr/bin/anxinfo
-usr/share/man/man1/anxenc.1
-usr/share/man/man1/anxrip.1
-usr/share/man/man1/anxinfo.1
+usr/bin/anx*
+usr/share/man/man1/anx*
Modified: libannodex/trunk/debian/changelog
===================================================================
--- libannodex/trunk/debian/changelog 2008-02-09 12:22:17 UTC (rev 3432)
+++ libannodex/trunk/debian/changelog 2008-02-09 13:00:04 UTC (rev 3433)
@@ -1,3 +1,112 @@
+libannodex (0.7.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build against libcmml1-dev. Closes: #372275.
+ * src/importers/anx_import_cmml.c: CMML_LinkElement::class has been
+ renamed to CMML_LinkElement::link_class; CMML_Clip::class has been
+ renamed to CMML_Clip::clip_class.
+
+ -- Matej Vela <vela at debian.org> Mon, 19 Jun 2006 06:17:02 +0200
+
+libannodex (0.7.3-3) unstable; urgency=low
+
+ * Build against libcmml0-dev 0.9.0 (libcmml API changed at 0.9.1 and
+ annodex does not yet support the new API). Changed version dependency
+ from 0.8.3-1, as per Ubuntu's libannodex 0.7.3-0ubuntu1 patch. Thanks
+ Jeff.
+ * Fix versioned depends on the -dev package to match the versions build-
+ depended on, thanks again Jeff.
+ * Added the libtool .la files to the -dev package, from the Ubuntu diff.
+ No prizes to guess who I thank for this one.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 5 Apr 2006 10:11:27 +1000
+
+libannodex (0.7.3-2) unstable; urgency=low
+
+ * Bump dependency on libcmml to libcmml1-dev.
+ * Update -dev package dependencies per the recommendations in the
+ Library Packaging Guide:
+ - Provide and conflict libannodex-dev.
+ - Explicitly depend on all -dev packages.
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 22:30:34 +1000
+
+libannodex (0.7.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 18:08:04 +1000
+
+libannodex (0.7.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 18:04:08 +1000
+
+libannodex (0.7.1-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 17:56:20 +1000
+
+libannodex (0.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add dependency on liboggz1-dev for libannodex0-dev. (Closes: #351642)
+ * Bumped standards version to 3.6.2 (no other changes required).
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 17:33:20 +1000
+
+libannodex (0.6.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated build dependency on liboggz-dev to require version 0.9.1.
+ * Updated dh_movefiles config for new library minor version.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 27 Apr 2005 19:57:16 +1000
+
+libannodex (0.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated build dependency on liboggz-dev to version 0.9.0.
+ * Updated dh_movefiles config for new library minor version.
+
+ -- Jamie Wilkinson <jaq at debian.org> Tue, 26 Apr 2005 23:37:15 +1000
+
+libannodex (0.6.0-2) unstable; urgency=low
+
+ * Added -dbg package.
+ * Split 'binary' target for arch and indep.
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 25 Apr 2005 10:16:28 +1000
+
+libannodex (0.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org> Sun, 24 Apr 2005 01:42:28 +1000
+
+libannodex (0.5.68-2) unstable; urgency=low
+
+ * Fix versioned build depends on liboggz. (Closes: #276324)
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 20 Oct 2004 17:20:15 +1000
+
+libannodex (0.5.68-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added watch file.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 13 Oct 2004 16:22:30 +1000
+
+libannodex (0.5.66-1) unstable; urgency=low
+
+ * New upstream release.
+ * Regenerated autogoats to fix lame build error.
+
+ -- Jamie Wilkinson <jaq at debian.org> Sat, 19 Jun 2004 14:44:08 +1000
+
libannodex (0.5.65-3) unstable; urgency=low
* Added versioned build dependencies on liboggz1-dev and libcmml0-dev
Modified: libannodex/trunk/debian/control
===================================================================
--- libannodex/trunk/debian/control 2008-02-09 12:22:17 UTC (rev 3432)
+++ libannodex/trunk/debian/control 2008-02-09 13:00:04 UTC (rev 3433)
@@ -2,8 +2,8 @@
Section: net
Priority: optional
Maintainer: Jamie Wilkinson <jaq at debian.org>
-Build-Depends: debhelper (>> 4.0.0), liboggz1-dev (>= 0.8.0-2), libcmml0-dev (>=0.8.1-3), doxygen, docbook-to-man, pkg-config, libsndfile1-dev
-Standards-Version: 3.6.1.0
+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
Package: libannodex0
Section: libs
@@ -17,8 +17,9 @@
Package: libannodex0-dev
Section: libdevel
Architecture: any
-Depends: libannodex0 (= ${Source-Version}), libc6-dev
+Depends: libannodex0 (= ${Source-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)
This library provides an interface to the Annodex media format. The Annodex
media format allows annotations and indexes on streaming media and other
@@ -29,6 +30,19 @@
debugging tools required for developing applications that use Annodex
streaming media.
+Package: libannodex0-dbg
+Section: libdevel
+Architecture: any
+Depends: libannodex0 (= ${Source-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
+ types of continuous data, which can be used for hyperlinked video amongst
+ other things.
+ .
+ This package contains debugging symbols useful for tracing bugs in the
+ libannodex0 package.
+
Package: annodex-tools
Section: utils
Architecture: any
Modified: libannodex/trunk/debian/libannodex0-dev.files
===================================================================
--- libannodex/trunk/debian/libannodex0-dev.files 2008-02-09 12:22:17 UTC (rev 3432)
+++ libannodex/trunk/debian/libannodex0-dev.files 2008-02-09 13:00:04 UTC (rev 3433)
@@ -2,7 +2,9 @@
usr/include/annodex/anx_*.h
usr/lib/libannodex.a
usr/lib/libannodex.so
+usr/lib/libannodex.la
+usr/lib/annodex/importers/*.a
usr/lib/annodex/importers/*.so
-usr/lib/annodex/importers/*.a
+usr/lib/annodex/importers/*.la
usr/lib/pkgconfig/annodex.pc
usr/share/doc/libannodex/html
Modified: libannodex/trunk/debian/libannodex0.files
===================================================================
--- libannodex/trunk/debian/libannodex0.files 2008-02-09 12:22:17 UTC (rev 3432)
+++ libannodex/trunk/debian/libannodex0.files 2008-02-09 13:00:04 UTC (rev 3433)
@@ -1,4 +1,4 @@
usr/lib/libannodex.so.0
-usr/lib/libannodex.so.0.0.5
-usr/lib/annodex/importers/*.so.0.0.5
+usr/lib/libannodex.so.0.4.0
+usr/lib/annodex/importers/*.so.0.4.0
usr/lib/annodex/importers/*.so.0
Modified: libannodex/trunk/debian/rules
===================================================================
--- libannodex/trunk/debian/rules 2008-02-09 12:22:17 UTC (rev 3432)
+++ libannodex/trunk/debian/rules 2008-02-09 13:00:04 UTC (rev 3433)
@@ -17,9 +17,6 @@
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
configure: configure-stamp
configure-stamp:
@@ -45,12 +42,12 @@
dh_testroot
rm -f build-stamp configure-stamp
-$(MAKE) distclean
- # clean up generated files
+# # clean up generated files
rm -f doc/libannodex/html/*.html
rm -f doc/libannodex/html/doxygen.png
rm -f doc/libannodex/latex/doxygen.sty \
doc/libannodex/latex/refman.tex
- # clean up turds
+# # 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
@@ -70,26 +67,41 @@
$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
binary-indep: build install
-# nothing
+ dh_testdir
+ dh_testroot
+ #dh_movefiles -i
+ #dh_installdocs -i -X.svn
+ #dh_installexamples -i
+ #dh_installman -i
+ #dh_installchangelogs -i ChangeLog
+ #dh_compress -i
+ #dh_fixperms -i
+ #dh_installdeb -i
+ #dh_shlibdeps -i
+ #dh_gencontrol -i
+ #dh_md5sums -i
+ #dh_builddeb -i
binary-arch: build install
dh_testdir
dh_testroot
- dh_movefiles
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps -ldebian/libannodex0/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_movefiles -a
+ dh_installdocs -a -X.svn
+ dh_installexamples -a
+ 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_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a -ldebian/libannodex0/usr/lib
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-arch binary-indep
More information about the commits
mailing list