[Python-modules-commits] r10720 - in packages/boostpythongenerator/trunk/debian (6 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Wed Dec 9 17:14:35 UTC 2009
Date: Wednesday, December 9, 2009 @ 17:14:34
Author: odyx-guest
Revision: 10720
Revert conversion to 3.0 and add a patch
Added:
packages/boostpythongenerator/trunk/debian/patches/series
packages/boostpythongenerator/trunk/debian/patches/upstream_47f10f814e.patch
Modified:
packages/boostpythongenerator/trunk/debian/changelog
packages/boostpythongenerator/trunk/debian/control
packages/boostpythongenerator/trunk/debian/rules
Deleted:
packages/boostpythongenerator/trunk/debian/source/format
Modified: packages/boostpythongenerator/trunk/debian/changelog
===================================================================
--- packages/boostpythongenerator/trunk/debian/changelog 2009-12-09 13:28:52 UTC (rev 10719)
+++ packages/boostpythongenerator/trunk/debian/changelog 2009-12-09 17:14:34 UTC (rev 10720)
@@ -2,7 +2,8 @@
* New upstream release.
- Upstream source split between generatorrunner and boostpythongenerator.
- * Convert to Source format 3.0 (quilt)
+ * Add upstream_47f10f814e.patch to "Adapt to changes in Generator interface."
+ from upstream git repository.
-- Didier Raboud <didier at raboud.com> Tue, 03 Nov 2009 15:44:39 +0100
Modified: packages/boostpythongenerator/trunk/debian/control
===================================================================
--- packages/boostpythongenerator/trunk/debian/control 2009-12-09 13:28:52 UTC (rev 10719)
+++ packages/boostpythongenerator/trunk/debian/control 2009-12-09 17:14:34 UTC (rev 10720)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Didier Raboud <didier at raboud.com>
-Build-Depends: debhelper (>= 7.3.12), libapiextractor-dev (>= 0.3.1), libqt4-dev (>= 4.5), cmake (>= 2.6.0)
+Build-Depends: debhelper (>= 7.3.12), libapiextractor-dev (>= 0.3.1), libqt4-dev (>= 4.5), cmake (>= 2.6.0), quilt
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/python-modules/packages/generatorrunner/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/generatorrunner/?op=log
@@ -25,7 +25,7 @@
Package: boostpythongenerator-dbg
Architecture: any
-Depends: boostpythongenerator (>= ${binary:Version})
+Depends: boostpythongenerator (>= ${binary:Version}), ${misc:Depends}
Replaces: generatorrunner-dbg (< 0.3.2)
Conflicts: generatorrunner-dbg (< 0.3.2)
Section: debug
Added: packages/boostpythongenerator/trunk/debian/patches/series
===================================================================
--- packages/boostpythongenerator/trunk/debian/patches/series (rev 0)
+++ packages/boostpythongenerator/trunk/debian/patches/series 2009-12-09 17:14:34 UTC (rev 10720)
@@ -0,0 +1 @@
+upstream_47f10f814e.patch
Added: packages/boostpythongenerator/trunk/debian/patches/upstream_47f10f814e.patch
===================================================================
--- packages/boostpythongenerator/trunk/debian/patches/upstream_47f10f814e.patch (rev 0)
+++ packages/boostpythongenerator/trunk/debian/patches/upstream_47f10f814e.patch 2009-12-09 17:14:34 UTC (rev 10720)
@@ -0,0 +1,78 @@
+From 47f10f814e1f4c088cf9069915c27b32e10e40f5 Mon Sep 17 00:00:00 2001
+From: Hugo Lima <hugo.lima at openbossa.org>
+Date: Tue, 17 Nov 2009 16:53:37 -0200
+Subject: [PATCH] Adapt to changes in Generator interface.
+
+Reviewed by Renato Araujo <renato.filho at openbossa.org>
+---
+ src/convertergenerator.cpp | 5 -----
+ src/cppgenerator.cpp | 9 +++------
+ 2 files changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/src/convertergenerator.cpp b/src/convertergenerator.cpp
+index 23a5d36..ec4a1f9 100644
+--- a/src/convertergenerator.cpp
++++ b/src/convertergenerator.cpp
+@@ -56,7 +56,6 @@ void ConverterGenerator::finishGeneration()
+ continue;
+
+ if (fileOutPath.isNull()) {
+- m_packageName = cls->package();
+ fileOutPath = outputDirectory() + '/' + subDirectoryForClass(cls)
+ + "/converter_register_" + moduleName().toLower() + ".hpp";
+ }
+@@ -108,10 +107,6 @@ void ConverterGenerator::finishGeneration()
+ writeConverterRegistration(s, "register_multimap_converter", "QMultiMap", m_qmultiMapTypes);
+ s << "}\n\n";
+ s << "#endif\n\n";
+-
+- m_numGeneratedWritten = m_qpairTypes.size() + m_qlistTypes.size() +
+- m_qvectorTypes.size() + m_qmapTypes.size() +
+- m_qhashTypes.size();
+ }
+
+ void ConverterGenerator::writeConverterRegistration(QTextStream& out,
+diff --git a/src/cppgenerator.cpp b/src/cppgenerator.cpp
+index 779934a..5dbc236 100644
+--- a/src/cppgenerator.cpp
++++ b/src/cppgenerator.cpp
+@@ -1404,9 +1404,6 @@ void CppGenerator::finishGeneration()
+ if (!shouldGenerate(cls) || cls->enclosingClass())
+ continue;
+
+- if (m_packageName.isEmpty())
+- m_packageName = cls->package();
+-
+ QString wrapperName = getWrapperName(cls);
+ QString boostFilename;
+ boostFilename += wrapperName + ".hpp";
+@@ -1418,7 +1415,7 @@ void CppGenerator::finishGeneration()
+ sClassPythonDefines << INDENT << define_str << endl;
+ }
+
+- QString moduleFileName(outputDirectory() + "/" + subDirectoryForPackage(m_packageName));
++ QString moduleFileName(outputDirectory() + "/" + subDirectoryForPackage(packageName()));
+ moduleFileName += "/" + moduleName().toLower() + "_module_wrapper.cpp";
+
+ QFile file(moduleFileName);
+@@ -1469,7 +1466,7 @@ void CppGenerator::writeGlobalFunctions()
+ {
+ QString fileName = moduleName().toLower() + "_globals_wrapper.cpp";
+
+- FileOut fileOut(outputDirectory() + "/" + subDirectoryForPackage(m_packageName) + "/" + fileName);
++ FileOut fileOut(outputDirectory() + "/" + subDirectoryForPackage(packageName()) + "/" + fileName);
+
+ QSet<QString> includes;
+ QString defsStr;
+@@ -1515,7 +1512,7 @@ void CppGenerator::writeGlobalFunctions()
+
+ // Add module level code snippets to 'Global' class
+ TypeSystemTypeEntry *moduleEntry = dynamic_cast<TypeSystemTypeEntry *>(
+- TypeDatabase::instance()->findType(m_packageName));
++ TypeDatabase::instance()->findType(packageName()));
+ QString sEnd;
+ QTextStream snipEnd(&sEnd);
+ if (moduleEntry && moduleEntry->codeSnips().size() > 0) {
+--
+1.6.1
+
Modified: packages/boostpythongenerator/trunk/debian/rules
===================================================================
--- packages/boostpythongenerator/trunk/debian/rules 2009-12-09 13:28:52 UTC (rev 10719)
+++ packages/boostpythongenerator/trunk/debian/rules 2009-12-09 17:14:34 UTC (rev 10720)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh --buildsystem=cmake $@
+ dh --with quilt --buildsystem=cmake $@
override_dh_strip:
dh_strip --dbg-package=boostpythongenerator-dbg
Deleted: packages/boostpythongenerator/trunk/debian/source/format
===================================================================
--- packages/boostpythongenerator/trunk/debian/source/format 2009-12-09 13:28:52 UTC (rev 10719)
+++ packages/boostpythongenerator/trunk/debian/source/format 2009-12-09 17:14:34 UTC (rev 10720)
@@ -1 +0,0 @@
-3.0 (quilt)
More information about the Python-modules-commits
mailing list