[Python-modules-commits] r10724 - in packages/generatorrunner/trunk/debian (9 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Wed Dec 9 17:43:45 UTC 2009 

    Date: Wednesday, December 9, 2009 @ 17:43:44
  Author: odyx-guest
Revision: 10724

Big update (revert 3.0 and add a patch)

Added:
  packages/generatorrunner/trunk/debian/README.source
  packages/generatorrunner/trunk/debian/patches/
  packages/generatorrunner/trunk/debian/patches/series
  packages/generatorrunner/trunk/debian/patches/use_cmake_config_no_find.patch
Modified:
  packages/generatorrunner/trunk/debian/changelog
  packages/generatorrunner/trunk/debian/control
  packages/generatorrunner/trunk/debian/libgenrunner-dev.install
  packages/generatorrunner/trunk/debian/rules
Deleted:
  packages/generatorrunner/trunk/debian/source/

Added: packages/generatorrunner/trunk/debian/README.source
===================================================================
--- packages/generatorrunner/trunk/debian/README.source	                        (rev 0)
+++ packages/generatorrunner/trunk/debian/README.source	2009-12-09 17:43:44 UTC (rev 10724)
@@ -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/generatorrunner/trunk/debian/changelog
===================================================================
--- packages/generatorrunner/trunk/debian/changelog	2009-12-09 17:38:46 UTC (rev 10723)
+++ packages/generatorrunner/trunk/debian/changelog	2009-12-09 17:43:44 UTC (rev 10724)
@@ -4,8 +4,13 @@
     - Split out boostpythongenerator.
     - Remove fix_manpages.patch - Included upstream.
     - Bump libgenrunner SONAME to 0.3.2
-  * Convert source package to 3.0 (quilt) - drop quilt Build-Dep and dh snippet,
-    remove README.source
+  * Add use_cmake_config_no_find.patch:
+    - Don't ship buggy FindGeneratorRunner.cmake (it is shipped in the wrong
+      directory and useless anyway).
+    - Ship instead a home-brewn GeneratorRunnerConfig.cmake and other cmake
+      specific configuration files
+    + Many thanks to Modestas Vainius for his time and skills in helping me
+      through this patch!
 
  -- Didier Raboud <didier at raboud.com>  Tue, 03 Nov 2009 15:19:20 +0100
 

Modified: packages/generatorrunner/trunk/debian/control
===================================================================
--- packages/generatorrunner/trunk/debian/control	2009-12-09 17:38:46 UTC (rev 10723)
+++ packages/generatorrunner/trunk/debian/control	2009-12-09 17:43:44 UTC (rev 10724)
@@ -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.2), libqt4-dev (>= 4.5), cmake (>= 2.6.0), quilt (>= 0.46-7)
 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

