Bug#455184: diff for 0.7.7-3.1 NMU
Pierre Habouzit
madcoder at debian.org
Tue Mar 18 23:06:58 UTC 2008
Hi,
Attached is the diff for my libebml 0.7.7-3.1 NMU.
-------------- next part --------------
diff -u libebml-0.7.7/debian/copyright libebml-0.7.7/debian/copyright
--- libebml-0.7.7/debian/copyright
+++ libebml-0.7.7/debian/copyright
@@ -7,21 +7,79 @@
-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.
+Files: debian/*
+Copyright:
+ ? 2003 Moritz Bunkus <moritz at bunkus.org>
+
+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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
+
+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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
+
+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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
+
+
+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 -u libebml-0.7.7/debian/patches/series libebml-0.7.7/debian/patches/series
--- libebml-0.7.7/debian/patches/series
+++ libebml-0.7.7/debian/patches/series
@@ -2,0 +3 @@
+030_g++-4.3.diff
diff -u libebml-0.7.7/debian/changelog libebml-0.7.7/debian/changelog
--- libebml-0.7.7/debian/changelog
+++ libebml-0.7.7/debian/changelog
@@ -1,3 +1,11 @@
+libebml (0.7.7-3.1) 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).
+
+ -- Pierre Habouzit <madcoder at debian.org> Tue, 18 Mar 2008 23:58:01 +0100
+
libebml (0.7.7-3) unstable; urgency=low
* No upstream version in a long time. Distributing shared libraries now.
only in patch2:
unchanged:
--- libebml-0.7.7.orig/debian/patches/030_g++-4.3.diff
+++ libebml-0.7.7/debian/patches/030_g++-4.3.diff
@@ -0,0 +1,33 @@
+--- libebml-0.7.7.orig/ebml/EbmlBinary.h
++++ libebml-0.7.7/ebml/EbmlBinary.h
+@@ -38,6 +38,7 @@
+ #define LIBEBML_BINARY_H
+
+ #include <string>
++#include <cstring>
+
+ #include "EbmlTypes.h"
+ #include "EbmlElement.h"
+--- libebml-0.7.7.orig/ebml/EbmlEndian.h
++++ libebml-0.7.7/ebml/EbmlEndian.h
+@@ -39,6 +39,7 @@
+ #define LIBEBML_ENDIAN_H
+
+ #include <algorithm>
++#include <cstring>
+
+ #include "EbmlConfig.h" // contains _ENDIANESS_
+
+--- libebml-0.7.7.orig/ebml/c/libebml_t.h
++++ libebml-0.7.7/ebml/c/libebml_t.h
+@@ -123,10 +123,6 @@
+ MODE_SAFE
+ } open_mode;
+
+-#if !defined(min)
+-#define min(x,y) ((x)<(y) ? (x) : (y))
+-#endif
+-
+ #ifdef __cplusplus
+ }
+ #endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20080319/e2370924/attachment-0003.pgp
More information about the pkg-multimedia-maintainers
mailing list