[Python-modules-commits] r13275 - in packages/shiboken/trunk/debian (6 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Sun Jun 6 16:15:48 UTC 2010
Date: Sunday, June 6, 2010 @ 16:15:33
Author: odyx-guest
Revision: 13275
* New 0.3.2 upstream release
* Patches:
- u_ftbfs_missing_file_44071543.patch: Remove, included upstream.
- debian_buildoptions.patch: Remove, somehow included upstream.
?\195?\151 Refresh others.
Modified:
packages/shiboken/trunk/debian/changelog
packages/shiboken/trunk/debian/patches/fix_tests.patch
packages/shiboken/trunk/debian/patches/series
packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch
Deleted:
packages/shiboken/trunk/debian/patches/debian_buildoptions.patch
packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch
Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog 2010-06-06 09:32:26 UTC (rev 13274)
+++ packages/shiboken/trunk/debian/changelog 2010-06-06 16:15:33 UTC (rev 13275)
@@ -1,3 +1,14 @@
+shiboken (0.3.2-1) UNRELEASED; urgency=low
+
+ * New 0.3.2 upstream release
+
+ * Patches:
+ - u_ftbfs_missing_file_44071543.patch: Remove, included upstream.
+ - debian_buildoptions.patch: Remove, somehow included upstream.
+ × Refresh others.
+
+ -- Didier Raboud <didier at raboud.com> Sun, 06 Jun 2010 18:14:59 +0200
+
shiboken (0.3.1-3) unstable; urgency=low
* Patch upstream CMakeLists.txt to use the provided buildflags
Deleted: packages/shiboken/trunk/debian/patches/debian_buildoptions.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/debian_buildoptions.patch 2010-06-06 09:32:26 UTC (rev 13274)
+++ packages/shiboken/trunk/debian/patches/debian_buildoptions.patch 2010-06-06 16:15:33 UTC (rev 13275)
@@ -1,22 +0,0 @@
-Description: Allow pushing custom build options
- Also remove linker-specific options.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: not needed (distributor customization)
-Last-Update: 2010-05-28
-Index: shiboken/CMakeLists.txt
-===================================================================
---- shiboken.orig/CMakeLists.txt 2010-05-28 08:54:14.000000000 +0200
-+++ shiboken/CMakeLists.txt 2010-05-28 13:15:39.000000000 +0200
-@@ -21,9 +21,9 @@
- set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /w /EHsc- /GS- /GR- /DLIBSHIBOKEN_BUILD -D_SCL_SECURE_NO_WARNINGS")
- else()
- if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
-- set(CMAKE_CXX_FLAGS "-Wall -Wno-strict-aliasing -DNDEBUG -O2 -Wl,-O1 -Wl,--hash-style=gnu -fvisibility=hidden")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-strict-aliasing -DNDEBUG -fvisibility=hidden")
- else()
-- set(CMAKE_CXX_FLAGS "-g -Wall -Wno-strict-aliasing -fvisibility=hidden")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-strict-aliasing -fvisibility=hidden")
- endif()
- endif()
- if (WIN32 OR AVOID_PROTECTED_HACK)
Modified: packages/shiboken/trunk/debian/patches/fix_tests.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/fix_tests.patch 2010-06-06 09:32:26 UTC (rev 13274)
+++ packages/shiboken/trunk/debian/patches/fix_tests.patch 2010-06-06 16:15:33 UTC (rev 13275)
@@ -4,10 +4,10 @@
Author: Didier Raboud <didier at raboud.com>
Last-Update: 2010-03-24
-Index: shiboken-0.2.0/tests/otherbinding/CMakeLists.txt
+Index: shiboken/tests/otherbinding/CMakeLists.txt
===================================================================
---- shiboken-0.2.0.orig/tests/otherbinding/CMakeLists.txt 2010-03-24 13:24:46.000000000 +0100
-+++ shiboken-0.2.0/tests/otherbinding/CMakeLists.txt 2010-03-24 13:25:14.000000000 +0100
+--- shiboken.orig/tests/otherbinding/CMakeLists.txt 2010-06-06 18:09:31.000000000 +0200
++++ shiboken/tests/otherbinding/CMakeLists.txt 2010-06-06 18:10:17.000000000 +0200
@@ -16,7 +16,7 @@
find_program(GENERATOR generatorrunner REQUIRED)
@@ -17,11 +17,11 @@
${CMAKE_CURRENT_SOURCE_DIR}/global.h
--include-paths=${libother_SOURCE_DIR}:${libsample_SOURCE_DIR}:${libsample_SOURCE_DIR}/..
--typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR}:${sample_SOURCE_DIR}
-Index: shiboken-0.2.0/tests/samplebinding/CMakeLists.txt
+Index: shiboken/tests/samplebinding/CMakeLists.txt
===================================================================
---- shiboken-0.2.0.orig/tests/samplebinding/CMakeLists.txt 2010-03-24 13:24:46.000000000 +0100
-+++ shiboken-0.2.0/tests/samplebinding/CMakeLists.txt 2010-03-24 13:25:14.000000000 +0100
-@@ -69,7 +69,7 @@
+--- shiboken.orig/tests/samplebinding/CMakeLists.txt 2010-06-06 18:09:31.000000000 +0200
++++ shiboken/tests/samplebinding/CMakeLists.txt 2010-06-06 18:10:17.000000000 +0200
+@@ -76,7 +76,7 @@
find_program(GENERATOR generatorrunner REQUIRED)
add_custom_command(OUTPUT ${sample_SRC}
@@ -30,10 +30,10 @@
${CMAKE_CURRENT_SOURCE_DIR}/global.h
--include-paths=${libsample_SOURCE_DIR}
--typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR}
-Index: shiboken-0.2.0/tests/CMakeLists.txt
+Index: shiboken/tests/CMakeLists.txt
===================================================================
---- shiboken-0.2.0.orig/tests/CMakeLists.txt 2010-03-24 13:24:46.000000000 +0100
-+++ shiboken-0.2.0/tests/CMakeLists.txt 2010-03-24 13:25:14.000000000 +0100
+--- shiboken.orig/tests/CMakeLists.txt 2010-06-06 18:09:31.000000000 +0200
++++ shiboken/tests/CMakeLists.txt 2010-06-06 18:10:17.000000000 +0200
@@ -14,7 +14,7 @@
list(FIND test_blacklist ${CMAKE_MATCH_1} expect_fail)
add_test("${CMAKE_MATCH_1}" sh
Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series 2010-06-06 09:32:26 UTC (rev 13274)
+++ packages/shiboken/trunk/debian/patches/series 2010-06-06 16:15:33 UTC (rev 13275)
@@ -1,4 +1,2 @@
use_original_sparsehash.patch
fix_tests.patch
-debian_buildoptions.patch
-u_ftbfs_missing_file_44071543.patch
Deleted: packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch 2010-06-06 09:32:26 UTC (rev 13274)
+++ packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch 2010-06-06 16:15:33 UTC (rev 13275)
@@ -1,157 +0,0 @@
-From 440715431fb1abae0a089eaeae76df0686558097 Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Wed, 26 May 2010 19:28:08 -0300
-Subject: [PATCH] Fixed declaration of class SimpleFile.
-
-Move FILE member to internal structor to avoid errors on compilation of
-debian PPC.
-
-Reviewer: Luciano Wolf <luciano.wolf at openbossa.org>
----
- tests/libsample/simplefile.cpp | 57 ++++++++++++++++++++++++++++++++++-----
- tests/libsample/simplefile.h | 29 +++++---------------
- 2 files changed, 56 insertions(+), 30 deletions(-)
-
-diff --git a/tests/libsample/simplefile.cpp b/tests/libsample/simplefile.cpp
-index c79152b..1dc378a 100644
---- a/tests/libsample/simplefile.cpp
-+++ b/tests/libsample/simplefile.cpp
-@@ -32,18 +32,59 @@
- * 02110-1301 USA
- */
-
-+#include <stdlib.h>
-+#include <string.h>
- #include <fstream>
- #include "simplefile.h"
-
-+class SimpleFile_p
-+{
-+public:
-+ SimpleFile_p(const char* filename) : m_descriptor(0), m_size(0)
-+ {
-+ m_filename = strdup(filename);
-+ }
-+
-+ ~SimpleFile_p()
-+ {
-+ free(m_filename);
-+ }
-+
-+ char* m_filename;
-+ FILE* m_descriptor;
-+ long m_size;
-+};
-+
-+SimpleFile::SimpleFile(const char* filename)
-+{
-+ p = new SimpleFile_p(filename);
-+}
-+
-+SimpleFile::~SimpleFile()
-+{
-+ close();
-+ delete p;
-+}
-+
-+const char* SimpleFile::filename()
-+{
-+ return p->m_filename;
-+}
-+
-+long SimpleFile::size()
-+{
-+ return p->m_size;
-+}
-+
- bool
- SimpleFile::open()
- {
-- if ((m_descriptor = fopen(m_filename, "rb")) == 0)
-+ if ((p->m_descriptor = fopen(p->m_filename, "rb")) == 0)
- return false;
-
-- fseek(m_descriptor, 0, SEEK_END);
-- m_size = ftell(m_descriptor);
-- rewind(m_descriptor);
-+ fseek(p->m_descriptor, 0, SEEK_END);
-+ p->m_size = ftell(p->m_descriptor);
-+ rewind(p->m_descriptor);
-
- return true;
- }
-@@ -51,16 +92,16 @@ SimpleFile::open()
- void
- SimpleFile::close()
- {
-- if (m_descriptor) {
-- fclose(m_descriptor);
-- m_descriptor = 0;
-+ if (p->m_descriptor) {
-+ fclose(p->m_descriptor);
-+ p->m_descriptor = 0;
- }
- }
-
- bool
- SimpleFile::exists() const
- {
-- std::ifstream ifile(m_filename);
-+ std::ifstream ifile(p->m_filename);
- return ifile;
- }
-
-diff --git a/tests/libsample/simplefile.h b/tests/libsample/simplefile.h
-index 67797e7..9f7d042 100644
---- a/tests/libsample/simplefile.h
-+++ b/tests/libsample/simplefile.h
-@@ -38,29 +38,16 @@
- #include "libsamplemacros.h"
- #include <stdio.h>
-
-+class SimpleFile_p;
-+
- class LIBSAMPLE_API SimpleFile
- {
- public:
-- explicit SimpleFile(const char* filename)
-- : m_filename(filename), m_descriptor(0), m_size(0)
-- {
-- }
--
-- ~SimpleFile()
-- {
-- this->close();
-- }
--
-- const char* filename()
-- {
-- return m_filename;
-- }
--
-- long size()
-- {
-- return m_size;
-- }
-+ explicit SimpleFile(const char* filename);
-+ ~SimpleFile();
-
-+ const char* filename();
-+ long size();
- bool open();
- void close();
-
-@@ -68,9 +55,7 @@ public:
- static bool exists(const char* filename);
-
- private:
-- const char* m_filename;
-- FILE* m_descriptor;
-- long m_size;
-+ SimpleFile_p *p;
- };
-
- #endif // SIMPLEFILE_H
---
-1.6.1
-
Modified: packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch 2010-06-06 09:32:26 UTC (rev 13274)
+++ packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch 2010-06-06 16:15:33 UTC (rev 13275)
@@ -3,11 +3,11 @@
Forwarded: http://bugs.openbossa.org/148
Author: Didier Raboud <didier at raboud.com>
Last-Updated: 2010-02-12
-Index: shiboken-0.2.0/libshiboken/CMakeLists.txt
+Index: shiboken/libshiboken/CMakeLists.txt
===================================================================
---- shiboken-0.2.0.orig/libshiboken/CMakeLists.txt 2010-03-24 13:24:46.000000000 +0100
-+++ shiboken-0.2.0/libshiboken/CMakeLists.txt 2010-03-24 13:24:48.000000000 +0100
-@@ -25,7 +25,7 @@
+--- shiboken.orig/libshiboken/CMakeLists.txt 2010-06-06 18:09:32.000000000 +0200
++++ shiboken/libshiboken/CMakeLists.txt 2010-06-06 18:09:36.000000000 +0200
+@@ -26,7 +26,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${PYTHON_INCLUDE_PATH}
More information about the Python-modules-commits
mailing list