← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0006-update_manpages.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0006-update_manpages.patch
148
148
+.SH AUTHORS
149
149
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou@gmail.com>.
150
150
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
151
 
index 4a80161..647d0f3 100644
 
151
index 5e1d95e..aa717ed 100644
152
152
--- a/source/creator/CMakeLists.txt
153
153
+++ b/source/creator/CMakeLists.txt
154
 
@@ -344,6 +344,7 @@ if(UNIX AND NOT APPLE)
 
154
@@ -352,6 +352,7 @@ if(UNIX AND NOT APPLE)
155
155
                                ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
156
156
                                ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
157
157
                                ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
159
159
                        DESTINATION ${TARGETDIR}
160
160
                )
161
161
 
162
 
@@ -407,7 +408,9 @@ if(UNIX AND NOT APPLE)
 
162
@@ -415,7 +416,9 @@ if(UNIX AND NOT APPLE)
163
163
                        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
164
164
                )
165
165
                install(