← Back to branch summary

~ubuntu-branches/ubuntu/saucy/navit/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/fix-cmake.patch

  • Committer: Package Import Robot
  • Author(s): Gilles Filippini
  • Date: 2012-01-30 21:46:45 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20120130214645-mjvkslctpagferf3
Tags: 0.5.0~svn4909+dfsg.1-1
* New upstream snapshot:
  + GUI Internal:
    . Former destinations list
    . Support for saving GUI settings
    . Made search result lists pageable when onscreen keyboard is hidden
  + GUI GTK:
    . Menu accelerators
  + New profile to calculate shortest car route
* Drop patches:
  + manpage-minus-signs.patch: applied upstream
  + search_trick: not needed anymore (search result lists now pageable)
* Update patch fix-cmake.patch: partially applied upstream
* Refresh patches:
  + icons-dir
  + qt-cmake.patch
* debian/README.source: acknowledge removal of navit/binding/win32 from
  upstream tarball

* debian/rules: s/GNU_TYPE/MULTIARCH/g

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-cmake.patch
3
3
 packages are close to the one generated with the autotools configuration.
4
4
Author: Gilles Filippini <pini@debian.org>
5
5
Forwarded: http://trac.navit-project.org/ticket/832
6
 
Last-Update: 2011-09-18
 
6
Last-Update: 2012-01-23
7
7
Index: navit/cmake/navit_macros.cmake
8
8
===================================================================
9
9
--- navit.orig/cmake/navit_macros.cmake 2011-09-18 21:38:21.000000000 +0200
36
36
+  @ONLY
37
37
+)
38
38
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/)
39
 
Index: navit/navit/vehicle/null/CMakeLists.txt
40
 
===================================================================
41
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
42
 
+++ navit/navit/vehicle/null/CMakeLists.txt     2011-09-18 21:36:42.000000000 +0200
43
 
@@ -0,0 +1 @@
44
 
+module_add_library(vehicle_null vehicle_null.c)