r11 - in unstable: . libmatroska libmatroska/debian
libmatroska/debian/patches
Sam Hocevar
sho at alioth.debian.org
Wed Mar 14 14:18:52 CET 2007
Author: sho
Date: 2006-03-30 15:31:15 +0000 (Thu, 30 Mar 2006)
New Revision: 11
Added:
unstable/libmatroska/
unstable/libmatroska/debian/
unstable/libmatroska/debian/changelog
unstable/libmatroska/debian/compat
unstable/libmatroska/debian/control
unstable/libmatroska/debian/copyright
unstable/libmatroska/debian/libmatroska-dev.dirs
unstable/libmatroska/debian/patches/
unstable/libmatroska/debian/patches/010_propagate_cflags.diff
unstable/libmatroska/debian/patches/020_missing_timestamp.diff
unstable/libmatroska/debian/patches/series
unstable/libmatroska/debian/rules
Log:
libmatroska (0.8.0-2) unstable; urgency=low
* Switched patch system to quilt.
* debian/control:
+ Build-depend on quilt.
+ Build-depend on debhelper (>= 4.0).
* debian/compat:
+ Set level to 4.
* 010_propagate_cflags.diff: (new patch from old diff.gz) propagate custom
CXXFLAGS to the build process.
* 020_missing_timestamp.diff: (new patch from old diff.gz) fix for
compilers that do not have __TIMESTAMP__.
Property changes on: unstable/libmatroska/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: unstable/libmatroska/debian/changelog
===================================================================
--- unstable/libmatroska/debian/changelog 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/changelog 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,137 @@
+libmatroska (0.8.0-2) unstable; urgency=low
+
+ * Switched patch system to quilt.
+ * debian/control:
+ + Build-depend on quilt.
+ + Build-depend on debhelper (>= 4.0).
+ * debian/compat:
+ + Set level to 4.
+
+ * 010_propagate_cflags.diff: (new patch from old diff.gz) propagate custom
+ CXXFLAGS to the build process.
+
+ * 020_missing_timestamp.diff: (new patch from old diff.gz) fix for
+ compilers that do not have __TIMESTAMP__.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 30 Mar 2006 17:14:29 +0200
+
+libmatroska (0.8.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 30 Oct 2005 15:57:42 +0100
+
+libmatroska (0.7.7-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/control:
+ + Set policy to 3.6.2.1.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 15 Jul 2005 13:17:57 +0200
+
+libmatroska (0.7.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 12 Mar 2005 18:28:04 +0100
+
+libmatroska (0.7.4-1) unstable; urgency=low
+
+ * New upstream release (Closes: #288717, #290688).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 12 Mar 2005 17:33:06 +0100
+
+libmatroska (0.7.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #271898).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 21 Sep 2004 13:42:41 +0200
+
+libmatroska (0.7.0-2) unstable; urgency=low
+
+ * debian/control:
+ + Set policy to 3.6.1.1.
+ + Build-depend on libebml (>= 0.7.0-2).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 27 Jul 2004 13:12:25 +0200
+
+libmatroska (0.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 26 Apr 2004 22:29:48 +0200
+
+libmatroska (0.6.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 6 Jan 2004 21:21:51 +0100
+
+libmatroska (0.6.1-2) unstable; urgency=low
+
+ * Added a __TIMESTAMP__ define to KaxConfig.h to avoid compilation issues.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 3 Dec 2003 11:44:36 +0100
+
+libmatroska (0.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 4 Nov 2003 11:27:00 +0100
+
+libmatroska (0.5.2-2) unstable; urgency=low
+
+ * Fixed upstream's braindamaged use of DEB_BUILD_OPTIONS (Closes: #215774).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 15 Oct 2003 09:00:42 +0200
+
+libmatroska (0.5.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #214767).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 13 Oct 2003 10:40:30 +0200
+
+libmatroska (0.5.0-4) unstable; urgency=low
+
+ * Used "cvs2cl --utc --no-wrap -w --stdout -g -z9" to generate an upstream
+ changelog (Closes: #208597).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 5 Sep 2003 09:26:58 +0200
+
+libmatroska (0.5.0-3) unstable; urgency=low
+
+ * make/linux/Makefile:
+ + Fixed $(CUSTOMFLAGS) so that the PIC lib gets built.
+ * debian/control:
+ + Set policy to 3.6.1.0.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 2 Sep 2003 21:12:08 +0200
+
+libmatroska (0.5.0-2) unstable; urgency=low
+
+ * debian/control:
+ + Downgraded debhelper build-dependency to allow easier backporting.
+ + Enhanced the long description.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 14 Aug 2003 11:06:11 +0200
+
+libmatroska (0.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Set policy to 3.6.0. No changes required.
+ + Set debhelper build-dependency to (>= 4.0) because of debian/compat.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 7 Aug 2003 14:54:50 +0200
+
+libmatroska (0.4.4+cvs.20030622-1) unstable; urgency=low
+
+ * First Debian release (Closes: #198445).
+ * debian/control:
+ + Set policy to 3.5.10.
+ + Removed leading "an" from upstream's description.
+ * debian/rules:
+ + Ship PIC libraries so that application plugins can be linked with us.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 25 Jun 2003 05:22:08 +0200
+
Added: unstable/libmatroska/debian/compat
===================================================================
--- unstable/libmatroska/debian/compat 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/compat 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1 @@
+4
Added: unstable/libmatroska/debian/control
===================================================================
--- unstable/libmatroska/debian/control 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/control 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,19 @@
+Source: libmatroska
+Priority: optional
+Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Build-Depends: debhelper (>= 4.0), quilt, libebml-dev (>= 0.7.6-1)
+Standards-Version: 3.6.2.1
+
+Package: libmatroska-dev
+Section: libdevel
+Architecture: any
+Depends: libebml-dev (>= 0.7.6-1)
+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 header files and static libraries needed to
+ compile applications or shared objects that use libmatroska.
Added: unstable/libmatroska/debian/copyright
===================================================================
--- unstable/libmatroska/debian/copyright 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/copyright 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,26 @@
+This package was debianized by Moritz Bunkus <moritz at bunkus.org> on
+Mon, 21 Apr 2003 12:49:33 +0200.
+
+It was downloaded from http://dl.matroska.org/downloads/libmatroska/
+
+Upstream Author: Steve Lhomme <steve.lhomme at free.fr>
+
+Copyright (C) 2002-2005 Steve Lhomme. All rights reserved.
+
+This file may be distributed under the terms of the Q Public License
+as defined by Trolltech AS of Norway and appearing in the file
+LICENSE.QPL included in the packaging of this file.
+
+This proram is also licensed under the GPL. See
+/usr/share/common-licenses/GPL for details.
+
+Licensees holding an other license may use this file in accordance with
+the Agreement provided with the Software.
+
+This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+See http://www.matroska.org/license/qpl/ for QPL licensing information.
+
+Contact license at matroska.org if any conditions of this licensing are
+not clear to you.
Added: unstable/libmatroska/debian/libmatroska-dev.dirs
===================================================================
--- unstable/libmatroska/debian/libmatroska-dev.dirs 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/libmatroska-dev.dirs 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
Added: unstable/libmatroska/debian/patches/010_propagate_cflags.diff
===================================================================
--- unstable/libmatroska/debian/patches/010_propagate_cflags.diff 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/patches/010_propagate_cflags.diff 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,10 @@
+--- libmatroska-0.8.0.orig/make/linux/Makefile
++++ libmatroska-0.8.0/make/linux/Makefile
+@@ -70,6 +70,7 @@
+
+ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+
++CXXFLAGS+=$(CUSTOMFLAGS)
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
+ -Wshadow
+ COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
Added: unstable/libmatroska/debian/patches/020_missing_timestamp.diff
===================================================================
--- unstable/libmatroska/debian/patches/020_missing_timestamp.diff 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/patches/020_missing_timestamp.diff 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,14 @@
+--- libmatroska-0.8.0.orig/matroska/KaxConfig.h
++++ libmatroska-0.8.0/matroska/KaxConfig.h
+@@ -36,6 +36,11 @@
+
+ #define LIBMATROSKA_NAMESPACE libmatroska
+
++// For compilers that don't define __TIMESTAMP__ (e.g. gcc 2.95, gcc 3.2)
++#ifndef __TIMESTAMP__
++#define __TIMESTAMP__ __DATE__ " " __TIME__
++#endif
++
+ #if defined(NO_NAMESPACE) // for older GCC
+ # define START_LIBMATROSKA_NAMESPACE
+ # define END_LIBMATROSKA_NAMESPACE
Added: unstable/libmatroska/debian/patches/series
===================================================================
--- unstable/libmatroska/debian/patches/series 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/patches/series 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,2 @@
+010_propagate_cflags.diff -p1
+020_missing_timestamp.diff -p1
Added: unstable/libmatroska/debian/rules
===================================================================
--- unstable/libmatroska/debian/rules 2006-03-30 15:23:26 UTC (rev 10)
+++ unstable/libmatroska/debian/rules 2006-03-30 15:31:15 UTC (rev 11)
@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS = -O0
+else
+CFLAGS = -O2
+endif
+
+build: build-stamp
+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
+ touch build-stamp
+
+clean:
+ dh_testdir
+ 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
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # 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.
+
+# Build architecture-dependent files here.
+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_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: unstable/libmatroska/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-multimedia-commits
mailing list