[Python-modules-commits] r9653 - in packages/boostpythongenerator/trunk/debian (11 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Fri Sep 4 12:38:15 UTC 2009 

    Date: Friday, September 4, 2009 @ 12:37:54
  Author: odyx-guest
Revision: 9653

bpg: => 0.3 => mostly releasable too.

Added:
  packages/boostpythongenerator/trunk/debian/README.source
  packages/boostpythongenerator/trunk/debian/libgenrunner0.3.1.install
    (from rev 9652, packages/boostpythongenerator/trunk/debian/libgenrunner0.1.install)
  packages/boostpythongenerator/trunk/debian/patches/
  packages/boostpythongenerator/trunk/debian/patches/gitb811be1_installs_generator_plugins_in_its_own_directory.patch
  packages/boostpythongenerator/trunk/debian/patches/series
Modified:
  packages/boostpythongenerator/trunk/debian/boostpythongenerator.install
  packages/boostpythongenerator/trunk/debian/changelog
  packages/boostpythongenerator/trunk/debian/control
  packages/boostpythongenerator/trunk/debian/docgenerator.install
  packages/boostpythongenerator/trunk/debian/rules
Deleted:
  packages/boostpythongenerator/trunk/debian/libgenrunner0.1.install

Added: packages/boostpythongenerator/trunk/debian/README.source
===================================================================
--- packages/boostpythongenerator/trunk/debian/README.source	                        (rev 0)
+++ packages/boostpythongenerator/trunk/debian/README.source	2009-09-04 12:37:54 UTC (rev 9653)
@@ -0,0 +1,11 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.
+
+To use quilt with dh:
+ - add debhelper (>= 7.2.14) build dependency
+ - add quilt (>= 0.46-7) build dependency
+ - use quilt addon (e.g. dh --with quilt $@)

Modified: packages/boostpythongenerator/trunk/debian/boostpythongenerator.install
===================================================================
--- packages/boostpythongenerator/trunk/debian/boostpythongenerator.install	2009-09-04 12:28:18 UTC (rev 9652)
+++ packages/boostpythongenerator/trunk/debian/boostpythongenerator.install	2009-09-04 12:37:54 UTC (rev 9653)
@@ -1,2 +1,2 @@
 usr/bin/boostpythongenerator
-usr/lib/libboostpython_generator.so
+usr/lib/generatorrunner/libboostpython_generator.so

Modified: packages/boostpythongenerator/trunk/debian/changelog
===================================================================
--- packages/boostpythongenerator/trunk/debian/changelog	2009-09-04 12:28:18 UTC (rev 9652)
+++ packages/boostpythongenerator/trunk/debian/changelog	2009-09-04 12:37:54 UTC (rev 9653)
@@ -1,4 +1,4 @@
-boostpythongenerator (0.3.1-1) UNRELEASED; urgency=low
+boostpythongenerator (0.3-1) UNRELEASED; urgency=low
 
   * Initial Debian release (Closes: #543719)
     - Use the Ubuntu packaging as starting point.
@@ -15,6 +15,11 @@
   * debian/boostpythongenerator.1
     - Fix "hyphens-as-minuses" and various other fixes…
   * debian/copyright: Update.
+  * debian/patches:
+    - Add gitb811be1_installs_generator_plugins_in_its_own_directory.patch
+      from upstream git to put the plugins under /usr/lib/generatorrunner/
+    - Add quilt to Build-Depends.
+    - Add README.source
   * Bump Standards to 3.8.3
 
  -- Didier Raboud <didier at raboud.com>  Wed, 26 Aug 2009 13:30:00 +0200

Modified: packages/boostpythongenerator/trunk/debian/control
===================================================================
--- packages/boostpythongenerator/trunk/debian/control	2009-09-04 12:28:18 UTC (rev 9652)
+++ packages/boostpythongenerator/trunk/debian/control	2009-09-04 12:37:54 UTC (rev 9653)
@@ -3,13 +3,13 @@
 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.0.50), libapiextractor-dev (>= 0.2), libqt4-dev (>= 4.5), cmake (>= 2.6.0)
+Build-Depends: debhelper (>= 7.3.12), quilt (>= 0.46-7), libapiextractor-dev (>= 0.2), libqt4-dev (>= 4.5), cmake (>= 2.6.0)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/apiextractor/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/apiextractor/?op=log
 Homepage: http://www.pyside.org/home-binding/binding-generator/
 
-Package: libgenrunner0.1
+Package: libgenrunner0.3.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -23,7 +23,7 @@
 Package: libgenrunner-dev
 Architecture: all
 Section: libdevel
-Depends: libgenrunner0.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgenrunner0.3.1 (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: generatorrunner dedicated library headers
  Generatorrunner is a plugin-based application to run apiextractor-based
  generators.

Modified: packages/boostpythongenerator/trunk/debian/docgenerator.install
===================================================================
--- packages/boostpythongenerator/trunk/debian/docgenerator.install	2009-09-04 12:28:18 UTC (rev 9652)
+++ packages/boostpythongenerator/trunk/debian/docgenerator.install	2009-09-04 12:37:54 UTC (rev 9653)
@@ -1,2 +1,2 @@
 usr/bin/docgenerator
-usr/lib/libqtdoc_generator.so
+usr/lib/generatorrunner/libqtdoc_generator.so

Deleted: packages/boostpythongenerator/trunk/debian/libgenrunner0.1.install
===================================================================
--- packages/boostpythongenerator/trunk/debian/libgenrunner0.1.install	2009-09-04 12:28:18 UTC (rev 9652)
+++ packages/boostpythongenerator/trunk/debian/libgenrunner0.1.install	2009-09-04 12:37:54 UTC (rev 9653)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*

Copied: packages/boostpythongenerator/trunk/debian/libgenrunner0.3.1.install (from rev 9652, packages/boostpythongenerator/trunk/debian/libgenrunner0.1.install)
===================================================================
--- packages/boostpythongenerator/trunk/debian/libgenrunner0.3.1.install	                        (rev 0)
+++ packages/boostpythongenerator/trunk/debian/libgenrunner0.3.1.install	2009-09-04 12:37:54 UTC (rev 9653)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

Added: packages/boostpythongenerator/trunk/debian/patches/gitb811be1_installs_generator_plugins_in_its_own_directory.patch
===================================================================
--- packages/boostpythongenerator/trunk/debian/patches/gitb811be1_installs_generator_plugins_in_its_own_directory.patch	                        (rev 0)
+++ packages/boostpythongenerator/trunk/debian/patches/gitb811be1_installs_generator_plugins_in_its_own_directory.patch	2009-09-04 12:37:54 UTC (rev 9653)
@@ -0,0 +1,94 @@
+From b811be1ce4aa832ed7aa8542da535000924effa3 Mon Sep 17 00:00:00 2001
+From: Lauro Neto <lauro.neto at openbossa.org>
+Date: Thu, 3 Sep 2009 10:38:55 -0300
+Subject: [PATCH] Installs generator plugins in its own directory.
+
+---
+ CMakeLists.txt                        |    6 ++++++
+ generator_plugin_dir.h.in             |    4 ++++
+ generators/boostpython/CMakeLists.txt |    2 +-
+ generators/qtdoc/CMakeLists.txt       |    2 +-
+ main.cpp                              |    4 +++-
+ 5 files changed, 15 insertions(+), 3 deletions(-)
+ create mode 100644 generator_plugin_dir.h.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 67b20a1..8287980 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,10 +15,16 @@ set(generator_MINOR_VERSION "3")
+ set(generator_MICRO_VERSION "1")
+ set(generator_VERSION "${generator_MAJOR_VERSION}.${generator_MINOR_VERSION}.${generator_MICRO_VERSION}")
+ 
++set(generator_plugin_DIR ${LIB_INSTALL_DIR}/generatorrunner)
++
+ add_definitions(${QT_DEFINITIONS})
+ 
+ set(boostpythongenerator_VERSION ${generator_VERSION})
+ configure_file(boostpythongeneratorversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/boostpythongeneratorversion.h @ONLY)
++
++# TODO Install it.
++configure_file(generator_plugin_dir.h.in ${CMAKE_CURRENT_BINARY_DIR}/generator_plugin_dir.h @ONLY)
++
+ set(CMAKE_BUILD_TYPE Debug)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+diff --git a/generator_plugin_dir.h.in b/generator_plugin_dir.h.in
+new file mode 100644
+index 0000000..8e914b3
+--- /dev/null
++++ b/generator_plugin_dir.h.in
+@@ -0,0 +1,4 @@
++#ifndef GENERATOR_PLUGIN_DIR_H
++#define GENERATOR_PLUGIN_DIR_H
++#define GENERATOR_PUGIN_DIR "@generator_plugin_DIR@"
++#endif
+diff --git a/generators/boostpython/CMakeLists.txt b/generators/boostpython/CMakeLists.txt
+index 00e7915..f94d800 100644
+--- a/generators/boostpython/CMakeLists.txt
++++ b/generators/boostpython/CMakeLists.txt
+@@ -14,6 +14,6 @@ target_link_libraries(boostpythongenerator ${QT_QTCORE_LIBRARY})
+ add_library(boostpython_generator SHARED ${boostpython_generator_SRC})
+ target_link_libraries(boostpython_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner)
+ 
+-install(TARGETS boostpython_generator DESTINATION ${LIB_INSTALL_DIR})
++install(TARGETS boostpython_generator DESTINATION ${generator_plugin_DIR})
+ install(TARGETS boostpythongenerator DESTINATION bin)
+ 
+diff --git a/generators/qtdoc/CMakeLists.txt b/generators/qtdoc/CMakeLists.txt
+index 804600e..f943a7c 100644
+--- a/generators/qtdoc/CMakeLists.txt
++++ b/generators/qtdoc/CMakeLists.txt
+@@ -10,6 +10,6 @@ target_link_libraries(docgenerator ${QT_QTCORE_LIBRARY})
+ add_library(qtdoc_generator SHARED ${qtdoc_generator_SRC})
+ target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner)
+ 
+-install(TARGETS qtdoc_generator DESTINATION ${LIB_INSTALL_DIR})
++install(TARGETS qtdoc_generator DESTINATION ${generator_plugin_DIR})
+ install(TARGETS docgenerator DESTINATION bin)
+ 
+diff --git a/main.cpp b/main.cpp
+index 1f6f76a..c9bbfbd 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -27,6 +27,7 @@
+ #include <iostream>
+ #include <apiextractor/apiextractor.h>
+ #include "boostpythongeneratorversion.h"
++#include "generator_plugin_dir.h"
+ #include "generator.h"
+ 
+ #if defined(Q_OS_WIN32)
+@@ -120,7 +121,8 @@ int main(int argc, char *argv[])
+     // Try to load a generator
+     QString generatorSet = args.value("generatorSet");
+     if (!generatorSet.isEmpty()) {
+-        QLibrary plugin(generatorSet+"_generator");
++        QString generatorFile = QString(GENERATOR_PUGIN_DIR) + "/lib" + generatorSet + "_generator";
++        QLibrary plugin(generatorFile);
+         getGeneratorsFunc getGenerators = reinterpret_cast<getGeneratorsFunc>(plugin.resolve("getGenerators"));
+         if (getGenerators)
+             generators = getGenerators();
+-- 
+1.6.1
+

Added: packages/boostpythongenerator/trunk/debian/patches/series
===================================================================
--- packages/boostpythongenerator/trunk/debian/patches/series	                        (rev 0)
+++ packages/boostpythongenerator/trunk/debian/patches/series	2009-09-04 12:37:54 UTC (rev 9653)
@@ -0,0 +1 @@
+gitb811be1_installs_generator_plugins_in_its_own_directory.patch

Modified: packages/boostpythongenerator/trunk/debian/rules
===================================================================
--- packages/boostpythongenerator/trunk/debian/rules	2009-09-04 12:28:18 UTC (rev 9652)
+++ packages/boostpythongenerator/trunk/debian/rules	2009-09-04 12:37:54 UTC (rev 9653)
@@ -1,8 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh --buildsystem=cmake $@
-
-# Disable the RPATH propagation for the libraries
-#override_dh_auto_configure:
-#	dh_auto_configure -- -DCMAKE_SKIP_RPATH=true
+	dh --with=quilt --buildsystem=cmake $@

More information about the Python-modules-commits mailing list