diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2012-09-25 20:19:41 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2012-09-25 20:19:41 +0200 |
| commit | d8592b576bc7c8887bf862a1fa9d3007f627af80 (patch) | |
| tree | c58b3d4252b754c9fd40be0f88d6cdc5e7a94ce4 /libtiff | |
| parent | e990d25dd715b5e32032e7b5df3aa95d46929e80 (diff) | |
| download | opt-d8592b576bc7c8887bf862a1fa9d3007f627af80.tar.gz opt-d8592b576bc7c8887bf862a1fa9d3007f627af80.tar.xz | |
fix lack of git-fu
Diffstat (limited to 'libtiff')
| -rw-r--r-- | libtiff/.footprint | 11 | ||||
| -rw-r--r-- | libtiff/.md5sum | 4 | ||||
| -rw-r--r-- | libtiff/Pkgfile | 4 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libtiff/.footprint b/libtiff/.footprint index 19097706e..ba42a35e8 100644 --- a/libtiff/.footprint +++ b/libtiff/.footprint @@ -8,7 +8,6 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtiff.a -rwxr-xr-x root/root usr/lib/libtiff.la -<<<<<<< HEAD lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.5.2.0 lrwxrwxrwx root/root usr/lib/libtiff.so.5 -> libtiff.so.5.2.0 -rwxr-xr-x root/root usr/lib/libtiff.so.5.2.0 @@ -19,16 +18,6 @@ lrwxrwxrwx root/root usr/lib/libtiffxx.so.5 -> libtiffxx.so.5.2.0 -rwxr-xr-x root/root usr/lib/libtiffxx.so.5.2.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtiff-4.pc -======= -lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.3.9.7 -lrwxrwxrwx root/root usr/lib/libtiff.so.3 -> libtiff.so.3.9.7 --rwxr-xr-x root/root usr/lib/libtiff.so.3.9.7 --rw-r--r-- root/root usr/lib/libtiffxx.a --rwxr-xr-x root/root usr/lib/libtiffxx.la -lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.3.9.7 -lrwxrwxrwx root/root usr/lib/libtiffxx.so.3 -> libtiffxx.so.3.9.7 --rwxr-xr-x root/root usr/lib/libtiffxx.so.3.9.7 ->>>>>>> b7344dae15c9c494429402ba0e2ddb91759c6024 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/TIFFClose.3tiff.gz diff --git a/libtiff/.md5sum b/libtiff/.md5sum index 34a031b9e..10672dad6 100644 --- a/libtiff/.md5sum +++ b/libtiff/.md5sum @@ -1,5 +1 @@ -<<<<<<< HEAD 051c1068e6a0627f461948c365290410 tiff-4.0.3.tar.gz -======= -626102f448ba441d42e3212538ad67d2 tiff-3.9.7.tar.gz ->>>>>>> b7344dae15c9c494429402ba0e2ddb91759c6024 diff --git a/libtiff/Pkgfile b/libtiff/Pkgfile index da5746ce2..4e9559227 100644 --- a/libtiff/Pkgfile +++ b/libtiff/Pkgfile @@ -4,11 +4,7 @@ # Depends on: libjpeg, zlib name=libtiff -<<<<<<< HEAD version=4.0.3 -======= -version=3.9.7 ->>>>>>> b7344dae15c9c494429402ba0e2ddb91759c6024 release=1 source=(http://download.osgeo.org/libtiff/tiff-$version.tar.gz) |