r202 - tarballs unstable/libmatroska/debian

[Samuel Hocevar]

Author: sho
Date: 2007-03-15 18:48:05 +0000 (Thu, 15 Mar 2007)
New Revision: 202

Added:
   tarballs/libmatroska_0.8.1.orig.tar.gz
   unstable/libmatroska/debian/libmatroska-dev.install
   unstable/libmatroska/debian/libmatroska0.dirs
   unstable/libmatroska/debian/libmatroska0.install
Modified:
   unstable/libmatroska/debian/changelog
   unstable/libmatroska/debian/compat
   unstable/libmatroska/debian/control
   unstable/libmatroska/debian/rules
Log:
libmatroska (0.8.1-1) unstable; urgency=low

  * New upstream release.
  * We now distribute shared libraries.

  * debian/rules:
    + No longer build _pic.a library.
  * debian/control:
    + Depend and build-depend on libebml-dev (>= 0.7.7-3).
  * debian/compat:
    + Set compat to 5.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 15 Mar 2007 19:34:20 +0100


Added: tarballs/libmatroska_0.8.1.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: tarballs/libmatroska_0.8.1.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: unstable/libmatroska/debian/changelog
===================================================================
--- unstable/libmatroska/debian/changelog	2007-03-15 18:29:47 UTC (rev 201)
+++ unstable/libmatroska/debian/changelog	2007-03-15 18:48:05 UTC (rev 202)
@@ -1,3 +1,17 @@
+libmatroska (0.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * We now distribute shared libraries.
+
+  * debian/rules:
+    + No longer build _pic.a library.
+  * debian/control:
+    + Depend and build-depend on libebml-dev (>= 0.7.7-3).
+  * debian/compat:
+    + Set compat to 5.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 15 Mar 2007 19:34:20 +0100
+
 libmatroska (0.8.0-3) unstable; urgency=low
 
   * debian/control:

Modified: unstable/libmatroska/debian/compat
===================================================================
--- unstable/libmatroska/debian/compat	2007-03-15 18:29:47 UTC (rev 201)
+++ unstable/libmatroska/debian/compat	2007-03-15 18:48:05 UTC (rev 202)
@@ -1 +1 @@
-4
+5

Modified: unstable/libmatroska/debian/control
===================================================================
--- unstable/libmatroska/debian/control	2007-03-15 18:29:47 UTC (rev 201)
+++ unstable/libmatroska/debian/control	2007-03-15 18:48:05 UTC (rev 202)
@@ -3,15 +3,29 @@
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 4.0), quilt, libebml-dev (>= 0.7.6-1)
+Build-Depends: debhelper (>= 5.0), quilt, libebml-dev (>= 0.7.7-3)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libmatroska
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmatroska/
 
+Package: libmatroska0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: extensible open standard audio/video container format
+ Matroska is aiming to become the standard of Multimedia
+ Container Formats one day. It is based on EBML (Extensible Binary
+ Meta Language), a kind of binary version of XML. This way the
+ significant advantages in terms of future format extensability
+ are gained without breaking file support in old parsers.
+ .
+ This package contains the shared library needed to run applications that
+ use libmatroska.
+
 Package: libmatroska-dev
 Section: libdevel
 Architecture: any
-Depends: libebml-dev (>= 0.7.6-1)
+Depends: libebml-dev (>= 0.7.7-3), libmatroska0, ${shlibs:Depends}
 Description: extensible open standard audio/video container format
  Matroska is aiming to become the standard of Multimedia
  Container Formats one day. It is based on EBML (Extensible Binary
@@ -20,4 +34,4 @@
  are gained without breaking file support in old parsers.
  .
  This package contains the header files and static libraries needed to
- compile applications or shared objects that use libmatroska.
+ compile applications that use libmatroska.

Added: unstable/libmatroska/debian/libmatroska-dev.install
===================================================================
--- unstable/libmatroska/debian/libmatroska-dev.install	2007-03-15 18:29:47 UTC (rev 201)
+++ unstable/libmatroska/debian/libmatroska-dev.install	2007-03-15 18:48:05 UTC (rev 202)
@@ -0,0 +1,3 @@
+/usr/include
+/usr/lib/*.so
+/usr/lib/*.a

Copied: unstable/libmatroska/debian/libmatroska0.dirs (from rev 191, unstable/libmatroska/debian/libmatroska-dev.dirs)
===================================================================
--- unstable/libmatroska/debian/libmatroska-dev.dirs	2007-03-13 17:33:23 UTC (rev 191)
+++ unstable/libmatroska/debian/libmatroska0.dirs	2007-03-15 18:48:05 UTC (rev 202)
@@ -0,0 +1 @@
+usr/lib

Added: unstable/libmatroska/debian/libmatroska0.install
===================================================================
--- unstable/libmatroska/debian/libmatroska0.install	2007-03-15 18:29:47 UTC (rev 201)
+++ unstable/libmatroska/debian/libmatroska0.install	2007-03-15 18:48:05 UTC (rev 202)
@@ -0,0 +1 @@
+/usr/lib/lib*.so.*

Modified: unstable/libmatroska/debian/rules
===================================================================
--- unstable/libmatroska/debian/rules	2007-03-15 18:29:47 UTC (rev 201)
+++ unstable/libmatroska/debian/rules	2007-03-15 18:48:05 UTC (rev 202)
@@ -15,12 +15,7 @@
 build-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	# Build the PIC library
-	$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml CUSTOMFLAGS="-fpic -fPIC $(CFLAGS)" staticlib
-	mv make/linux/libmatroska.a make/linux/libmatroska_pic.a
-	-$(MAKE) -C make/linux clean
-	# Build the normal static library
-	$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml CUSTOMFLAGS="-fpic -fPIC $(CFLAGS)" staticlib
+	$(MAKE) -C make/linux LIBEBML_INCLUDE_DIR=/usr/include/ebml CUSTOMFLAGS="$(CFLAGS)"
 	touch build-stamp
 
 clean:
@@ -28,8 +23,6 @@
 	dh_testroot
 	rm -f build-stamp
 	rm -f debian/dirs debian/docs debian/*.files
-	rm -f make/linux/libmatroska_pic.a
-	# Clean the build tree
 	-$(MAKE) -C make/linux clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean
@@ -39,13 +32,9 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	$(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr install
+	dh_install -si --fail-missing --sourcedir=debian/tmp
 
-	# Install the package into debian/libmatroska-dev
-	$(MAKE) -C make/linux prefix=$(CURDIR)/debian/libmatroska-dev/usr \
-		install_headers install_staticlib
-	cp make/linux/libmatroska_pic.a debian/libmatroska-dev/usr/lib/
-
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -54,28 +43,14 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-
-#	dh_installdebconf	
 	dh_installdocs
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs ChangeLog
 	dh_link
-#	dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums