r9 - in unstable: . libebml libebml/debian libebml/debian/patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 14 14:15:34 CET 2007 

Author: sho
Date: 2006-03-30 15:22:57 +0000 (Thu, 30 Mar 2006)
New Revision: 9

Added:
   unstable/libebml/
   unstable/libebml/debian/
   unstable/libebml/debian/changelog
   unstable/libebml/debian/compat
   unstable/libebml/debian/control
   unstable/libebml/debian/copyright
   unstable/libebml/debian/libebml-dev.dirs
   unstable/libebml/debian/patches/
   unstable/libebml/debian/patches/010_propagate_cflags.diff
   unstable/libebml/debian/patches/020_invalid_cast.diff
   unstable/libebml/debian/patches/series
   unstable/libebml/debian/rules
Log:
libebml (0.7.6-3) unstable; urgency=low

  * Switched patch system to quilt.
  * debian/control:
    + Build-depend on quilt.

  * 010_propagate_cflags.diff: (new patch from old diff.gz) propagate custom
    CXXFLAGS to the build process.

  * 020_invalid_cast.diff: (new patch from old diff.gz) cast pointers to
    uintptr_t instead of unsigned long.



Property changes on: unstable/libebml/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: unstable/libebml/debian/changelog
===================================================================
--- unstable/libebml/debian/changelog	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/changelog	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,131 @@
+libebml (0.7.6-3) unstable; urgency=low
+
+  * Switched patch system to quilt.
+  * debian/control:
+    + Build-depend on quilt.
+
+  * 010_propagate_cflags.diff: (new patch from old diff.gz) propagate custom
+    CXXFLAGS to the build process.
+
+  * 020_invalid_cast.diff: (new patch from old diff.gz) cast pointers to
+    uintptr_t instead of unsigned long.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 30 Mar 2006 17:14:29 +0200
+
+libebml (0.7.6-2) unstable; urgency=low
+
+  * debian/compat: set level to 4.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 26 Nov 2005 20:01:04 +0100
+
+libebml (0.7.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 30 Oct 2005 15:49:31 +0100
+
+libebml (0.7.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Set policy to 3.6.2.1.
+  * src/EbmlFloat.cpp:
+    + Fixed amd64 FTBFS (Closes: #300548).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 15 Jul 2005 13:46:53 +0300
+
+libebml (0.7.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #288715, #290687).
+  * ebml/EbmlCrc32.h: cast pointer to uintptr_t before doing arithmetic
+    operations on it (Closes: #284881).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 12 Mar 2005 16:24:35 +0100
+
+libebml (0.7.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #271897).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 17 Sep 2004 11:38:18 +0200
+
+libebml (0.7.0-2) unstable; urgency=low
+
+  * debian/control:
+    + Set policy to 3.6.1.1.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 24 Jul 2004 13:52:21 +0200
+
+libebml (0.7.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 26 Apr 2004 22:22:03 +0200
+
+libebml (0.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue,  6 Jan 2004 21:07:21 +0100
+
+libebml (0.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue,  4 Nov 2003 11:14:30 +0100
+
+libebml (0.6.0-2) unstable; urgency=low
+
+  * Fixed upstream's braindamaged use of DEB_BUILD_OPTIONS.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 15 Oct 2003 09:00:42 +0200
+
+libebml (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 12 Oct 2003 16:50:58 +0200
+
+libebml (0.5.0-4) unstable; urgency=low
+
+  * Used "cvs2cl --utc --no-wrap -w --stdout -g -z9" to generate an upstream
+    changelog (Closes: #208599).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  5 Sep 2003 09:26:58 +0200
+
+libebml (0.5.0-3) unstable; urgency=low
+
+  * make/linux/Makefile:
+    + Fixed $(CUSTOMFLAGS) so that the PIC lib gets built.
+  * debian/control:
+    + Set policy to 3.6.1.0.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue,  2 Sep 2003 21:12:08 +0200
+
+libebml (0.5.0-2) unstable; urgency=low
+
+  * debian/control:
+    + Downgraded debhelper build-dependency to allow easier backporting.
+    + Enhanced the long description.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 14 Aug 2003 11:06:11 +0200
+
+libebml (0.5.0-1) unstable; urgency=low
+
+  * 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.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu,  7 Aug 2003 14:54:50 +0200
+
+libebml (0.4.4+cvs.20030622-1) unstable; urgency=low
+
+  * 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
+

Added: unstable/libebml/debian/compat
===================================================================
--- unstable/libebml/debian/compat	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/compat	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1 @@
+4

Added: unstable/libebml/debian/control
===================================================================
--- unstable/libebml/debian/control	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/control	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,19 @@
+Source: libebml
+Section: devel
+Priority: optional
+Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Build-Depends: debhelper (>= 4.0), quilt
+Standards-Version: 3.6.2
+
+Package: libebml-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: access library for the EBML format
+ The libebml library allows 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.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libebml.

Added: unstable/libebml/debian/copyright
===================================================================
--- unstable/libebml/debian/copyright	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/copyright	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,27 @@
+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://dl.matroska.org/downloads/libebml/
+
+Upstream Author: Steve Lhomme <steve.lhomme at free.fr>
+
+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.
+

Added: unstable/libebml/debian/libebml-dev.dirs
===================================================================
--- unstable/libebml/debian/libebml-dev.dirs	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/libebml-dev.dirs	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include

Added: unstable/libebml/debian/patches/010_propagate_cflags.diff
===================================================================
--- unstable/libebml/debian/patches/010_propagate_cflags.diff	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/patches/010_propagate_cflags.diff	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,10 @@
+--- libebml-0.7.6.orig/make/linux/Makefile
++++ libebml-0.7.6/make/linux/Makefile
+@@ -64,6 +64,7 @@
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+ 
++CXXFLAGS+=$(CUSTOMFLAGS)
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)

Added: unstable/libebml/debian/patches/020_invalid_cast.diff
===================================================================
--- unstable/libebml/debian/patches/020_invalid_cast.diff	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/patches/020_invalid_cast.diff	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,21 @@
+--- libebml-0.7.6.orig/ebml/EbmlTypes.h
++++ libebml-0.7.6/ebml/EbmlTypes.h
+@@ -35,6 +35,7 @@
+ 
+ #include <clocale>
+ #include <string>
++#include <stdint.h>
+ 
+ #include "ebml/c/libebml_t.h"
+ #include "ebml/EbmlConfig.h"
+--- libebml-0.7.6.orig/ebml/EbmlCrc32.h
++++ libebml-0.7.6/ebml/EbmlCrc32.h
+@@ -143,7 +143,7 @@
+ 
+ inline bool IsAlignedOn(const void *p, unsigned int alignment)
+ {
+-	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)p, alignment) == 0 : (unsigned long)p % alignment == 0;
++	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
+ }
+ 
+ template <class T>

Added: unstable/libebml/debian/patches/series
===================================================================
--- unstable/libebml/debian/patches/series	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/patches/series	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,2 @@
+010_propagate_cflags.diff -p1
+020_invalid_cast.diff -p1

Added: unstable/libebml/debian/rules
===================================================================
--- unstable/libebml/debian/rules	2006-03-30 15:11:14 UTC (rev 8)
+++ unstable/libebml/debian/rules	2006-03-30 15:22:57 UTC (rev 9)
@@ -0,0 +1,96 @@
+#!/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
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS = -O0
+else
+CFLAGS = -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+
+	# Build the PIC library
+	$(MAKE) -C make/linux staticlib CUSTOMFLAGS="-fpic -fPIC $(CFLAGS)"
+	mv make/linux/libebml.a make/linux/libebml_pic.a
+	-$(MAKE) -C make/linux clean
+
+	# Build the normal static library
+	$(MAKE) -C make/linux staticlib CUSTOMFLAGS="$(CFLAGS)"
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	rm -f debian/dirs debian/docs debian/*.files
+	rm -f make/linux/libebml_pic.a
+	# Clean up the build tree
+	-$(MAKE) -C make/linux clean
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Install the package into debian/libebml-dev
+	$(MAKE) $(DEB_BUILD_OPTIONS) \
+		-C make/linux prefix=$(CURDIR)/debian/libebml-dev/usr \
+		install_staticlib install_headers
+	cp make/linux/libebml_pic.a debian/libebml-dev/usr/lib/
+
+
+# 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_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


Property changes on: unstable/libebml/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-multimedia-commits mailing list