Package: cortado / 0.6.0-3

01_fix_build.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
Description: Fix various build issues.
Author: Onkar Shinde <onkarshinde@ubuntu.com>
Index: cortado-0.5.1/build.xml
===================================================================
--- cortado-0.5.1.orig/build.xml	2009-11-10 22:07:40.000000000 +0530
+++ cortado-0.5.1/build.xml	2009-11-10 22:14:49.000000000 +0530
@@ -675,7 +675,7 @@
     <delete dir="${out.build}"/>
     <delete dir="${out.dist}/${build.type}" />
     <delete file="${src}/com/fluendo/player/Configure.java" />
-    <delete file="${src}/com/fluendo/jst/SourceInfo.java" />
+    <!--delete file="${src}/com/fluendo/jst/SourceInfo.java" /-->
     <delete file="${src}/cortado.spec" />
   </target>
 
Index: cortado-0.5.1/scripts/get-revision
===================================================================
--- cortado-0.5.1.orig/scripts/get-revision	2009-11-10 22:07:41.000000000 +0530
+++ cortado-0.5.1/scripts/get-revision	2009-11-10 22:15:46.000000000 +0530
@@ -1,2 +1,5 @@
 #!/bin/sh
-git describe --tags
+if test -x /usr/bin/git
+then
+  git describe --tags
+fi
Index: cortado-0.5.1/scripts/update-source-info
===================================================================
--- cortado-0.5.1.orig/scripts/update-source-info	2009-11-10 22:07:41.000000000 +0530
+++ cortado-0.5.1/scripts/update-source-info	2009-11-10 22:14:49.000000000 +0530
@@ -23,8 +23,11 @@
 # if the file is not newer than the .git directory, leave it alone
 if test ! -d $topsrcdir/.git
 then
-  echo "No top-level .git directory, leaving file alone."
-  exit
+  if test -e $targetfile
+  then
+    echo "No top-level .git directory, leaving file alone."
+    exit
+  fi
 fi
 
 # don't compare with .git dir; local modifications should also trigger