[SCM] libebml/master: Merge commit 'upstream/1.2.1'
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jun 28 07:57:42 UTC 2011
New upstream release. (Closes: #631803)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1147fc7ee5f7dd9873953ba7af2115db5ea13117
X-Git-Newrev: b21e0b8b5563322fab31ea2cc52b227dc5da03d2
The following commit has been merged in the master branch:
commit b21e0b8b5563322fab31ea2cc52b227dc5da03d2
Merge: 571d72deb1c8a2919f7f8eab3b34a58fdb318454 b7265c99cd99dc56f604fd695344d018b33eb554
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jun 28 09:57:27 2011 +0200
Merge commit 'upstream/1.2.1'
Conflicts (solved):
debian/changelog
debian/control
debian/copyright
debian/rules
diff --combined debian/changelog
index 34bf39f,526cc88..612acaa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,237 -1,180 +1,236 @@@
-libebml (1.2.1-1) natty; urgency=low
+libebml (1.2.0-2) unstable; urgency=low
- * New version.
+ * Team upload.
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 15 Jun 2011 13:55:50 +0200
+ [ Rico Tzschichholz ]
+ * add myself to uploaders
-libebml (1.2.0-1) lucid; urgency=low
+ [ Fabian Greffrath ]
+ * Remove myself from Uploaders.
- * New version.
+ [ Reinhard Tartler ]
+ * upload to unstable
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 30 Jan 2011 15:30:00 +0200
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 05 Mar 2011 17:54:36 +0100
-libebml (1.0.0-1) lucid; urgency=low
+libebml (1.2.0-1) experimental; urgency=low
- * New version.
+ [ Rico Tzschichholz ]
+ * New upstream release
+ * debian/control,debian/libebml3.install:
+ + bump library soname to libebml3
+ * debian/control:
+ + bump standard version to 3.9.1
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 05 Jun 2010 10:39:00 +0200
+ [ Reinhard Tartler ]
+ * upload to experimental
-libebml (0.8.0-1) karmic; urgency=low
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 18 Feb 2011 20:54:15 +0100
- * New version.
+libebml (1.0.0-1) experimental; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 09 May 2010 16:56:41 +0200
+ [ 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
-libebml (0.7.8-1) unstable; urgency=low
+ [ Fabian Greffrath ]
+ * Add debian/watch.
+ * Add debian/gbp.conf.
+ * Imported Upstream version 1.0.0 (Closes: #582238).
- * New version.
+ [ Reinhard Tartler ]
+ * prepare new upload
+ * convert to Source Format 3.0 (quilt)
+ * update Vcs- headers
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 5 Mar 2008 12:04:07 +0100
+ [ 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.
-libebml (0.7.7-1) unstable; urgency=low
-
- * New version.
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Tue, 08 Jun 2010 23:13:59 +0200
- -- Moritz Bunkus <moritz at bunkus.org> Fri, 31 Mar 2006 14:28:30 +0200
+libebml (0.8.0-1) unstable; urgency=low
-libebml (0.7.6-1) unstable; urgency=low
+ * new upstream release. (Closes: 582238).
- * New version.
+ -- Eric Dantan Rzewnicki <eric at zhevny.com> Sat, 29 May 2010 09:54:09 -0400
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 18 Oct 2005 19:54:16 +0200
+libebml (0.7.7-3.1) unstable; urgency=low
-libebml (0.7.5-2) unstable; urgency=low
+ * Non-maintainer upload.
+ * Update debian/copyright (Closes: 465252).
+ * Add debian/patches/030_g++-4.3.diff to fix g++-4.3 FTBFS (Closes: 455184).
- * Rebuilt with g++ 4.0.2.
+ -- Pierre Habouzit <madcoder at debian.org> Tue, 18 Mar 2008 23:58:01 +0100
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 15 Oct 2005 14:20:24 +0200
+libebml (0.7.7-3) unstable; urgency=low
-libebml (0.7.5-1) unstable; urgency=low
+ * No upstream version in a long time. Distributing shared libraries now.
+ * debian/rules:
+ + No longer build _pic.a library.
+ * debian/control:
+ + Add libebml0 package.
+ * debian/compat:
+ + Set compat to 5.
- * New version.
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 15 Mar 2007 17:28:01 +0100
- -- Moritz Bunkus <moritz at bunkus.org> Fri, 20 May 2005 16:27:42 +0200
+libebml (0.7.7-2) unstable; urgency=low
-libebml (0.7.4-1) unstable; urgency=low
+ * debian/control:
+ + Set pkg-multimedia-maintainers as main maintainer.
+ + Added Vcs fields.
+ + Set policy to 3.7.2.
- * New version.
-
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 16 Apr 2005 13:05:06 +0200
-
-libebml (0.7.3-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 15 Mar 2007 02:35:26 +0100
- * New version.
-
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 10 Nov 2004 21:47:35 +0100
-
-libebml (0.7.2-1) unstable; urgency=low
-
- * New version.
-
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 26 Sep 2004 12:16:57 +0200
+libebml (0.7.7-1) unstable; urgency=low
-libebml (0.7.1-1) unstable; urgency=low
+ * New upstream release.
+ * This release fixes a file corruption issue (Closes: #360644).
- * New version.
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 3 Apr 2006 22:18:57 +0200
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 25 Jul 2004 12:15:48 +0200
+libebml (0.7.6-3) unstable; urgency=low
-libebml (0.7.0-1) unstable; urgency=low
+ * Switched patch system to quilt.
+ * debian/control:
+ + Build-depend on quilt.
- * New version.
+ * 010_propagate_cflags.diff: (new patch from old diff.gz) propagate custom
+ CXXFLAGS to the build process.
- -- Moritz Bunkus <moritz at bunkus.org> Fri, 23 Apr 2004 18:38:00 +0200
+ * 020_invalid_cast.diff: (new patch from old diff.gz) cast pointers to
+ uintptr_t instead of unsigned long.
-libebml (0.6.5-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 30 Mar 2006 17:14:29 +0200
- * New version.
+libebml (0.7.6-2) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 9 Mar 2004 21:32:18 +0100
+ * debian/compat: set level to 4.
-libebml (0.6.4-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 26 Nov 2005 20:01:04 +0100
- * New version.
+libebml (0.7.6-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 19 Jan 2004 11:28:42 +0100
+ * New upstream release.
-libebml (0.6.3-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 30 Oct 2005 15:49:31 +0100
- * New version.
+libebml (0.7.5-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Thu, 25 Dec 2003 13:27:27 +0100
+ * New upstream release.
+ * debian/control:
+ + Set policy to 3.6.2.1.
+ * src/EbmlFloat.cpp:
+ + Fixed amd64 FTBFS (Closes: #300548).
-libebml (0.6.2-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 15 Jul 2005 13:46:53 +0300
- * New version.
+libebml (0.7.3-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Fri, 31 Oct 2003 09:34:13 +0100
+ * New upstream release (Closes: #288715, #290687).
+ * ebml/EbmlCrc32.h: cast pointer to uintptr_t before doing arithmetic
+ operations on it (Closes: #284881).
-libebml (0.6.1-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 12 Mar 2005 16:24:35 +0100
- * New version.
+libebml (0.7.1-1) unstable; urgency=medium
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 28 Oct 2003 22:45:25 +0100
+ * New upstream release (Closes: #271897).
-libebml (0.6.0-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 17 Sep 2004 11:38:18 +0200
- * New version.
+libebml (0.7.0-2) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 17 Sep 2003 22:28:18 +0200
+ * debian/control:
+ + Set policy to 3.6.1.1.
-libebml (0.5.1-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 24 Jul 2004 13:52:21 +0200
- * New version.
+libebml (0.7.0-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 1 Sep 2003 13:27:54 +0200
+ * New upstream release.
-libebml (0.5.0-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 26 Apr 2004 22:22:03 +0200
- * New version.
+libebml (0.6.3-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 28 Jul 2003 10:48:35 +0200
+ * New upstream release.
-libebml (0.4.4-2) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 6 Jan 2004 21:07:21 +0100
- * New version.
+libebml (0.6.2-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 14 Jun 2003 17:41:43 +0200
+ * New upstream release.
-libebml (0.4.4-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 4 Nov 2003 11:14:30 +0100
- * New version.
+libebml (0.6.0-2) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 11 Jun 2003 20:27:01 +0200
+ * Fixed upstream's braindamaged use of DEB_BUILD_OPTIONS.
-libebml (0.4.3-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 15 Oct 2003 09:00:42 +0200
- * New version.
+libebml (0.6.0-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 21 May 2003 22:34:46 +0200
+ * New upstream release.
-libebml (0.4.2-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 12 Oct 2003 16:50:58 +0200
- * New version.
+libebml (0.5.0-4) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 6 May 2003 22:21:09 +0200
+ * Used "cvs2cl --utc --no-wrap -w --stdout -g -z9" to generate an upstream
+ changelog (Closes: #208599).
-libebml (0.4.0-2) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 5 Sep 2003 09:26:58 +0200
- * Compiled with gcc 3.2.3.
+libebml (0.5.0-3) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 04 May 2003 22:14:26 +0200
+ * make/linux/Makefile:
+ + Fixed $(CUSTOMFLAGS) so that the PIC lib gets built.
+ * debian/control:
+ + Set policy to 3.6.1.0.
-libebml (0.4.0-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 2 Sep 2003 21:12:08 +0200
- * First official alpha release.
+libebml (0.5.0-2) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 30 Apr 2003 10:27:26 +0200
+ * debian/control:
+ + Downgraded debhelper build-dependency to allow easier backporting.
+ + Enhanced the long description.
-libebml (0.2.0.20030424-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 14 Aug 2003 11:06:11 +0200
- * New version with bugfixes from Steve.
+libebml (0.5.0-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Thu, 24 Apr 2003 19:57:48 +0200
+ * 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.
-libebml (0.2.0.20030421-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 7 Aug 2003 14:54:50 +0200
- * Initial Release.
+libebml (0.4.4+cvs.20030622-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 21 Apr 2003 12:49:33 +0200
+ * First Debian release (Closes: #198706).
+ * debian/control:
+ + Set policy to 3.5.10.
+ + Rephrased upstream's long 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
-
diff --combined debian/copyright
index ea47936,621ecdf..6d5e40d
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,89 -1,27 +1,88 @@@
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://www.matroska.org/
+It was downloaded from http://dl.matroska.org/downloads/libebml/
Upstream Author: Steve Lhomme <steve.lhomme at free.fr>
-Copyright (C) 2002-2003 Steve Lhomme. All rights reserved.
+Files: debian/*
+Copyright:
+ © 2003 Moritz Bunkus <moritz at bunkus.org>
+ © 2010 Fabian Greffrath <fabian+debian at greffrath.com>
+License: GPL-2+
+ The Debian packaging licensed under the GPL version 2, or
+ (at your option) any later version, see below.
-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.
+Files: src/IOCallback.cpp src/StdIOCallback.cpp
+Copyright:
+ (C) 2002-2004 Ingo Ralf Blum. All rights reserved.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ 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
+ .
+ See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+ .
+ Contact license at matroska.org if any conditions of this licensing are
+ not clear to you.
-This proram is also licensed under the GPL. See
-/usr/share/common-licenses/GPL for details.
+Files: src/MemIOCallback.cpp
+Copyright:
+ (C) 2003 Jory Stone. All rights reserved.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ 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
+ .
+ See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+ .
+ Contact license at matroska.org if any conditions of this licensing are
+ not clear to you.
-Licensees holding an other license may use this file in accordance with
-the Agreement provided with the Software.
+Files: *
+Copyright:
+ (C) 2002-2005 Steve Lhomme. All rights reserved.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ 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
+ .
+ See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+ .
+ Contact license at matroska.org if any conditions of this licensing are
+ not clear to you.
-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.
+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.
-
--
libebml packaging
More information about the pkg-multimedia-commits
mailing list