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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff -Nru bitpim-0.9.07.orig/src/common.py bitpim-0.9.07/src/common.py
--- bitpim-0.9.07.orig/src/common.py 2006-09-15 18:41:32.734807000 +0300
+++ bitpim-0.9.07/src/common.py 2006-09-15 18:41:12.801561250 +0300
@@ -854,4 +854,4 @@
# windows running from exe, return as is
return os.path.abspath(os.path.dirname(sys.executable))
# running from src, up one
- return os.path.split(os.path.abspath(os.path.dirname(sys.argv[0])))[0]
+ return os.path.abspath(os.path.dirname(sys.argv[0]))
diff -Nru bitpim-0.9.07.orig/src/conversions.py bitpim-0.9.07/src/conversions.py
--- bitpim-0.9.07.orig/src/conversions.py 2006-09-15 18:41:32.734807000 +0300
+++ bitpim-0.9.07/src/conversions.py 2006-09-15 18:41:12.801561250 +0300
@@ -20,11 +20,11 @@
class ConversionFailed(Exception): pass
-helperdir=os.path.join(common.get_main_dir(), "helpers")
+helperdir="/usr/bin"
osext={'win32': '.exe',
'darwin': '.mbin',
- 'linux2': '.lbin'} \
+ 'linux2': ''} \
[sys.platform]
# This shortname crap is needed because Windows programs (including ffmpeg)
@@ -125,14 +125,14 @@
p=sys.path[0]
if os.path.isfile(p):
p=os.path.dirname(p)
- helpersdirectory=os.path.abspath(os.path.join(p, 'helpers'))
+ helpersdirectory="/usr/bin"
print "Helper Directory: "+helpersdirectory
if sys.platform=='win32':
osext=".exe"
if sys.platform=='darwin':
osext=".mbin"
if sys.platform=='linux2':
- osext=".lbin"
+ osext=""
pngtopnmbin=gethelperbinary('pngtopnm')
ppmquantbin=gethelperbinary('ppmquant')
diff -Nru bitpim-0.9.07.orig/src/native/av/bmp2avi/Makefile bitpim-0.9.07/src/native/av/bmp2avi/Makefile
--- bitpim-0.9.07.orig/src/native/av/bmp2avi/Makefile 2006-09-15 18:41:32.734807000 +0300
+++ bitpim-0.9.07/src/native/av/bmp2avi/Makefile 2006-09-15 18:41:12.801561250 +0300
@@ -13,6 +13,6 @@
SRC=avi_file.cxx bmp_file.cxx b2a.cxx
-bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC)
+bmp2avi bmp2avi.mbin bmp2avi.exe: $(SRC)
$(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC)
diff -Nru bitpim-0.9.07.orig/src/native/usb/build.sh bitpim-0.9.07/src/native/usb/build.sh
--- bitpim-0.9.07.orig/src/native/usb/build.sh 2006-09-15 18:41:12.000000000 +0300
+++ bitpim-0.9.07/src/native/usb/build.sh 2006-09-15 18:42:03.296717000 +0300
@@ -4,4 +4,4 @@
swig -python -I/usr/include libusb.i
gcc -fPIC -Wall -fno-strict-aliasing -O2 -g -shared -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb
-strip _libusb.so
+#strip _libusb.so
|
GitWeb
