diff -u openvrml-0.18.9/debian/libopenvrml-doc.install openvrml-0.18.9/debian/libopenvrml-doc.install --- openvrml-0.18.9/debian/libopenvrml-doc.install +++ openvrml-0.18.9/debian/libopenvrml-doc.install @@ -1 +1,7 @@ -doc/manual/* usr/share/doc/libopenvrml-doc/html +doc/manual/*.png usr/share/doc/libopenvrml-doc/html +doc/manual/*.map usr/share/doc/libopenvrml-doc/html +doc/manual/*.md5 usr/share/doc/libopenvrml-doc/html +doc/manual/*.css usr/share/doc/libopenvrml-doc/html +doc/manual/*.html usr/share/doc/libopenvrml-doc/html +doc/manual/dynsections.js usr/share/doc/libopenvrml-doc/html +models/* usr/share/doc/libopenvrml-doc/examples diff -u openvrml-0.18.9/debian/libopenvrml9.dirs openvrml-0.18.9/debian/libopenvrml9.dirs --- openvrml-0.18.9/debian/libopenvrml9.dirs +++ openvrml-0.18.9/debian/libopenvrml9.dirs @@ -5 +4,0 @@ -usr/share/doc/libopenvrml9/examples diff -u openvrml-0.18.9/debian/libopenvrml9.install openvrml-0.18.9/debian/libopenvrml9.install --- openvrml-0.18.9/debian/libopenvrml9.install +++ openvrml-0.18.9/debian/libopenvrml9.install @@ -6,3 +6,2 @@ usr/lib/*/openvrml/script/*.so -models/* usr/share/doc/libopenvrml9/examples debian/lintian/libopenvrml9 usr/share/lintian/overrides/ diff -u openvrml-0.18.9/debian/control openvrml-0.18.9/debian/control --- openvrml-0.18.9/debian/control +++ openvrml-0.18.9/debian/control @@ -3,8 +3,9 @@ Priority: optional Maintainer: Sam Hocevar (Debian packages) Uploaders: Nobuhiro Iwamatsu -Build-Depends: debhelper (>= 9.0), quilt, libgl1-mesa-dev | libgl-dev, - zlib1g-dev, libjpeg-dev, libpng12-dev (>= 1.2.5.0-4), libx11-dev, +Build-Depends: debhelper (>= 9.0), dpkg-dev (>= 1.16.1~), quilt, + libgl1-mesa-dev | libgl-dev, + zlib1g-dev, libjpeg-dev, libpng12-dev, libx11-dev, libxext-dev, libfreetype6-dev, libfontconfig1-dev, libsdl1.2-dev, default-jdk, libmozjs-dev(>= 8.0), libboost-dev, libboost-test-dev, libboost-thread-dev, libboost-filesystem-dev, libgtk2.0-dev, @@ -17,7 +18,7 @@ Homepage: http://openvrml.org/ Package: libopenvrml9 -Architecture: amd64 armel i386 ia64 mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 +Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libopenvrml4c2, libopenvrml5 @@ -35,14 +36,15 @@ Package: libopenvrml-dev Section: libdevel -Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 +Architecture: linux-any Depends: ${misc:Depends}, libopenvrml9 (= ${binary:Version}), libgl1-mesa-dev | libgl-dev, zlib1g-dev, libjpeg-dev, - libpng12-dev (>= 1.2.5.0-4), libx11-dev, libxext-dev, libxmu-dev, + libpng12-dev, libx11-dev, libxext-dev, libxmu-dev, libfreetype6-dev, libfontconfig1-dev, libboost-dev, xulrunner-dev, default-jdk Conflicts: libopenvrml0-dev, libopenvrml3-dev, libopenvrml4-dev, libopenvrml5-dev Recommends: libopenvrml-doc +Multi-Arch: same Description: developer libraries for openvrml VRML (Virtual Reality Modeling Language) is a scene description language that describes the geometry and behavior of a 3D scene or "world". It is @@ -70,7 +72,7 @@ Package: openvrml-lookat Section: x11 -Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: lookat (<< 1.3.3-2) Description: VRML viewer diff -u openvrml-0.18.9/debian/changelog openvrml-0.18.9/debian/changelog --- openvrml-0.18.9/debian/changelog +++ openvrml-0.18.9/debian/changelog @@ -1,3 +1,42 @@ +openvrml (0.18.9-5) unstable; urgency=low + + * Move example directory in libopenvrml9 to libopenvrml-doc. + * Add "Multi-Arch: same" to libopenvrml9 and libopenvrml-dev. + * Change Architecture to linux-any. + + -- Nobuhiro Iwamatsu Wed, 28 Nov 2012 00:35:25 +0900 + +openvrml (0.18.9-4) unstable; urgency=low + + * Add mips to Architecture field for libopenvrml9. + + -- Nobuhiro Iwamatsu Wed, 26 Sep 2012 13:22:32 +0900 + +openvrml (0.18.9-3) unstable; urgency=low + + * Update debian/rules. + Change dh_clean to dh_prep in install target. (Closes: #683482) + Thanks to Niels Thykier. + * Revert changing from libpng12-dev to libpng-dev in Build-Depends and + Depends. + + -- Nobuhiro Iwamatsu Sat, 11 Aug 2012 06:13:41 +0900 + +openvrml (0.18.9-2) unstable; urgency=low + + * Update debian/control. + - Remove multiarch support for libopenvrml9 as it contains Makefile with + arch-specific contents (Closes: #674489). + - Change from libpng12-dev to libpng-dev in Build-Depends and Depends. + (Closes: #662456) + * Update debian/rules. + - Remove -k option from dh_clean. + - Enable hardening. + * Fix FTBFS with -Werror=format-security option. + Add patches/050_fix_ftbfs_with_format_security.diff. + + -- Nobuhiro Iwamatsu Fri, 27 Jul 2012 12:40:52 +0900 + openvrml (0.18.9-1) unstable; urgency=low * New upstream release. diff -u openvrml-0.18.9/debian/rules openvrml-0.18.9/debian/rules --- openvrml-0.18.9/debian/rules +++ openvrml-0.18.9/debian/rules @@ -10,8 +10,13 @@ export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export JAVA_HOME = /usr/lib/jvm/default-java/ -cflags = -g -Os -I$(JAVA_HOME)/include -cxxflags = -g -Os -I$(JAVA_HOME)/include +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +cflags = -g -Os -I$(JAVA_HOME)/include $(CFLAGS) +cxxflags = -g -Os -I$(JAVA_HOME)/include $(CXXFLAGS) +ldflags = $(LDFLAGS) confflags = --prefix=/usr \ --mandir=\$${prefix}/share/man \ @@ -75,7 +80,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr diff -u openvrml-0.18.9/debian/patches/series openvrml-0.18.9/debian/patches/series --- openvrml-0.18.9/debian/patches/series +++ openvrml-0.18.9/debian/patches/series @@ -4,0 +5 @@ +050_fix_ftbfs_with_format_security.diff only in patch2: unchanged: --- openvrml-0.18.9.orig/debian/patches/050_fix_ftbfs_with_format_security.diff +++ openvrml-0.18.9/debian/patches/050_fix_ftbfs_with_format_security.diff @@ -0,0 +1,157 @@ +Description: Fix FTBFS with -Werror=format-security +Forwarded: https://sourceforge.net/apps/trac/openvrml/ticket/130 +Author: Nobuhiro Iwamatsu +Last-Update: 2012-08-01 +Applied-Upstream: not yet + +diff --git a/src/mozilla-plugin/openvrml.cpp b/src/mozilla-plugin/openvrml.cpp +index 09d8240..023de4a 100644 +--- a/src/mozilla-plugin/openvrml.cpp ++++ b/src/mozilla-plugin/openvrml.cpp +@@ -516,7 +516,7 @@ NPError NPP_SetWindow(const NPP instance, NPWindow * const window) + } catch (std::bad_alloc &) { + return NPERR_OUT_OF_MEMORY_ERROR; + } catch (std::runtime_error & ex) { +- g_critical(ex.what()); ++ g_critical("%s", ex.what()); + return NPERR_GENERIC_ERROR; + } + return NPERR_NO_ERROR; +diff --git a/src/openvrml-player/curlbrowserhost.cpp b/src/openvrml-player/curlbrowserhost.cpp +index 4483686..16cc9ea 100644 +--- a/src/openvrml-player/curlbrowserhost.cpp ++++ b/src/openvrml-player/curlbrowserhost.cpp +@@ -455,7 +455,7 @@ namespace { + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_easy_strerror(setopt_result)); ++ "%s", curl_easy_strerror(setopt_result)); + } + return setopt_result; + } +@@ -491,7 +491,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_easy_strerror(setopt_result)); ++ "%s", curl_easy_strerror(setopt_result)); + return 1; + } + +@@ -501,7 +501,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_easy_strerror(setopt_result)); ++ "%s", curl_easy_strerror(setopt_result)); + return 1; + } + +@@ -511,7 +511,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_easy_strerror(setopt_result)); ++ "%s", curl_easy_strerror(setopt_result)); + return 1; + } + +@@ -523,7 +523,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_easy_strerror(setopt_result)); ++ "%s", curl_easy_strerror(setopt_result)); + return 1; + } + +@@ -533,7 +533,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_easy_strerror(setopt_result)); ++ "%s", curl_easy_strerror(setopt_result)); + return 1; + } + +@@ -543,7 +543,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL, +- curl_multi_strerror(add_handle_result)); ++ "%s", curl_multi_strerror(add_handle_result)); + return 1; + } + +@@ -569,7 +569,7 @@ openvrml_player_curl_browser_host_get_url( + g_set_error(error, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR, + OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_OUT_OF_MEMORY, +- ex.what()); ++ "%s", ex.what()); + return 1; + } + return 0; +@@ -897,7 +897,7 @@ size_t openvrml_player_curl_browser_host_curl_write(void * ptr, + cancellable, + &error); + if (error) { +- g_warning(error->message); ++ g_warning("%s", error->message); + g_error_free(error); + error = 0; + } +diff --git a/src/openvrml-xembed/browser.cpp b/src/openvrml-xembed/browser.cpp +index c4f4a4c..0cf2445 100644 +--- a/src/openvrml-xembed/browser.cpp ++++ b/src/openvrml-xembed/browser.cpp +@@ -365,7 +365,7 @@ openvrml_xembed_browser_new_stream( + g_set_error(error, + OPENVRML_XEMBED_ERROR, + OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM, +- ex.what()); ++ "%s", ex.what()); + return false; + } + return true; +@@ -388,7 +388,7 @@ openvrml_xembed_browser_destroy_stream( + g_set_error(error, + OPENVRML_XEMBED_ERROR, + OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM, +- ex.what()); ++ "%s", ex.what()); + return false; + } + return true; +@@ -414,7 +414,7 @@ openvrml_xembed_browser_write(OpenvrmlXembedStreamClient * const stream_client, + g_set_error(error, + OPENVRML_XEMBED_ERROR, + OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM, +- ex.what()); ++ "%s", ex.what()); + } + return true; + } +@@ -442,7 +442,7 @@ openvrml_xembed_browser_load_url(OpenvrmlXembedBrowser * const vrml_browser, + } catch (const std::exception & ex) { + *error = g_error_new(OPENVRML_XEMBED_ERROR, + OPENVRML_XEMBED_ERROR_FAILED, +- ex.what()); ++ "%s", ex.what()); + return false; + } + return true; +diff --git a/src/openvrml-xembed/main.cpp b/src/openvrml-xembed/main.cpp +index e438b79..15b22e9 100644 +--- a/src/openvrml-xembed/main.cpp ++++ b/src/openvrml-xembed/main.cpp +@@ -186,7 +186,7 @@ int main(int argc, char * argv[]) + g_option_context_add_group(context, gtk_get_option_group(true)); + gboolean succeeded = g_option_context_parse(context, &argc, &argv, &error); + if (!succeeded) { +- if (error) { g_critical(error->message); } ++ if (error) { g_critical("%s", error->message); } + return EXIT_FAILURE; + } +