diff -Nru libebml-1.2.0+dfsg/ChangeLog libebml-1.2.1/ChangeLog --- libebml-1.2.0+dfsg/ChangeLog 2011-01-30 10:59:22.000000000 +0000 +++ libebml-1.2.1/ChangeLog 2011-06-26 17:39:25.000000000 +0000 @@ -1,3 +1,11 @@ +2011-06-26 robux4/mosu +New 1.2.1 version: + - fix the constructor of CRTError in StdIOCallback (patch from Graham 'gbooker' Booker) + - fix the size returned by MemIOCallback::read() when reaching the end of the buffer + - add a macro to define signed integer elements that have a default value + - fix compilation of debug builds on win32 + - fix for Sun Studio C compiler + 2011-01-30 robux4/mosu New 1.2.0 version: - no need to put the internal code of EbmlCrc32 in the public header diff -Nru libebml-1.2.0+dfsg/debian/changelog libebml-1.2.1/debian/changelog --- libebml-1.2.0+dfsg/debian/changelog 2011-02-21 00:11:32.000000000 +0000 +++ libebml-1.2.1/debian/changelog 2011-08-19 15:27:36.000000000 +0000 @@ -1,28 +1,95 @@ -libebml (1.2.0+dfsg-0ubuntu1) natty; urgency=low +libebml (1.2.1-1ubuntu1~natty1) natty; urgency=low - * New upstream release (LP: #722378) - * Bump SONAME to libebml3. - * Convert to source format 3.0. + * Backport - -- Julien Lavergne Mon, 21 Feb 2011 00:56:16 +0100 + -- Cosme Domínguez Díaz Fri, 19 Aug 2011 15:27:25 +0000 -libebml (1.0.0+dfsg-0ubuntu1) maverick; urgency=low +libebml (1.2.1-1) unstable; urgency=low - * New upstream release. - * Removed patches merged upstream: - - 010_propagate_cflags.diff - - 020_invalid_cast.diff - - 030_g++-4.3.diff + * Team upload. + * New upstream release (Closes: #631803): + - fix the constructor of CRTError in StdIOCallback + - fix the size returned by MemIOCallback::read() + when reaching the end of the buffer + - add a macro to define signed integer elements that + have a default value + * Correct maintainer's name. + * Bump Standards. + * Remove useless shlibs:Depends macro from -DEV's Depends field. + * Fix small errors in the packages description. + * Remove unnecessary debian/dirs file. + + -- Alessio Treglia Tue, 28 Jun 2011 10:12:23 +0200 + +libebml (1.2.0-2) unstable; urgency=low + + * Team upload. + + [ Rico Tzschichholz ] + * add myself to uploaders + + [ Fabian Greffrath ] + * Remove myself from Uploaders. + + [ Reinhard Tartler ] + * upload to unstable + + -- Reinhard Tartler Sat, 05 Mar 2011 17:54:36 +0100 + +libebml (1.2.0-1) experimental; urgency=low + + [ Rico Tzschichholz ] + * New upstream release + * debian/control,debian/libebml3.install: + + bump library soname to libebml3 * debian/control: - - Removed quilt build-dependency, not needed. - - Renamed libebml0 to libebml2 to match soname. - - Bumped Standards-Version to 3.8.4. - * debian/copyright: - - Updated FSF address. - * debian/rules: - - Do not ignore make error. + + bump standard version to 3.9.1 + + [ Reinhard Tartler ] + * upload to experimental + + -- Reinhard Tartler Fri, 18 Feb 2011 20:54:15 +0100 + +libebml (1.0.0-1) experimental; urgency=low + + [ Reinhard Tartler ] + * remove generated files from branch + * add .gitignore file + * bump shlips + * remove debian/patches/010_propagate_cflags.diff hack + * remove debian/patches/020_invalid_cast.diff, applied upstream + * remove debian/patches/030_g++-4.3.diff, merged upstream + * don't create usr/include in libebml0 package + + [ Fabian Greffrath ] + * Add debian/watch. + * Add debian/gbp.conf. + * Imported Upstream version 1.0.0 (Closes: #582238). + + [ Reinhard Tartler ] + * prepare new upload + * convert to Source Format 3.0 (quilt) + * update Vcs- headers + + [ Fabian Greffrath ] + * Remove useless debian/*.dirs. + * Bump library soname to libebml2. + * Convert Debian packaging to dh 7. + * Add myself to Uploaders. + * Bump Standards-Version to 3.8.4. + * Fix weak-library-dev-dependency. + * Fix debhelper-but-no-misc-depends. + * Wrap lines in debian/control. + * Fix duplicate-short-description. + * Fix old-fsf-address-in-copyright-file. - -- Maia Kozheva Sun, 06 Jun 2010 04:06:43 +0700 + -- Fabian Greffrath Tue, 08 Jun 2010 23:13:59 +0200 + +libebml (0.8.0-1) unstable; urgency=low + + * new upstream release. (Closes: 582238). + + -- Eric Dantan Rzewnicki Sat, 29 May 2010 09:54:09 -0400 libebml (0.7.7-3.1) unstable; urgency=low @@ -190,4 +257,3 @@ + Ship PIC libraries so that application plugins can be linked with us. -- Sam Hocevar (Debian packages) Wed, 25 Jun 2003 05:22:08 +0200 - diff -Nru libebml-1.2.0+dfsg/debian/compat libebml-1.2.1/debian/compat --- libebml-1.2.0+dfsg/debian/compat 2011-02-20 23:43:29.000000000 +0000 +++ libebml-1.2.1/debian/compat 2011-06-28 07:40:43.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru libebml-1.2.0+dfsg/debian/control libebml-1.2.1/debian/control --- libebml-1.2.0+dfsg/debian/control 2011-02-20 23:51:05.000000000 +0000 +++ libebml-1.2.1/debian/control 2011-06-28 08:11:11.000000000 +0000 @@ -1,20 +1,22 @@ Source: libebml Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian multimedia packages maintainers -Uploaders: Sam Hocevar (Debian packages) -Build-Depends: debhelper (>= 5.0) -Standards-Version: 3.8.4 -XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libebml -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libebml/ +Maintainer: Debian Multimedia Maintainers +Uploaders: Sam Hocevar (Debian packages) , + Rico Tzschichholz +Build-Depends: debhelper (>= 7.0.50~) +Standards-Version: 3.9.2 +Vcs-Git: git://git.debian.org/pkg-multimedia/libebml.git +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libebml.git;a=summary +Homepage: http://dl.matroska.org/downloads/libebml/ Package: libebml3 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: access library for the EBML format - The libebml library allows to read and write files using EBML (the +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: access library for the EBML format (shared library) + The libebml library allows one to read and write files using EBML (the Extensible Binary Meta Language), a binary pendant to XML. Using libebml makes it easier to extend a file format without breaking support in older parsers. @@ -25,9 +27,10 @@ Package: libebml-dev Section: libdevel Architecture: any -Depends: libebml3 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: access library for the EBML format - development files - The libebml library allows to read and write files using EBML (the +Depends: libebml3 (= ${binary:Version}), + ${misc:Depends} +Description: access library for the EBML format (development files) + The libebml library allows one to read and write files using EBML (the Extensible Binary Meta Language), a binary pendant to XML. Using libebml makes it easier to extend a file format without breaking support in older parsers. diff -Nru libebml-1.2.0+dfsg/debian/copyright libebml-1.2.1/debian/copyright --- libebml-1.2.0+dfsg/debian/copyright 2011-02-20 23:43:29.000000000 +0000 +++ libebml-1.2.1/debian/copyright 2011-06-28 07:56:54.000000000 +0000 @@ -8,6 +8,10 @@ Files: debian/* Copyright: © 2003 Moritz Bunkus + © 2010 Fabian Greffrath +License: GPL-2+ + The Debian packaging licensed under the GPL version 2, or + (at your option) any later version, see below. Files: src/IOCallback.cpp src/StdIOCallback.cpp Copyright: @@ -25,7 +29,7 @@ . You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . See http://www.matroska.org/license/lgpl/ for LGPL licensing information. . @@ -48,7 +52,7 @@ . You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . See http://www.matroska.org/license/lgpl/ for LGPL licensing information. . @@ -71,7 +75,7 @@ . You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . See http://www.matroska.org/license/lgpl/ for LGPL licensing information. . @@ -82,4 +86,3 @@ On Debian systems, the full text of the LGPL v2.1 can be found in /usr/share/common-licenses/LGPL-2.1, and of the GPL v2 in /usr/share/common-licenses/GPL-2. - diff -Nru libebml-1.2.0+dfsg/debian/gbp.conf libebml-1.2.1/debian/gbp.conf --- libebml-1.2.0+dfsg/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ libebml-1.2.1/debian/gbp.conf 2011-06-28 07:40:43.000000000 +0000 @@ -0,0 +1,8 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True +compression = bzip2 + diff -Nru libebml-1.2.0+dfsg/debian/libebml3.dirs libebml-1.2.1/debian/libebml3.dirs --- libebml-1.2.0+dfsg/debian/libebml3.dirs 2011-02-20 23:43:29.000000000 +0000 +++ libebml-1.2.1/debian/libebml3.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib -usr/include diff -Nru libebml-1.2.0+dfsg/debian/libebml-dev.files libebml-1.2.1/debian/libebml-dev.files --- libebml-1.2.0+dfsg/debian/libebml-dev.files 1970-01-01 00:00:00.000000000 +0000 +++ libebml-1.2.1/debian/libebml-dev.files 2011-06-28 07:54:41.000000000 +0000 @@ -0,0 +1,2 @@ +usr/include/* +usr/lib/lib*.a diff -Nru libebml-1.2.0+dfsg/debian/README.source libebml-1.2.1/debian/README.source --- libebml-1.2.0+dfsg/debian/README.source 2011-02-20 23:43:29.000000000 +0000 +++ libebml-1.2.1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -The upstream tarball has been repacked to remove the debian/ directory. diff -Nru libebml-1.2.0+dfsg/debian/rules libebml-1.2.1/debian/rules --- libebml-1.2.0+dfsg/debian/rules 2011-02-20 23:43:29.000000000 +0000 +++ libebml-1.2.1/debian/rules 2011-06-28 07:57:06.000000000 +0000 @@ -1,63 +1,7 @@ #!/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 +%: + dh $@ --sourcedirectory=make/linux -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS = -O0 -else -CFLAGS = -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - $(MAKE) -C make/linux CUSTOMFLAGS="$(CFLAGS)" - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - rm -f debian/dirs debian/docs debian/*.files - $(MAKE) -C make/linux clean - dh_clean - -install: build - dh_testdir - 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 - -# 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_installdocs - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_install: + dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr diff -Nru libebml-1.2.0+dfsg/debian/watch libebml-1.2.1/debian/watch --- libebml-1.2.0+dfsg/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ libebml-1.2.1/debian/watch 2011-06-28 07:40:43.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +http://dl.matroska.org/downloads/libebml/libebml-(.*)\.tar\.bz2 diff -Nru libebml-1.2.0+dfsg/ebml/EbmlElement.h libebml-1.2.1/ebml/EbmlElement.h --- libebml-1.2.0+dfsg/ebml/EbmlElement.h 2010-06-30 06:07:40.000000000 +0000 +++ libebml-1.2.1/ebml/EbmlElement.h 2011-03-27 16:43:10.000000000 +0000 @@ -28,7 +28,7 @@ /*! \file - \version \$Id: EbmlElement.h 364 2010-06-30 06:07:40Z robux4 $ + \version \$Id: EbmlElement.h 722 2011-03-27 16:43:10Z robux4 $ \author Steve Lhomme */ #ifndef LIBEBML_ELEMENT_H @@ -116,6 +116,12 @@ const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \ x::x() :EbmlUInteger(defval) {} +#define DEFINE_xxx_SINTEGER_DEF(x,id,idl,parent,name,global,defval) \ + const EbmlId Id_##x (id, idl); \ + const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \ + const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \ + x::x() :EbmlSInteger(defval) {} + #define DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,global,defval) \ const EbmlId Id_##x (id, idl); \ const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \ diff -Nru libebml-1.2.0+dfsg/ebml/EbmlVersion.h libebml-1.2.1/ebml/EbmlVersion.h --- libebml-1.2.0+dfsg/ebml/EbmlVersion.h 2011-01-29 11:45:50.000000000 +0000 +++ libebml-1.2.1/ebml/EbmlVersion.h 2011-06-12 09:21:05.000000000 +0000 @@ -30,7 +30,7 @@ /*! \file - \version \$Id: EbmlVersion.h 648 2011-01-29 11:45:50Z mosub $ + \version \$Id: EbmlVersion.h 756 2011-06-12 09:21:05Z robux4 $ \author Steve Lhomme */ #ifndef LIBEBML_VERSION_H @@ -42,9 +42,9 @@ START_LIBEBML_NAMESPACE -#define LIBEBML_VERSION 0x010200 +#define LIBEBML_VERSION 0x010201 -static const std::string EbmlCodeVersion = "1.2.0"; +static const std::string EbmlCodeVersion = "1.2.1"; static const std::string EbmlCodeDate = __TIMESTAMP__; /*! diff -Nru libebml-1.2.0+dfsg/libebml.proj libebml-1.2.1/libebml.proj --- libebml-1.2.0+dfsg/libebml.proj 2011-01-29 14:44:49.000000000 +0000 +++ libebml-1.2.1/libebml.proj 2011-03-27 16:43:10.000000000 +0000 @@ -2,7 +2,7 @@ LIB ebml { - PROJECT_VERSION 1.2.0 + PROJECT_VERSION 1.2.1 INCLUDE . EXPINCLUDE . diff -Nru libebml-1.2.0+dfsg/make/linux/fedora-core.spec libebml-1.2.1/make/linux/fedora-core.spec --- libebml-1.2.0+dfsg/make/linux/fedora-core.spec 2011-01-30 14:46:27.000000000 +0000 +++ libebml-1.2.1/make/linux/fedora-core.spec 2011-06-26 18:13:26.000000000 +0000 @@ -1,7 +1,7 @@ # SPEC file for libebml on (at least) Fedora Core 1, 2, 3 Name: libebml -Version: 1.2.0 +Version: 1.2.1 Release: 1 License: LGPL Summary: Extensible Binary Meta Language diff -Nru libebml-1.2.0+dfsg/make/linux/suse.spec libebml-1.2.1/make/linux/suse.spec --- libebml-1.2.0+dfsg/make/linux/suse.spec 2011-01-30 14:46:27.000000000 +0000 +++ libebml-1.2.1/make/linux/suse.spec 2011-06-26 18:13:26.000000000 +0000 @@ -14,7 +14,7 @@ Name: libebml URL: http://sourceforge.net/projects/ebml -Version: 1.2.0 +Version: 1.2.1 Release: 1 Summary: libary to parse EBML files. License: LGPL diff -Nru libebml-1.2.0+dfsg/src/EbmlBinary.cpp libebml-1.2.1/src/EbmlBinary.cpp --- libebml-1.2.0+dfsg/src/EbmlBinary.cpp 2010-08-19 12:01:28.000000000 +0000 +++ libebml-1.2.1/src/EbmlBinary.cpp 2011-06-12 09:51:25.000000000 +0000 @@ -30,11 +30,12 @@ /*! \file - \version \$Id: EbmlBinary.cpp 520 2010-08-19 12:01:28Z robux4 $ + \version \$Id: EbmlBinary.cpp 757 2011-06-12 09:51:25Z robux4 $ \author Steve Lhomme \author Julien Coloos */ #include +#include #include "ebml/EbmlBinary.h" #include "ebml/StdIOCallback.h" @@ -91,9 +92,9 @@ return GetSize(); } - Data = (binary *)malloc(GetSize() * sizeof(binary)); + Data = (binary *)malloc(GetSize()); if (Data == NULL) - throw CRTError("Error allocating data"); + throw CRTError(std::string("Error allocating data")); SetValueIsSet(); return input.read(Data, GetSize()); } diff -Nru libebml-1.2.0+dfsg/src/EbmlElement.cpp libebml-1.2.1/src/EbmlElement.cpp --- libebml-1.2.0+dfsg/src/EbmlElement.cpp 2010-06-30 06:07:40.000000000 +0000 +++ libebml-1.2.1/src/EbmlElement.cpp 2011-03-20 17:33:49.000000000 +0000 @@ -28,7 +28,7 @@ /*! \file - \version \$Id: EbmlElement.cpp 364 2010-06-30 06:07:40Z robux4 $ + \version \$Id: EbmlElement.cpp 708 2011-03-20 17:33:49Z robux4 $ \author Steve Lhomme */ @@ -49,7 +49,7 @@ */ int CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeFinite) { - int CodedSize; + unsigned int CodedSize; if (bSizeFinite) { // prepare the head of the size (000...01xxxxxx) // optimal size @@ -587,7 +587,7 @@ filepos_t result = RenderHead(output, bForceRender, bWithDefault, bKeepPosition); uint64 WrittenSize = RenderData(output, bForceRender, bWithDefault); #if defined(_DEBUG) || defined(DEBUG) - if (SupposedSize != (0-1)) assert(WrittenSize == SupposedSize); + if (static_cast(SupposedSize) != (0-1)) assert(WrittenSize == SupposedSize); #endif // DEBUG result += WrittenSize; return result; diff -Nru libebml-1.2.0+dfsg/src/EbmlMaster.cpp libebml-1.2.1/src/EbmlMaster.cpp --- libebml-1.2.0+dfsg/src/EbmlMaster.cpp 2010-08-12 18:27:18.000000000 +0000 +++ libebml-1.2.1/src/EbmlMaster.cpp 2011-03-20 17:33:49.000000000 +0000 @@ -30,7 +30,7 @@ /*! \file - \version \$Id: EbmlMaster.cpp 493 2010-08-12 18:27:18Z robux4 $ + \version \$Id: EbmlMaster.cpp 708 2011-03-20 17:33:49Z robux4 $ \author Steve Lhomme */ @@ -146,7 +146,7 @@ (ElementList[Index])->UpdateSize(bWithDefault, bForceRender); uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault); #if defined(_DEBUG) || defined(DEBUG) - if (SizeToAdd == (0-1)) + if (static_cast(SizeToAdd) == (0-1)) return (0-1); #endif // DEBUG SetSize_(GetSize() + SizeToAdd); diff -Nru libebml-1.2.0+dfsg/src/MemIOCallback.cpp libebml-1.2.1/src/MemIOCallback.cpp --- libebml-1.2.0+dfsg/src/MemIOCallback.cpp 2010-02-18 08:13:06.000000000 +0000 +++ libebml-1.2.1/src/MemIOCallback.cpp 2011-04-26 17:14:24.000000000 +0000 @@ -72,8 +72,9 @@ { //We will only return the remaining data memcpy(Buffer, dataBuffer + dataBufferPos, dataBufferTotalSize - dataBufferPos); + uint64 oldDataPos = dataBufferPos; dataBufferPos = dataBufferTotalSize; - return dataBufferTotalSize - dataBufferPos; + return dataBufferTotalSize - oldDataPos; } //Well... We made it here, so do a quick and simple copy diff -Nru libebml-1.2.0+dfsg/src/StdIOCallback.cpp libebml-1.2.1/src/StdIOCallback.cpp --- libebml-1.2.0+dfsg/src/StdIOCallback.cpp 2010-02-18 08:13:06.000000000 +0000 +++ libebml-1.2.1/src/StdIOCallback.cpp 2011-04-14 07:40:25.000000000 +0000 @@ -49,13 +49,13 @@ CRTError::CRTError(int nError, const std::string & Description) :std::runtime_error(Description+": "+strerror(nError)) - ,Error(Error) + ,Error(nError) { } CRTError::CRTError(const std::string & Description,int nError) :std::runtime_error(Description+": "+strerror(nError)) - ,Error(Error) + ,Error(nError) { }