--- Begin Message ---
Package: cegui-mk2
Version: 0.6.2-5
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for cegui-mk2 (versioned as 0.6.2-5.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Cheers
Luk
diff -u cegui-mk2-0.6.2/debian/control cegui-mk2-0.6.2/debian/control
--- cegui-mk2-0.6.2/debian/control
+++ cegui-mk2-0.6.2/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Muammar El Khatib <[email protected]>
-Build-Depends: debhelper (>= 6), cdbs, dbs, libtool, automake1.9, autoconf, pkg-config, libxerces-c2-dev, libboost-signals-dev, libboost-regex-dev, libfreetype6-dev, liblcms1-dev, libtiff4-dev, libgl1-mesa-dev, libglu1-mesa-dev, libdevil-dev, libpcre3-dev, dpatch, liblua5.1-dev, lua5.1, libois-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libfreeimage-dev
+Build-Depends: debhelper (>= 6), cdbs, libtool, automake1.9, autoconf, pkg-config, libxerces-c2-dev, libboost-signals-dev, libboost-regex-dev, libfreetype6-dev, liblcms1-dev, libtiff4-dev, libgl1-mesa-dev, libglu1-mesa-dev, libdevil-dev, libpcre3-dev, dpatch, liblua5.1-dev, lua5.1, libois-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libfreeimage-dev
Standards-Version: 3.8.4
Homepage: http://www.cegui.org.uk/
@@ -41,7 +41,7 @@
Section: libdevel
Architecture: any
Suggests: libcegui-mk2-doc
-Depends: ${misc:Depends}, libcegui-mk2-1 (= ${binary:Version}), libdevil-dev, libxerces-c2-dev, libpng12-dev | libpng-dev, libtiff4-dev | libtiff-dev, libjpeg62-dev | libjpeg-dev, libmng-dev, zlib1g-dev | libz-dev, libfreetype6-dev, liblualib50-dev, liblcms1-dev, libpcre3-dev, libfreetype6-dev, libfreeimage-dev
+Depends: ${misc:Depends}, libcegui-mk2-1 (= ${binary:Version}), libdevil-dev, libxerces-c2-dev, libpng12-dev | libpng-dev, libtiff4-dev | libtiff-dev, libjpeg62-dev | libjpeg-dev, libmng-dev, zlib1g-dev | libz-dev, libfreetype6-dev, liblua5.1-dev, liblcms1-dev, libpcre3-dev, libfreetype6-dev, libfreeimage-dev
Description: Crazy Eddie's GUI (development files)
CEGUI is a free library providing windowing and widgets for graphics
APIs and engines where such functionality is not natively available
diff -u cegui-mk2-0.6.2/debian/rules cegui-mk2-0.6.2/debian/rules
--- cegui-mk2-0.6.2/debian/rules
+++ cegui-mk2-0.6.2/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+LDFLAGS+=-llua5.1 -ldl
+
include /usr/share/cdbs/1/rules/debhelper.mk
DEB_TAR_SRCDIR := cegui_mk2
include /usr/share/cdbs/1/rules/tarball.mk
@@ -24,6 +26,11 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+common-install-arch::
+ for file in debian/tmp/usr/lib/*.la; do \
+ sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+ done
+
DEB_CONFIGURE_EXTRA_FLAGS := --enable-lua-module=yes --enable-toluacegui=yes --with-default-xml-parser=TinyXMLParser
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
DEB_INSTALL_CHANGELOGS_ALL := $(DEB_SRCDIR)/ChangeLog
diff -u cegui-mk2-0.6.2/debian/changelog cegui-mk2-0.6.2/debian/changelog
--- cegui-mk2-0.6.2/debian/changelog
+++ cegui-mk2-0.6.2/debian/changelog
@@ -1,3 +1,15 @@
+cegui-mk2 (0.6.2-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove references to other libraries from dependency_libs field
+ (Closes: #620579).
+ * Depend on liblua5.1-dev (Closes: #627556).
+ * Add <cstddef> include (Closes: #627558).
+ * Add -llua5.1 -ldl to LDFLAGS (Closes: #618093).
+ * Stop build depending on dbs (Closes: #576064).
+
+ -- Luk Claes <[email protected]> Sun, 26 Jun 2011 23:39:06 +0200
+
cegui-mk2 (0.6.2-5) unstable; urgency=low
* Fix the build on kFreeBSD
diff -u cegui-mk2-0.6.2/debian/patches/00list cegui-mk2-0.6.2/debian/patches/00list
--- cegui-mk2-0.6.2/debian/patches/00list
+++ cegui-mk2-0.6.2/debian/patches/00list
@@ -7,0 +8 @@
+11_ftbfs_ptrdiff
only in patch2:
unchanged:
--- cegui-mk2-0.6.2.orig/debian/patches/11_ftbfs_ptrdiff.dpatch
+++ cegui-mk2-0.6.2/debian/patches/11_ftbfs_ptrdiff.dpatch
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: fix missing include
+## Origin: Upstream, http://crayzedsgui.hg.sourceforge.net/hgweb/crayzedsgui/cegui_mk2/raw-diff/c813e7a3e873/cegui/include/CEGUIString.h
+## Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627558
+## Bug-Ubuntu: http://pad.lv/765908
+@DPATCH@
+
+diff -r 6e7aa3fa6c3e -r c813e7a3e873 cegui/include/CEGUIString.h
+--- cegui-mk2-0.6.2/build-tree/cegui_mk2/include/CEGUIString.h Mon Oct 04 18:35:10 2010 +0000
++++ cegui-mk2-0.6.2.new/build-tree/cegui_mk2/include/CEGUIString.h Thu Apr 21 11:01:26 2011 +0100
+@@ -31,9 +31,9 @@
+ #define _CEGUIString_h_
+
+ #include "CEGUIBase.h"
+-#include <string>
+ #include <string.h>
+ #include <stdexcept>
++#include <cstddef>
+
+ // Start of CEGUI namespace section
+ namespace CEGUI
+@@ -62,7 +62,7 @@
+ *************************************************************************/
+ typedef utf32 value_type; //!< Basic 'code point' type used for String (utf32)
+ typedef size_t size_type; //!< Unsigned type used for size values and indices
+- typedef ptrdiff_t difference_type; //!< Signed type used for differences
++ typedef std::ptrdiff_t difference_type; //!< Signed type used for differences
+ typedef utf32& reference; //!< Type used for utf32 code point references
+ typedef const utf32& const_reference; //!< Type used for constant utf32 code point references
+ typedef utf32* pointer; //!< Type used for utf32 code point pointers
+
+
+
+
--- End Message ---
