From: Moritz Bunkus Date: Sun, 9 May 2010 14:58:33 +0000 (+0000) Subject: Fixed DOS newlines & set the eol-style property X-Git-Tag: release-0.9.0~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ca501220253d8ea94405eda6c52255b017cde77;p=libmatroska Fixed DOS newlines & set the eol-style property git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@179 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- diff --git a/debian/changelog b/debian/changelog index 4c2b5e3..a5f9cb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,174 +1,174 @@ -libmatroska (0.8.1-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Mon, 16 Jan 2007 17:00:30 +0100 - -libmatroska (0.8.0-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Tue, 18 Oct 2005 20:00:18 +0200 - -libmatroska (0.7.7-2) unstable; urgency=low - - * Rebuilt with g++ 4.0.2. - - -- Moritz Bunkus Sat, 15 Oct 2005 14:25:46 +0200 - -libmatroska (0.7.7-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Fri, 20 May 2005 16:28:21 +0200 - -libmatroska (0.7.6-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Sat, 16 Apr 2005 13:24:30 +0200 - -libmatroska (0.7.5-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Sun, 6 Feb 2005 21:02:42 +0100 - -libmatroska (0.7.4-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Sun, 26 Sep 2004 12:35:05 +0200 - -libmatroska (0.7.3-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Mon, 16 Aug 2004 22:52:57 +0200 - -libmatroska (0.7.2-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Wed, 4 Aug 2004 19:49:25 +0200 - -libmatroska (0.7.1-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Sun, 25 Jul 2004 12:41:11 +0200 - -libmatroska (0.7.0-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Fri, 23 Apr 2004 18:45:32 +0200 - -libmatroska (0.6.3-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Mon, 5 Jan 2004 19:55:59 +0100 - -libmatroska (0.6.2-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Tue, 30 Dec 2003 10:59:47 +0100 - -libmatroska (0.6.1-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Thu, 30 Oct 2003 13:49:33 +0100 - -libmatroska (0.6.0-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Tue, 28 Oct 2003 23:09:34 +0100 - -libmatroska (0.5.3-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Wed, 22 Oct 2003 19:22:10 +0200 - -libmatroska (0.5.2-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Wed, 17 Sep 2003 22:22:10 +0200 - -libmatroska (0.5.1-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Mon, 1 Sep 2003 13:42:56 +0200 - -libmatroska (0.5.0-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Mon, 28 Jul 2003 10:49:27 +0200 - -libmatroska (0.4.4-2) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Sat, 14 Jun 2003 17:40:11 +0200 - -libmatroska (0.4.4-1) unstable; urgency=low - - * New version. - - -- Moritz Bunkus Wed, 11 Jun 2003 20:32:09 +0200 - -libmatroska (0.4.3-1) unstable; urgency=low - - * New version with API changes. - - -- Moritz Bunkus Wed, 21 May 2003 22:35:52 +0200 - -libmatroska (0.4.2-1) unstable; urgency=low - - * New version with API changes. - - -- Moritz Bunkus Tue, 6 May 2003 22:33:44 +0200 - -libmatroska (0.4.1-2) unstable; urgency=low - - * Compiled with gcc 3.2.3 - - -- Moritz Bunkus Sun, 04 May 2003 22:11:33 +0200 - -libmatroska (0.4.1-1) unstable; urgency=low - - * Some bugfixes, memleak fixed. - - -- Moritz Bunkus Sat, 03 May 2003 23:07:33 +0200 - -libmatroska (0.4.0-1) unstable; urgency=low - - * First alpha release :) - - -- Moritz Bunkus Wed, 30 Apr 2003 10:44:33 +0200 - -libmatroska (0.2.0.20030425) unstable; urgency=low - - * New version with bugfixes by Steve. - - -- Moritz Bunkus Fri, 25 Apr 2003 20:01:49 +0200 - -libmatroska (0.2.0.20030421) unstable; urgency=low - - * Separated libebml from libmatroska like in the upstream sources.) - - -- Moritz Bunkus Mon, 21 Apr 2003 16:33:36 +0200 - -libmatroska (0.0.20030225) unstable; urgency=low - - * Initial Release. - - -- Moritz Bunkus Tue, 25 Feb 2003 18:28:52 +0100 - +libmatroska (0.8.1-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Mon, 16 Jan 2007 17:00:30 +0100 + +libmatroska (0.8.0-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Tue, 18 Oct 2005 20:00:18 +0200 + +libmatroska (0.7.7-2) unstable; urgency=low + + * Rebuilt with g++ 4.0.2. + + -- Moritz Bunkus Sat, 15 Oct 2005 14:25:46 +0200 + +libmatroska (0.7.7-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Fri, 20 May 2005 16:28:21 +0200 + +libmatroska (0.7.6-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 16 Apr 2005 13:24:30 +0200 + +libmatroska (0.7.5-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 6 Feb 2005 21:02:42 +0100 + +libmatroska (0.7.4-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 26 Sep 2004 12:35:05 +0200 + +libmatroska (0.7.3-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Mon, 16 Aug 2004 22:52:57 +0200 + +libmatroska (0.7.2-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Wed, 4 Aug 2004 19:49:25 +0200 + +libmatroska (0.7.1-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 25 Jul 2004 12:41:11 +0200 + +libmatroska (0.7.0-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Fri, 23 Apr 2004 18:45:32 +0200 + +libmatroska (0.6.3-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Mon, 5 Jan 2004 19:55:59 +0100 + +libmatroska (0.6.2-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Tue, 30 Dec 2003 10:59:47 +0100 + +libmatroska (0.6.1-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Thu, 30 Oct 2003 13:49:33 +0100 + +libmatroska (0.6.0-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Tue, 28 Oct 2003 23:09:34 +0100 + +libmatroska (0.5.3-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Wed, 22 Oct 2003 19:22:10 +0200 + +libmatroska (0.5.2-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Wed, 17 Sep 2003 22:22:10 +0200 + +libmatroska (0.5.1-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Mon, 1 Sep 2003 13:42:56 +0200 + +libmatroska (0.5.0-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Mon, 28 Jul 2003 10:49:27 +0200 + +libmatroska (0.4.4-2) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 14 Jun 2003 17:40:11 +0200 + +libmatroska (0.4.4-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus Wed, 11 Jun 2003 20:32:09 +0200 + +libmatroska (0.4.3-1) unstable; urgency=low + + * New version with API changes. + + -- Moritz Bunkus Wed, 21 May 2003 22:35:52 +0200 + +libmatroska (0.4.2-1) unstable; urgency=low + + * New version with API changes. + + -- Moritz Bunkus Tue, 6 May 2003 22:33:44 +0200 + +libmatroska (0.4.1-2) unstable; urgency=low + + * Compiled with gcc 3.2.3 + + -- Moritz Bunkus Sun, 04 May 2003 22:11:33 +0200 + +libmatroska (0.4.1-1) unstable; urgency=low + + * Some bugfixes, memleak fixed. + + -- Moritz Bunkus Sat, 03 May 2003 23:07:33 +0200 + +libmatroska (0.4.0-1) unstable; urgency=low + + * First alpha release :) + + -- Moritz Bunkus Wed, 30 Apr 2003 10:44:33 +0200 + +libmatroska (0.2.0.20030425) unstable; urgency=low + + * New version with bugfixes by Steve. + + -- Moritz Bunkus Fri, 25 Apr 2003 20:01:49 +0200 + +libmatroska (0.2.0.20030421) unstable; urgency=low + + * Separated libebml from libmatroska like in the upstream sources.) + + -- Moritz Bunkus Mon, 21 Apr 2003 16:33:36 +0200 + +libmatroska (0.0.20030225) unstable; urgency=low + + * Initial Release. + + -- Moritz Bunkus Tue, 25 Feb 2003 18:28:52 +0100 + diff --git a/debian/control b/debian/control index 30873be..b338900 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ -Source: libmatroska -Priority: optional -Maintainer: Moritz Bunkus -Build-Depends: debhelper (>> 3.0.0), libebml-dev (>= 0.7.3-1) -Standards-Version: 3.5.8 - -Package: libmatroska-dev -Section: devel -Architecture: any -Depends: libebml-dev (>= 0.7.2-1) -Description: an 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. +Source: libmatroska +Priority: optional +Maintainer: Moritz Bunkus +Build-Depends: debhelper (>> 3.0.0), libebml-dev (>= 0.7.3-1) +Standards-Version: 3.5.8 + +Package: libmatroska-dev +Section: devel +Architecture: any +Depends: libebml-dev (>= 0.7.2-1) +Description: an 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. diff --git a/debian/copyright b/debian/copyright index e1ad1fa..6c03f8b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,26 +1,26 @@ -This package was debianized by Moritz Bunkus on -Mon, 21 Apr 2003 12:49:33 +0200. - -It was downloaded from http://www.matroska.org/ - -Upstream Author: Steve Lhomme - -Copyright (C) 2002-2003 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@matroska.org if any conditions of this licensing are -not clear to you. +This package was debianized by Moritz Bunkus on +Mon, 21 Apr 2003 12:49:33 +0200. + +It was downloaded from http://www.matroska.org/ + +Upstream Author: Steve Lhomme + +Copyright (C) 2002-2003 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@matroska.org if any conditions of this licensing are +not clear to you. diff --git a/debian/dirs b/debian/dirs index 454f267..ca882bb 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,2 @@ -usr/bin -usr/sbin +usr/bin +usr/sbin diff --git a/debian/libmatroska-dev.dirs b/debian/libmatroska-dev.dirs index db1be84..4418816 100644 --- a/debian/libmatroska-dev.dirs +++ b/debian/libmatroska-dev.dirs @@ -1,2 +1,2 @@ -usr/lib -usr/include +usr/lib +usr/include diff --git a/debian/libmatroska-dev.files b/debian/libmatroska-dev.files index b87d815..07740b8 100644 --- a/debian/libmatroska-dev.files +++ b/debian/libmatroska-dev.files @@ -1,2 +1,2 @@ -usr/include/* -usr/lib/lib*.a +usr/include/* +usr/lib/lib*.a diff --git a/debian/rules b/debian/rules index 969a37d..989dca2 100644 --- a/debian/rules +++ b/debian/rules @@ -1,95 +1,95 @@ -#!/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 - -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -# configure: configure-stamp -# configure-stamp: -# dh_testdir -# # Add here commands to configure the package. - -# touch configure-stamp - - -build: build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml staticlib - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr \ - install_headers install_staticlib - - -# 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_movefiles - -# 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 +#!/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 + +# This is the debhelper compatibility version to use. +export DH_COMPAT=4 + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +# configure: configure-stamp +# configure-stamp: +# dh_testdir +# # Add here commands to configure the package. + +# touch configure-stamp + + +build: build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml staticlib + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr \ + install_headers install_staticlib + + +# 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_movefiles + +# 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