[SCM] libmatroska/master: Merge commit 'upstream/1.2.0'
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jun 28 08:27:35 UTC 2011
New upstream release. (Closes: #631804)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75257c7f6a3c745db0aab26621d2b8c08a3570db
X-Git-Newrev: 87bf310bf93915251711aa0375b9ad7526c4d1e7
The following commit has been merged in the master branch:
commit 87bf310bf93915251711aa0375b9ad7526c4d1e7
Merge: 75257c7f6a3c745db0aab26621d2b8c08a3570db f71a53c5d0b4e1c0b992acb45c0ef8ff5a0c1f2e
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jun 28 10:27:47 2011 +0200
Merge commit 'upstream/1.2.0'
Conflicts (solved):
debian/changelog
debian/control
debian/copyright
debian/rules
diff --combined debian/changelog
index 4dc5205,6343c2e..4bf7d86
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,212 -1,198 +1,211 @@@
-libmatroska (1.2.0-1) natty; urgency=low
+libmatroska (1.1.0-2) unstable; urgency=low
- * New version.
+ * Team upload.
+ * upload to unstable.
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 15 Jun 2011 13:58:59 +0200
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 05 Mar 2011 18:03:18 +0100
-libmatroska (1.1.0-1) lucid; urgency=low
+libmatroska (1.1.0-1) experimental; urgency=low
- * New version.
+ * New upstream version
+ * debian/control,debian/libmatroska3.install:
+ + bump library soname to libmatroska3
+ * debian/control:
+ + bump dependency on libebml >= 1.2.0
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 30 Jan 2011 15:30:00 +0200
+ -- Rico Tzschichholz <ricotz at ubuntu.com> Thu, 17 Feb 2011 22:36:44 +0100
-libmatroska (1.0.0-1) lucid; urgency=low
+libmatroska (1.0.0-1) experimental; urgency=low
- * New version.
+ * Imported Upstream version 1.0.0 (Closes: #591287).
+ * Add myself to uploaders.
+ * Add debian/watch file.
+ * Bump SONAME to libmatroska2.
+ * Remove unnecessary files from debian/ directory.
+ * Bump libebml-dev requirements to (>= 1.0.0).
+ * Convert Debian packaging to dh7.
+ * Wrap lines in debian/control and add ${misc:Depends}.
+ * Update Vcs-* fields.
+ * Add Homepage field.
+ * Clarify license of the Debian packaging in debian/copyright.
+ * Fix duplicate-short-description.
+ * Fix old-fsf-address-in-copyright-file.
+ * Fix spelling-error-in-copyright.
+ * Omit building test for the time being. They fail if compiled without
+ -finput-charset=ISO8859-15 and have not been built before anyway.
+ * Drop all patches, not needed anymore.
+ * Convert to Source Format 3.0 (quilt).
+ * Bump Standards-Version to 3.9.1.
+ * Add debian/gbp.conf file.
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 05 Jun 2010 10:39:00 +0200
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 02 Aug 2010 11:43:56 +0200
-libmatroska (0.9.0-1) karmic; urgency=low
+libmatroska (0.8.1-1.1) unstable; urgency=low
- * New version.
+ * Non-maintainer upload.
+ * debian/copyright: update with proper up to date informations
+ (Closes: 465251).
+ * debian/control: bump Standards-Version to 3.7.3.
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 09 May 2010 16:59:20 +0200
+ -- Pierre Habouzit <madcoder at debian.org> Sun, 16 Mar 2008 14:07:52 +0100
libmatroska (0.8.1-1) unstable; urgency=low
- * New version.
+ * New upstream release.
+ * We now distribute shared libraries.
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 16 Jan 2007 17:00:30 +0100
+ * 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.
-libmatroska (0.8.0-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 15 Mar 2007 19:34:20 +0100
- * New version.
+libmatroska (0.8.0-3) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 18 Oct 2005 20:00:18 +0200
+ * debian/control:
+ + Set pkg-multimedia-maintainers as main maintainer.
+ + Added Vcs fields.
+ + Set policy to 3.7.2.
-libmatroska (0.7.7-2) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 15 Mar 2007 16:57:59 +0100
- * Rebuilt with g++ 4.0.2.
+libmatroska (0.8.0-2) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 15 Oct 2005 14:25:46 +0200
+ * Switched patch system to quilt.
+ * debian/control:
+ + Build-depend on quilt.
+ + Build-depend on debhelper (>= 4.0).
+ + Added Section: devel for the source.
+ * debian/compat:
+ + Set level to 4.
-libmatroska (0.7.7-1) unstable; urgency=low
+ * 010_propagate_cflags.diff: (new patch from old diff.gz) propagate custom
+ CXXFLAGS to the build process.
- * New version.
+ * 020_missing_timestamp.diff: (new patch from old diff.gz) fix for
+ compilers that do not have __TIMESTAMP__.
- -- Moritz Bunkus <moritz at bunkus.org> Fri, 20 May 2005 16:28:21 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 30 Mar 2006 17:14:29 +0200
-libmatroska (0.7.6-1) unstable; urgency=low
+libmatroska (0.8.0-1) unstable; urgency=low
- * New version.
+ * New upstream version.
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 16 Apr 2005 13:24:30 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 30 Oct 2005 15:57:42 +0100
-libmatroska (0.7.5-1) unstable; urgency=low
+libmatroska (0.7.7-1) unstable; urgency=low
- * New version.
+ * New upstream version.
+ * debian/control:
+ + Set policy to 3.6.2.1.
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 6 Feb 2005 21:02:42 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 15 Jul 2005 13:17:57 +0200
-libmatroska (0.7.4-1) unstable; urgency=low
+libmatroska (0.7.5-1) unstable; urgency=low
- * New version.
+ * New upstream release.
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 26 Sep 2004 12:35:05 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 12 Mar 2005 18:28:04 +0100
-libmatroska (0.7.3-1) unstable; urgency=low
+libmatroska (0.7.4-1) unstable; urgency=low
- * New version.
+ * New upstream release (Closes: #288717, #290688).
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 16 Aug 2004 22:52:57 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 12 Mar 2005 17:33:06 +0100
-libmatroska (0.7.2-1) unstable; urgency=low
+libmatroska (0.7.3-1) unstable; urgency=low
- * New version.
+ * New upstream release (Closes: #271898).
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 4 Aug 2004 19:49:25 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 21 Sep 2004 13:42:41 +0200
-libmatroska (0.7.1-1) unstable; urgency=low
+libmatroska (0.7.0-2) unstable; urgency=low
- * New version.
+ * debian/control:
+ + Set policy to 3.6.1.1.
+ + Build-depend on libebml (>= 0.7.0-2).
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 25 Jul 2004 12:41:11 +0200
+ -- 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 version.
+ * New upstream release.
- -- Moritz Bunkus <moritz at bunkus.org> Fri, 23 Apr 2004 18:45:32 +0200
-
-libmatroska (0.6.3-1) unstable; urgency=low
-
- * New version.
-
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 5 Jan 2004 19:55:59 +0100
+ -- 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 version.
+ * New upstream release.
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 30 Dec 2003 10:59:47 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 6 Jan 2004 21:21:51 +0100
-libmatroska (0.6.1-1) unstable; urgency=low
+libmatroska (0.6.1-2) unstable; urgency=low
- * New version.
+ * Added a __TIMESTAMP__ define to KaxConfig.h to avoid compilation issues.
- -- Moritz Bunkus <moritz at bunkus.org> Thu, 30 Oct 2003 13:49:33 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 3 Dec 2003 11:44:36 +0100
-libmatroska (0.6.0-1) unstable; urgency=low
+libmatroska (0.6.1-1) unstable; urgency=low
- * New version.
+ * New upstream release.
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 28 Oct 2003 23:09:34 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 4 Nov 2003 11:27:00 +0100
-libmatroska (0.5.3-1) unstable; urgency=low
+libmatroska (0.5.2-2) unstable; urgency=low
- * New version.
+ * Fixed upstream's braindamaged use of DEB_BUILD_OPTIONS (Closes: #215774).
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 22 Oct 2003 19:22:10 +0200
+ -- 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 version.
+ * New upstream release (Closes: #214767).
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 17 Sep 2003 22:22:10 +0200
-
-libmatroska (0.5.1-1) unstable; urgency=low
-
- * New version.
-
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 1 Sep 2003 13:42:56 +0200
-
-libmatroska (0.5.0-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 13 Oct 2003 10:40:30 +0200
- * New version.
+libmatroska (0.5.0-4) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 28 Jul 2003 10:49:27 +0200
+ * Used "cvs2cl --utc --no-wrap -w --stdout -g -z9" to generate an upstream
+ changelog (Closes: #208597).
-libmatroska (0.4.4-2) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 5 Sep 2003 09:26:58 +0200
- * New version.
+libmatroska (0.5.0-3) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 14 Jun 2003 17:40:11 +0200
+ * make/linux/Makefile:
+ + Fixed $(CUSTOMFLAGS) so that the PIC lib gets built.
+ * debian/control:
+ + Set policy to 3.6.1.0.
-libmatroska (0.4.4-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 2 Sep 2003 21:12:08 +0200
- * New version.
+libmatroska (0.5.0-2) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 11 Jun 2003 20:32:09 +0200
+ * debian/control:
+ + Downgraded debhelper build-dependency to allow easier backporting.
+ + Enhanced the long description.
-libmatroska (0.4.3-1) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 14 Aug 2003 11:06:11 +0200
- * New version with API changes.
-
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 21 May 2003 22:35:52 +0200
-
-libmatroska (0.4.2-1) unstable; urgency=low
-
- * New version with API changes.
-
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 6 May 2003 22:33:44 +0200
-
-libmatroska (0.4.1-2) unstable; urgency=low
-
- * Compiled with gcc 3.2.3
-
- -- Moritz Bunkus <moritz at bunkus.org> Sun, 04 May 2003 22:11:33 +0200
-
-libmatroska (0.4.1-1) unstable; urgency=low
-
- * Some bugfixes, memleak fixed.
-
- -- Moritz Bunkus <moritz at bunkus.org> Sat, 03 May 2003 23:07:33 +0200
-
-libmatroska (0.4.0-1) unstable; urgency=low
-
- * First alpha release :)
-
- -- Moritz Bunkus <moritz at bunkus.org> Wed, 30 Apr 2003 10:44:33 +0200
-
-libmatroska (0.2.0.20030425) unstable; urgency=low
-
- * New version with bugfixes by Steve.
-
- -- Moritz Bunkus <moritz at bunkus.org> 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.)
+libmatroska (0.5.0-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Mon, 21 Apr 2003 16:33:36 +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.
-libmatroska (0.0.20030225) unstable; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 7 Aug 2003 14:54:50 +0200
- * Initial Release.
+libmatroska (0.4.4+cvs.20030622-1) unstable; urgency=low
- -- Moritz Bunkus <moritz at bunkus.org> Tue, 25 Feb 2003 18:28:52 +0100
+ * 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
-
diff --combined debian/copyright
index 7aa13c1,6c03f8b..23754af
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,61 -1,26 +1,59 @@@
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/
-
-Upstream Author: Steve Lhomme <steve.lhomme at free.fr>
-
-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 at matroska.org if any conditions of this licensing are
-not clear to you.
+It was downloaded from http://dl.matroska.org/downloads/libmatroska/
+
+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.
+
+Files: test/ebml/*.cpp test/tags/test9.cpp test/utf8/test5.cpp
+Copyright:
+ (C) 2002-2004 Steve Lhomme. All rights reserved.
+License: QPL | GPL-2
+ 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 file may be distributed and/or modified under the terms of the
+ GNU General Public License version 2 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file.
+ .
+ Licensees holding another 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.
+ See http://www.matroska.org/license/gpl/ for GPL licensing information.
+ .
+ Contact license at matroska.org if any conditions of this licensing are
+ not clear to you.
+
+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
+
-
+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.
-
--
libmatroska packaging
More information about the pkg-multimedia-commits
mailing list