~ubuntu-branches/ubuntu/trusty/3depict/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/3depict-docdir.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sylvestre Ledru, D Haley, Sylvestre Ledru
  • Date: 2011-08-15 23:35:55 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110815233555-5c0j9oklfkrc733q
Tags: 0.0.7-1
[ D Haley ]
* Update to new upstream version 
* Include manual in tarball
* Include upstream patches for correcting density profile computation
  and refresh branch computation

[ Sylvestre Ledru ]
* Switch to dpkg-source 3.0 (quilt) format

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: 3depict-0.0.7/src/3Depict.cpp
 
2
===================================================================
 
3
--- 3depict-0.0.7.orig/src/3Depict.cpp  2011-08-14 17:14:20.000000000 +0100
 
4
+++ 3depict-0.0.7/src/3Depict.cpp       2011-08-14 17:15:08.000000000 +0100
 
5
@@ -2066,11 +2066,13 @@
 
6
 {
 
7
        //First attempt to locate the local copy of the manual.
 
8
        string s;
 
9
-       s=locateDataFile("3Depict-manual.pdf");
 
10
+       s=locateDataFile("manual.pdf");
 
11
 
 
12
-       //Also debian makes us use the lowercase "D", so check there too.
 
13
+       //Check debian 3depict dir
 
14
        if(!s.size())
 
15
-               s=locateDataFile("3depict-manual.pdf");
 
16
+       {
 
17
+               s=std::string("/usr/share/3depict/manual.pdf");
 
18
+       }
 
19
 
 
20
 
 
21
        //If we found it, use the default program associated with that data file