← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0006-update_manpages.patch
1
 
From: "Matteo F. Vescovi" <mfv.debian@gmail.com>
 
1
From: Kevin Roy <kiniou@gmail.com>
2
2
Date: Tue, 21 Feb 2012 21:34:30 +0100
3
3
Subject: update_manpages
4
4
 
5
 
 * Update blender manpage with current version
6
 
 * Add blenderplayer manpage
7
 
 
8
 
Signed-off-by: Kevin Roy <kiniou@gmail.com>
 
5
 * Update blender manpage with current version.
 
6
 * Add blenderplayer manpage.
9
7
---
10
 
 doc/manpage/blenderplayer.1   |  131 +++++++++++++++++++++++++++++++++++++++++
11
 
 source/creator/CMakeLists.txt |    5 +-
 
8
 doc/manpage/blenderplayer.1   | 131 ++++++++++++++++++++++++++++++++++++++++++
 
9
 source/creator/CMakeLists.txt |   5 +-
12
10
 2 files changed, 135 insertions(+), 1 deletion(-)
13
11
 create mode 100644 doc/manpage/blenderplayer.1
14
12
 
150
148
+.SH AUTHORS
151
149
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou@gmail.com>.
152
150
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
153
 
index 857e3d4..2e7c1cd 100644
 
151
index cc9045b..7ea1dd3 100644
154
152
--- a/source/creator/CMakeLists.txt
155
153
+++ b/source/creator/CMakeLists.txt
156
 
@@ -322,6 +322,7 @@ if(UNIX AND NOT APPLE)
 
154
@@ -330,6 +330,7 @@ if(UNIX AND NOT APPLE)
157
155
                                ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
158
156
                                ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
159
157
                                ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
161
159
                        DESTINATION ${TARGETDIR}
162
160
                )
163
161
 
164
 
@@ -385,7 +386,9 @@ if(UNIX AND NOT APPLE)
165
 
                        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
 
162
@@ -393,7 +394,9 @@ if(UNIX AND NOT APPLE)
 
163
                        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
166
164
                )
167
165
                install(
168
166
-                       FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1