[xiph-commits] r3411 - in libcmml/trunk: . debian

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-02-04 04:54:37 -0800 (Mon, 04 Feb 2008)
New Revision: 3411

Modified:
   libcmml/trunk/
   libcmml/trunk/debian/changelog
   libcmml/trunk/debian/control
   libcmml/trunk/debian/rules
Log:
Bring debian stuff up to standard


Property changes on: libcmml/trunk
___________________________________________________________________
Name: svn:ignore
   - configure
Makefile.in
config.log
cmml.pc
config.guess
config.h
ltmain.sh
config.sub
Makefile
stamp-h.in
mkinstalldirs
config.status
config.h.in
autom4te.cache
libtool
missing
stamp-h
aclocal.m4
install-sh

   + configure
Makefile.in
config.log
depcomp
config.guess
config.h
ltmain.sh
config.sub
cmml.pc
Makefile
stamp-h.in
mkinstalldirs
config.status
config.h.in
autom4te.cache
libtool
missing
stamp-h
aclocal.m4
install-sh
libcmml-*.tar.gz


Modified: libcmml/trunk/debian/changelog
===================================================================
--- libcmml/trunk/debian/changelog	2008-02-04 12:37:57 UTC (rev 3410)
+++ libcmml/trunk/debian/changelog	2008-02-04 12:54:37 UTC (rev 3411)
@@ -1,9 +1,8 @@
-libcmml (0.9.2-3.1ubuntu1) feisty; urgency=low
+libcmml (0.9.3-1) unstable; urgency=low
 
-  * Merge from debian unstable, remaining changes:
-    - Conflicts on libcmml0, libcmml0-dev
+  * New upstream
 
- -- Michael Bienia <geser at ubuntu.com>  Mon,  8 Jan 2007 14:11:46 +0100
+ -- John Ferlito <johnf at inodes.org>  Mon, 04 Feb 2008 23:39:02 +1100
 
 libcmml (0.9.2-3.1) unstable; urgency=low
 
@@ -12,12 +11,6 @@
 
  -- 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

Modified: libcmml/trunk/debian/control
===================================================================
--- libcmml/trunk/debian/control	2008-02-04 12:37:57 UTC (rev 3410)
+++ libcmml/trunk/debian/control	2008-02-04 12:54:37 UTC (rev 3411)
@@ -1,9 +1,9 @@
 Source: libcmml
 Section: net
 Priority: optional
-Maintainer: Jamie Wilkinson <jaq at debian.org>
+Maintainer: John Ferlito <johnf at inodes.org>
 Build-Depends: debhelper (>> 4.0.0), libexpat1-dev, doxygen, docbook-to-man
-Standards-Version: 3.6.2
+Standards-Version: 3.7.3
 
 Package: libcmml1
 Section: libs
@@ -18,7 +18,7 @@
 Package: libcmml1-dev
 Section: libdevel
 Architecture: any
-Depends: libcmml1 (= ${Source-Version}), libc6-dev, libexpat1-dev
+Depends: libcmml1 (= ${binary:Version}), libc6-dev, libexpat1-dev
 Provides: libcmml-dev
 Conflicts: libcmml-dev, libcmml0-dev
 Description: Continuous Media Markup Language document handler (development files)
@@ -33,7 +33,7 @@
 Package: cmml-tools
 Section: utils
 Architecture: any
-Depends: libcmml1 (= ${Source-Version})
+Depends: libcmml1 (= ${binary: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
@@ -42,8 +42,9 @@
 Package: libcmml1-dbg
 Section: libdevel
 Architecture: any
-Depends: libcmml1 (= ${Source-Version})
+Depends: libcmml1 (= ${binary:Version})
 Conflicts: libcmml0
+Priority: extra
 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

Modified: libcmml/trunk/debian/rules
===================================================================
--- libcmml/trunk/debian/rules	2008-02-04 12:37:57 UTC (rev 3410)
+++ libcmml/trunk/debian/rules	2008-02-04 12:54:37 UTC (rev 3411)
@@ -39,7 +39,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f doc/manpage.refs doc/manpage.links
 	rm -f doc/libcmml/html/*.html
 	rm -f doc/libcmml/html/doxygen.png