[xiph-commits] r3410 - libcmml/trunk/debian
johnf at svn.annodex.net
johnf at svn.annodex.net
Mon Feb 4 04:37:59 PST 2008
Author: johnf
Date: 2008-02-04 04:37:57 -0800 (Mon, 04 Feb 2008)
New Revision: 3410
Added:
libcmml/trunk/debian/libcmml1-dev.docs
libcmml/trunk/debian/libcmml1-dev.examples
libcmml/trunk/debian/libcmml1-dev.files
libcmml/trunk/debian/libcmml1.files
libcmml/trunk/debian/watch
Removed:
libcmml/trunk/debian/libcmml0-dev.docs
libcmml/trunk/debian/libcmml0-dev.examples
libcmml/trunk/debian/libcmml0-dev.files
libcmml/trunk/debian/libcmml0.files
Modified:
libcmml/trunk/debian/changelog
libcmml/trunk/debian/cmml-tools.files
libcmml/trunk/debian/control
libcmml/trunk/debian/rules
Log:
Merge in jaq's changes in current debian tree
Modified: libcmml/trunk/debian/changelog
===================================================================
--- libcmml/trunk/debian/changelog 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/changelog 2008-02-04 12:37:57 UTC (rev 3410)
@@ -1,3 +1,87 @@
+libcmml (0.9.2-3.1ubuntu1) feisty; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Conflicts on libcmml0, libcmml0-dev
+
+ -- Michael Bienia <geser at ubuntu.com> Mon, 8 Jan 2007 14:11:46 +0100
+
+libcmml (0.9.2-3.1) unstable; urgency=low
+
+ * Porter NMU.
+ * Libtool update. (Closes: #319810).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 10 Dec 2006 21:56:40 +0100
+
+libcmml (0.9.2-3ubuntu1) edgy; urgency=low
+
+ * Conflicts on libcmml0, libcmml0-dev
+
+ -- Jeff Waugh <jeff.waugh at ubuntu.com> Mon, 10 Jul 2006 10:36:04 +1000
+
+libcmml (0.9.2-3) unstable; urgency=low
+
+ * Add libtool .la file to the -dev package, from Ubuntu's libcmml
+ 0.9.1-0ubuntu1 diff. Thanks Jeff.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 5 Apr 2006 09:51:20 +1000
+
+libcmml (0.9.2-2) unstable; urgency=low
+
+ * Fix libcmml1-dbg dependency typo.
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 21:26:31 +1000
+
+libcmml (0.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Rename packages due to new SONAME.
+ * Add conflicts on libcmml-dev to libcmml1-dev, per Library Packaging
+ Guide recommendations.
+ * Dump the config.log if the configure fails.
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 20:30:43 +1000
+
+libcmml (0.9.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated standards version to 3.6.2 (no other changes required).
+
+ -- Jamie Wilkinson <jaq at debian.org> Mon, 3 Apr 2006 10:48:56 +1000
+
+libcmml (0.9.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated dh_movefiles config for new library minor version.
+ * Added cmml-timeshift to cmml-tools.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 27 Apr 2005 00:33:37 +1000
+
+libcmml (0.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixed execute permissions on example program source.
+ * Remove stripped debug of cmml-tools executables.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 13 Apr 2005 22:49:06 +1000
+
+libcmml (0.8.2-3) unstable; urgency=low
+
+ * Added watch file.
+
+ -- Jamie Wilkinson <jaq at debian.org> Wed, 13 Oct 2004 15:11:47 +1000
+
+libcmml (0.8.2-2) unstable; urgency=low
+
+ * Added stripped debugging symbols, in the libcmml0-dbg package.
+
+ -- Jamie Wilkinson <jaq at debian.org> Sun, 23 May 2004 00:20:37 +1000
+
+libcmml (0.8.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jamie Wilkinson <jaq at debian.org> Sat, 22 May 2004 23:51:02 +1000
+
libcmml (0.8.1-3) unstable; urgency=low
* Add dependency on libexpat1-dev to libcmml0-dev.
Modified: libcmml/trunk/debian/cmml-tools.files
===================================================================
--- libcmml/trunk/debian/cmml-tools.files 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/cmml-tools.files 2008-02-04 12:37:57 UTC (rev 3410)
@@ -1,6 +1,8 @@
usr/bin/cmml-validate
usr/bin/cmml-fix
usr/bin/cmml-fortune
+usr/bin/cmml-timeshift
usr/share/man/man1/cmml-validate.1
usr/share/man/man1/cmml-fix.1
+usr/share/man/man1/cmml-timeshift.1
usr/share/man/man6/cmml-fortune.6
Modified: libcmml/trunk/debian/control
===================================================================
--- libcmml/trunk/debian/control 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/control 2008-02-04 12:37:57 UTC (rev 3410)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Jamie Wilkinson <jaq at debian.org>
Build-Depends: debhelper (>> 4.0.0), libexpat1-dev, doxygen, docbook-to-man
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.2
-Package: libcmml0
+Package: libcmml1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -15,11 +15,12 @@
this informationint a format which can be used by applications reading
annotated and indexed media streams.
-Package: libcmml0-dev
+Package: libcmml1-dev
Section: libdevel
Architecture: any
-Depends: libcmml0 (= ${Source-Version}), libc6-dev, libexpat1-dev
+Depends: libcmml1 (= ${Source-Version}), libc6-dev, libexpat1-dev
Provides: libcmml-dev
+Conflicts: libcmml-dev, libcmml0-dev
Description: Continuous Media Markup Language document handler (development files)
This library provides a simple API for reading files marked up with the
Continuous Media Markup Language (CMML), and returns structures containing
@@ -32,8 +33,23 @@
Package: cmml-tools
Section: utils
Architecture: any
-Depends: libcmml0 (= ${Source-Version})
+Depends: libcmml1 (= ${Source-Version})
Recommends: fortune-mod
Description: Continuous Media Markup Language document handling tools
This package contains tools that can be used to work with Continuous Media
Markup Language documents.
+
+Package: libcmml1-dbg
+Section: libdevel
+Architecture: any
+Depends: libcmml1 (= ${Source-Version})
+Conflicts: libcmml0
+Description: Continuous Media Markup Language debugging information
+ This library provides a simple API for reading files marked up with the
+ Continuous Media Markup Language (CMML), and returns structures containing
+ this informationint a format which can be used by applications reading
+ annotated and indexed media streams.
+ .
+ This package contains debugging symbols useful for tracing bugs in the libcmml1
+ package.
+
Deleted: libcmml/trunk/debian/libcmml0-dev.docs
===================================================================
--- libcmml/trunk/debian/libcmml0-dev.docs 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/libcmml0-dev.docs 2008-02-04 12:37:57 UTC (rev 3410)
@@ -1,2 +0,0 @@
-doc/libcmml/html
-doc/libcmml/latex
Deleted: libcmml/trunk/debian/libcmml0-dev.examples
===================================================================
--- libcmml/trunk/debian/libcmml0-dev.examples 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/libcmml0-dev.examples 2008-02-04 12:37:57 UTC (rev 3410)
@@ -1 +0,0 @@
-examples/*.c
Deleted: libcmml/trunk/debian/libcmml0-dev.files
===================================================================
--- libcmml/trunk/debian/libcmml0-dev.files 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/libcmml0-dev.files 2008-02-04 12:37:57 UTC (rev 3410)
@@ -1,4 +0,0 @@
-usr/include/cmml.h
-usr/lib/libcmml.a
-usr/lib/libcmml.so
-usr/lib/pkgconfig/cmml.pc
Deleted: libcmml/trunk/debian/libcmml0.files
===================================================================
--- libcmml/trunk/debian/libcmml0.files 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/libcmml0.files 2008-02-04 12:37:57 UTC (rev 3410)
@@ -1,2 +0,0 @@
-usr/lib/libcmml.so.0
-usr/lib/libcmml.so.0.0.8
Copied: libcmml/trunk/debian/libcmml1-dev.docs (from rev 3409, libcmml/trunk/debian/libcmml0-dev.docs)
===================================================================
--- libcmml/trunk/debian/libcmml1-dev.docs (rev 0)
+++ libcmml/trunk/debian/libcmml1-dev.docs 2008-02-04 12:37:57 UTC (rev 3410)
@@ -0,0 +1,2 @@
+doc/libcmml/html
+doc/libcmml/latex
Copied: libcmml/trunk/debian/libcmml1-dev.examples (from rev 3409, libcmml/trunk/debian/libcmml0-dev.examples)
===================================================================
--- libcmml/trunk/debian/libcmml1-dev.examples (rev 0)
+++ libcmml/trunk/debian/libcmml1-dev.examples 2008-02-04 12:37:57 UTC (rev 3410)
@@ -0,0 +1 @@
+examples/*.c
Copied: libcmml/trunk/debian/libcmml1-dev.files (from rev 3409, libcmml/trunk/debian/libcmml0-dev.files)
===================================================================
--- libcmml/trunk/debian/libcmml1-dev.files (rev 0)
+++ libcmml/trunk/debian/libcmml1-dev.files 2008-02-04 12:37:57 UTC (rev 3410)
@@ -0,0 +1,5 @@
+usr/include/cmml.h
+usr/lib/libcmml.a
+usr/lib/libcmml.so
+usr/lib/libcmml.la
+usr/lib/pkgconfig/cmml.pc
Copied: libcmml/trunk/debian/libcmml1.files (from rev 3409, libcmml/trunk/debian/libcmml0.files)
===================================================================
--- libcmml/trunk/debian/libcmml1.files (rev 0)
+++ libcmml/trunk/debian/libcmml1.files 2008-02-04 12:37:57 UTC (rev 3410)
@@ -0,0 +1,2 @@
+usr/lib/libcmml.so.1
+usr/lib/libcmml.so.1.0.0
Modified: libcmml/trunk/debian/rules
===================================================================
--- libcmml/trunk/debian/rules 2008-02-03 14:49:52 UTC (rev 3409)
+++ libcmml/trunk/debian/rules 2008-02-04 12:37:57 UTC (rev 3410)
@@ -15,9 +15,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:
@@ -27,7 +24,8 @@
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info
+ --infodir=\$${prefix}/share/info \
+ || cat config.log
touch configure-stamp
build: build-stamp
@@ -60,6 +58,7 @@
dh_clean -k
dh_installdirs
$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+ chmod 644 examples/cmml-write.c
binary-indep: build install
dh_testdir
@@ -86,12 +85,13 @@
dh_installman -a
dh_installchangelogs -a ChangeLog
dh_link -a
- dh_strip -a
+ dh_strip -a --keep-debug --dbg-package=libcmml1
+ rm -rf debian/cmml-tools/usr/lib
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
dh_installdeb -a
- dh_shlibdeps -a -ldebian/libcmml0/usr/lib
+ dh_shlibdeps -a -ldebian/libcmml1/usr/lib
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
Added: libcmml/trunk/debian/watch
===================================================================
--- libcmml/trunk/debian/watch (rev 0)
+++ libcmml/trunk/debian/watch 2008-02-04 12:37:57 UTC (rev 3410)
@@ -0,0 +1,2 @@
+version=2
+http://annodex.net/software/libcmml/download/ libcmml-([\d\.]+)\.tar\.gz debian uupdate
More information about the commits
mailing list