Modified: packages/generatorrunner/trunk/debian/libgenrunner-dev.install
===================================================================
--- packages/generatorrunner/trunk/debian/libgenrunner-dev.install	2009-12-09 17:38:46 UTC (rev 10723)
+++ packages/generatorrunner/trunk/debian/libgenrunner-dev.install	2009-12-09 17:43:44 UTC (rev 10724)
@@ -1,4 +1,4 @@
 usr/include/*
 usr/lib/pkgconfig/*
-usr/share/cmake-2.6/*
+usr/lib/cmake/*
 usr/lib/libgenrunner.so

Added: packages/generatorrunner/trunk/debian/patches/series
===================================================================
--- packages/generatorrunner/trunk/debian/patches/series	                        (rev 0)
+++ packages/generatorrunner/trunk/debian/patches/series	2009-12-09 17:43:44 UTC (rev 10724)
@@ -0,0 +1 @@
+use_cmake_config_no_find.patch

Added: packages/generatorrunner/trunk/debian/patches/use_cmake_config_no_find.patch
===================================================================
--- packages/generatorrunner/trunk/debian/patches/use_cmake_config_no_find.patch	                        (rev 0)
+++ packages/generatorrunner/trunk/debian/patches/use_cmake_config_no_find.patch	2009-12-09 17:43:44 UTC (rev 10724)
@@ -0,0 +1,75 @@
+Index: generatorrunner-0.3.2/FindGeneratorRunner.cmake.in
+===================================================================
+--- generatorrunner-0.3.2.orig/FindGeneratorRunner.cmake.in	2009-12-09 13:07:18.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,15 +0,0 @@
+-# - try to find GENERATORRUNNER
+-#  GENERATORRUNNER_INCLUDE_DIR   - Directories to include to use GENERATORRUNNER
+-#  GENERATORRUNNER_LIBRARIES     - Files to link against to use GENERATORRUNNER
+-#  GENERATORRUNNER_FOUND         - GENERATORRUNNER was found
+-
+-FIND_PATH(GENERATORRUNNER_INCLUDE_DIR generator.h @CMAKE_INSTALL_PREFIX@/include/generatorrunner)
+-
+-FIND_LIBRARY(GENERATORRUNNER_LIBRARY genrunner @CMAKE_INSTALL_PREFIX@/lib)
+-
+-SET(GENERATORRUNNER_FOUND "NO")
+-IF(GENERATORRUNNER_LIBRARY AND GENERATORRUNNER_INCLUDE_DIR)
+-    SET(GENERATORRUNNER_FOUND "YES")
+-    SET(GENERATORRUNNER_PLUGIN_DIR @generator_plugin_DIR@)
+-    SET(GENERATORRUNNER_VERSION "@generator_VERSION@")
+-ENDIF(GENERATORRUNNER_LIBRARY AND GENERATORRUNNER_INCLUDE_DIR)
+Index: generatorrunner-0.3.2/CMakeLists.txt
+===================================================================
+--- generatorrunner-0.3.2.orig/CMakeLists.txt	2009-12-09 13:08:12.000000000 +0100
++++ generatorrunner-0.3.2/CMakeLists.txt	2009-12-09 13:16:09.000000000 +0100
+@@ -44,8 +44,8 @@
+ # create pkg-config file
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/generatorrunner.pc.in
+                ${CMAKE_CURRENT_BINARY_DIR}/generatorrunner.pc @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FindGeneratorRunner.cmake.in
+-               ${CMAKE_CURRENT_BINARY_DIR}/FindGeneratorRunner.cmake @ONLY)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GeneratorRunnerConfig.cmake.in
++               ${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfig.cmake @ONLY)
+ 
+ # uninstall target
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+@@ -62,14 +62,18 @@
+         | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
+         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+ 
+-install(TARGETS genrunner DESTINATION ${LIB_INSTALL_DIR})
++install(TARGETS genrunner EXPORT generatorrunner
++			  LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ install(TARGETS generatorrunner DESTINATION bin)
+ install(FILES generator.h DESTINATION include/generatorrunner)
+ install(FILES generatorrunnermacros.h DESTINATION include/generatorrunner)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generatorrunner.pc DESTINATION
+         ${LIB_INSTALL_DIR}/pkgconfig)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindGeneratorRunner.cmake
+-        DESTINATION share/cmake-2.6/Modules)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfig.cmake
++        DESTINATION ${LIB_INSTALL_DIR}/cmake/GeneratorRunner)
++install(EXPORT generatorrunner FILE GeneratorRunnerTargets.cmake
++        DESTINATION ${LIB_INSTALL_DIR}/cmake/GeneratorRunner)
++
+ 
+ #FIXME: manpages should be installed only on Linux targets
+ file(GLOB manpages ${CMAKE_CURRENT_SOURCE_DIR}/*.1)
+Index: generatorrunner-0.3.2/GeneratorRunnerConfig.cmake.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ generatorrunner-0.3.2/GeneratorRunnerConfig.cmake.in	2009-12-09 13:18:22.000000000 +0100
+@@ -0,0 +1,13 @@
++# - try to find GENERATORRUNNER
++#  GENERATORRUNNER_INCLUDE_DIR   - Directories to include to use GENERATORRUNNER
++#  GENERATORRUNNER_LIBRARIES     - Files to link against to use GENERATORRUNNER
++#  GENERATORRUNNER_FOUND         - GENERATORRUNNER was found
++
++if(NOT TARGET generatorrunner)
++       get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
++       include("${_dir}/GeneratorRunnerTargets.cmake")
++endif(NOT TARGET generatorrunner)
++
++SET(GENERATORRUNNER_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/generatorrunner")
++SET(GENERATORRUNNER_LIBRARY "generatorrunner")
++SET(GENERATORRUNNER_FOUND "YES")

Modified: packages/generatorrunner/trunk/debian/rules
===================================================================
--- packages/generatorrunner/trunk/debian/rules	2009-12-09 17:38:46 UTC (rev 10723)
+++ packages/generatorrunner/trunk/debian/rules	2009-12-09 17:43:44 UTC (rev 10724)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --buildsystem=cmake $@
+	dh --with quilt --buildsystem=cmake $@
 
 override_dh_strip:
 	dh_strip --dbg-package=generatorrunner-dbg

More information about the Python-modules-commits mailing list