DELTA SVN‚‚ €‚‚--- src/ImportExport/ImportExportGdal.h.orig 2015-07-19 14:50:09 UTC +++ src/ImportExport/ImportExportGdal.h @@ -19,7 +19,7 @@ #include #include -#if GDAL_VERSION_MAJOR == 2 +#if GDAL_VERSION_MAJOR >= 2 #define GDAL2 #endif ENDREP id: 4-523791.0.r523791/293 type: file count: 0 text: 523791 0 280 263 79ef35bdcc214e1ed2c9eee78005b854 0dde44b767c0cc73584be4e6ddc168ad1a208d8f 523790-b85r/_6 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/merkaartor/files/patch-src-ImportExport-ImportExportGdal.h copyroot: 0 / PLAIN K 18 patch-git_a6f3d9f2 V 28 file 7-404917.0.r404917/2897 K 18 patch-git_e6d015a9 V 28 file a-404917.0.r506383/5961 K 41 patch-src-ImportExport-ImportExportGdal.h V 27 file 4-523791.0.r523791/293 K 40 patch-src_Layers_LicenseDisplayDialog.ui V 30 file 7-487594.0.r487594/114456 K 17 patch-src_src.pro V 30 file c-404917.0.r419133/403796 END ENDREP id: 6-404917.0.r523791/956 type: dir pred: 6-404917.0.r506383/6555 count: 4 text: 523791 602 341 0 66a84414dc2a23915ec9198654ee852e cpath: /head/astro/merkaartor/files copyroot: 0 / PLAIN K 8 Makefile V 28 file 5-226138.0.r523788/4910 K 8 distinfo V 28 file 8-226138.0.r404917/2591 K 5 files V 26 dir 6-404917.0.r523791/956 K 9 pkg-descr V 27 file a-226138.0.r413954/759 K 9 pkg-plist V 28 file a-232583.0.r404917/4111 END ENDREP id: 4-226138.0.r523791/1387 type: dir pred: 4-226138.0.r523788/5462 count: 78 text: 523791 1139 235 0 a38d27ae5549f91a18082e035459264e cpath: /head/astro/merkaartor copyroot: 0 / PLAIN K 8 Makefile V 26 file 2-4126.0.r522617/2340 K 15 R-cran-maptools V 27 dir 4-281901.0.r518948/1004 K 7 accrete V 26 dir 4-85812.0.r463107/1442 K 10 astrometry V 27 dir 4-237991.0.r517029/2224 K 16 boinc-astropulse V 28 dir 4-268142.0.r516738/10388 K 16 boinc-setiathome V 35 dir 4-158271.0-459014.r516738/11222 K 8 celestia V 28 dir 4-59394.0.r507372/326931 K 12 celestia-gtk V 28 dir 8-161335.0.r352516/10165 K 7 cfitsio V 26 dir 4-108032.0.r510465/569 K 5 fowsr V 28 dir 4-260351.0.r424658/16302 K 10 foxtrotgps V 28 dir 4-268361.0.r517040/31084 K 13 geographiclib V 27 dir 4-366683.0.r513033/3822 K 11 gkrellmoon2 V 28 dir 4-117591.0.r517040/31829 K 8 gnuastro V 27 dir 4-497484.0.r518465/1422 K 12 google-earth V 28 dir 4-165314.0.r508834/44607 K 8 gpsbabel V 29 dir 4-160794.0.r507372/329898 K 10 gpsbabel14 V 33 dir 4-160794.0-357391.r457178/623 K 12 gpscorrelate V 28 dir 4-208617.0.r517040/32529 K 4 gpsd V 28 dir 4-153259.0.r517040/33267 K 6 gpsman V 27 dir 4-52039.0.r523220/34520 K 8 gpsprune V 35 dir 4-236619.0-308179.r518482/56042 K 5 gpstk V 27 dir 4-176181.0.r509610/1512 K 10 gpxloggerd V 27 dir 4-262634.0.r415839/6343 K 4 jday V 25 dir 4-38299.0.r355901/658 K 4 josm V 27 dir 4-229016.0.r522278/1035 K 6 kstars V 35 dir 19-283641.0-468592.r521811/1950 K 6 libgal V 29 dir 4-209589.0.r415498/124026 K 10 libkgeomap V 35 dir 4-298855.0-466809.r522541/81507 K 7 libnova V 25 dir 4-68642.0.r474623/639 K 9 libosmium V 36 dir 4-319273.0-426943.r519824/136470 K 9 libosmpbf V 27 dir 4-318981.0.r523788/4731 K 4 luna V 27 dir 2-4129.0.r419133/403623 K 6 marble V 35 dir o-255469.1-466809.r522541/82301 K 5 match V 26 dir 4-51645.0.r447883/1229 K 10 merkaartor V 27 dir 4-226138.0.r523791/1387 K 6 mkgmap V 27 dir 4-254519.0.r523733/1034 K 15 mkgmap-splitter V 27 dir 4-273512.0.r517866/1045 K 6 mymoon V 28 dir 4-82022.0.r419133/406521 K 9 nightfall V 27 dir 4-59969.0.r517040/34733 K 7 opencpn V 28 dir 4-423561.0.r516880/42658 K 12 openuniverse V 27 dir 2-12308.0.r516738/12752 K 5 oskar V 27 dir 4-475148.0.r523759/1606 K 7 osmosis V 28 dir 4-242070.0.r518482/56716 K 8 p5-Astro V 29 dir 4-234415.0.r470993/447268 K 12 p5-Astro-ADS V 28 dir 4-68368.0.r481365/338372 K 21 p5-Astro-App-Satpass2 V 27 dir 4-437603.0.r518916/1085 K 16 p5-Astro-Catalog V 28 dir 4-68399.0.r481365/339792 K 18 p5-Astro-Constants V 29 dir 4-252171.0.r470993/449397 K 15 p5-Astro-Coords V 27 dir 4-300711.0.r511925/1061 K 12 p5-Astro-DSS V 28 dir 4-68373.0.r481365/341208 K 21 p5-Astro-FITS-CFITSIO V 27 dir 4-267438.0.r507401/7942 K 20 p5-Astro-FITS-Header V 26 dir 4-103734.0.r498853/582 K 13 p5-Astro-Flux V 26 dir 4-300708.0.r502050/610 K 18 p5-Astro-Hipparcos V 29 dir 4-247060.0.r470993/453036 K 18 p5-Astro-MoonPhase V 28 dir 4-36692.0.r470993/453749 K 12 p5-Astro-PAL V 27 dir 4-300709.0.r507790/1058 K 15 p5-Astro-SIMBAD V 28 dir 4-68371.0.r481365/342625 K 22 p5-Astro-SIMBAD-Client V 27 dir 4-232140.0.r520441/1091 K 19 p5-Astro-SpaceTrack V 27 dir 4-168388.0.r523332/1080 K 16 p5-Astro-SunTime V 26 dir 4-36693.0.r446602/1094 K 16 p5-Astro-Sunrise V 26 dir 4-42004.0.r490758/1061 K 18 p5-Astro-Telescope V 26 dir 4-300710.0.r502052/613 K 17 p5-Astro-WaveBand V 26 dir 4-300707.0.r502053/609 K 16 p5-Astro-satpass V 27 dir 4-232139.0.r522916/1067 K 6 p5-GPS V 28 dir 4-35705.0.r481365/344773 K 12 p5-GPS-Babel V 29 dir 4-234848.0.r481365/345474 K 10 p5-GPS-OID V 29 dir 4-255599.0.r470993/460865 K 12 p5-GPS-Point V 27 dir 4-495356.0.r495356/2165 K 12 p5-Geo-METAR V 25 dir 4-36553.0.r451691/584 K 15 p5-Misc-Quality V 26 dir 4-300705.0.r502054/652 K 12 p5-Net-GPSD3 V 27 dir 4-495590.0.r495590/3319 K 15 p5-Starlink-AST V 29 dir 4-302004.0.r481365/346185 K 22 p5-Weather-Underground V 29 dir 4-162628.0.r481365/346912 K 5 phoon V 26 dir 4-81092.0.r471445/2940 K 3 pp3 V 25 dir 4-96516.0.r428805/940 K 6 ptiger V 29 dir 4-171431.0.r412344/273568 K 5 py-RO V 27 dir 4-266946.0.r520140/1198 K 9 py-astLib V 26 dir 4-231069.0.r521076/994 K 10 py-astropy V 26 dir 4-417939.0.r520327/567 K 8 py-ephem V 34 dir 4-186585.0-520162.r520162/3752 K 21 py-horoscopegenerator V 26 dir 4-419671.0.r486359/656 K 8 py-metar V 27 dir 5-468646.0.r490509/1059 K 8 py-metpy V 26 dir 4-468596.0.r522442/543 K 10 py-pymeeus V 27 dir 4-520157.0.r520157/2176 K 10 py-pymetar V 33 dir 4-63558.0-403519.r491002/2266 K 9 py-pysofa V 29 dir 4-475344.0.r507372/341517 K 9 py-pywapi V 28 dir 4-419623.0.r458818/19069 K 13 py-spacetrack V 27 dir 4-473219.0.r495479/1007 K 7 pyephem V 26 dir 4-186585.0.r520166/732 K 9 pyweather V 27 dir 2-24453.0.r371096/21114 K 9 qmapshack V 27 dir 4-400234.0.r518253/3433 K 7 readosm V 28 dir 4-379799.0.r523070/19090 K 4 rmap V 28 dir 4-30058.0.r419133/417558 K 7 roadmap V 27 dir 4-74310.0.r517040/35418 K 7 routino V 27 dir 4-400197.0.r512621/1073 K 8 saoimage V 27 dir 2-10544.0.r523220/35204 K 10 sextractor V 28 dir 4-212291.0.r371223/39279 K 5 siril V 34 dir 4-460947.0-465565.r515671/5472 K 4 sofa V 27 dir 4-475343.0.r475343/3245 K 6 sscalc V 27 dir 4-36122.0.r523220/36191 K 9 stardates V 28 dir 4-142867.0.r523220/36830 K 8 starplot V 28 dir 4-47135.0.r507372/343824 K 5 stars V 26 dir 2-3514.0.r516738/14116 K 10 stellarium V 26 dir 4-99180.0.r520694/3012 K 8 sunclock V 26 dir 2-3782.0.r516738/14836 K 7 sunwait V 27 dir 4-453057.0.r453057/2178 K 3 swe V 27 dir 4-222285.0.r505185/1079 K 9 tclgeomap V 27 dir 4-171387.0.r413730/1988 K 8 tkgeomap V 28 dir e-171387.0.r455167/35629 K 6 wcslib V 27 dir 4-237990.0.r512097/3096 K 7 weather V 26 dir 4-255511.0.r523530/873 K 7 wmglobe V 34 dir 2-19791.0-491271.r516738/16308 K 9 wmjupiter V 27 dir 4-53136.0.r516738/17025 K 11 wmmoonclock V 27 dir 2-17174.0.r516738/17707 K 7 wmsolar V 27 dir 4-53138.0.r516738/18386 K 14 wmspaceweather V 27 dir 2-18198.0.r516738/19075 K 5 wmsun V 27 dir 2-18199.0.r523220/37509 K 6 xearth V 25 dir 3-301.0.r516738/20414 K 6 xeartk V 29 dir 4-171433.0.r415498/126705 K 6 xephem V 24 dir 2-3623.0.r513113/582 K 9 xmoontool V 28 dir 4-152569.0.r516738/21093 K 6 xphoon V 25 dir 2-983.0.r516738/21762 K 7 xplanet V 26 dir 2-26182.0.r517230/4685 K 5 xtide V 26 dir 2-8881.0.r516738/23155 K 6 xworld V 27 dir 4-46872.0.r516738/23835 END ENDREP id: 1-301.0.r523791/7709 type: dir pred: 1-301.0.r523788/11785 count: 4107 text: 523791 1567 6129 0 a3a69d54201ff9144a7b157543eab00a cpath: /head/astro copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 26 file 1-411777.0.r467740/54 K 11 .gitauthors V 26 file 1-467739.0.r523253/81 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 26 file 1-99373.0.r523105/362 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r521639/51 K 4 GIDs V 27 file 1-168311.0.r523696/117 K 8 Keywords V 27 dir 1-314142.0.r509900/1268 K 5 LEGAL V 25 file 1-748.0.r522617/1778 K 5 MOVED V 26 file 1-69878.0.r523740/668 K 8 Makefile V 23 file 1-6.0.r516635/2409 K 2 Mk V 23 dir 1-5.0.r523749/10496 K 6 README V 25 file 1-2408.0.r494236/641 K 9 Templates V 25 dir 1-2932.0.r523104/4369 K 5 Tools V 26 dir 3-15302.0.r522779/3115 K 4 UIDs V 28 file 4-168311.0.r523293/8826 K 8 UPDATING V 28 file 1-102685.0.r522889/2438 K 13 accessibility V 27 dir 1-42583.0.r522541/67288 K 6 arabic V 27 dir 1-38973.0.r520009/50387 K 9 archivers V 25 dir 1-242.0.r523755/13735 K 5 astro V 24 dir 1-301.0.r523791/7709 K 5 audio V 25 dir 1-148.0.r523788/60452 K 4 base V 26 dir 1-420954.0.r521962/779 K 10 benchmarks V 23 dir 1-62.0.r523615/5726 K 7 biology V 26 dir 1-9066.0.r523749/19552 K 3 cad V 24 dir 1-276.0.r523629/7008 K 7 chinese V 25 dir 1-3770.0.r523511/6386 K 5 comms V 24 dir 1-76.0.r523292/11256 K 10 converters V 26 dir 1-1561.0.r523410/10656 K 9 databases V 26 dir 1-771.0.r523788/123696 K 9 deskutils V 26 dir 1-2098.0.r523708/15490 K 5 devel V 25 dir 1-73.0.r523789/366205 K 3 dns V 27 dir 1-6145.0.r523788/508662 K 7 editors V 23 dir 4-6.0.r523703/14386 K 9 emulators V 24 dir 1-181.0.r523701/9871 K 7 finance V 26 dir 1-4110.0.r522944/12416 K 6 french V 26 dir 1-25673.0.r521882/5513 K 3 ftp V 24 dir 1-199.0.r523624/6281 K 5 games V 26 dir 1-104.0.r523788/565739 K 6 german V 25 dir 1-7451.0.r523673/2731 K 8 graphics V 24 dir 1-94.0.r523790/58865 K 6 hebrew V 28 dir 3-31142.0.r520009/142140 K 9 hungarian V 29 dir 1p-38973.0.r520009/143509 K 3 irc V 23 dir 1-42.0.r522618/7122 K 8 japanese V 26 dir 1-410.0.r523788/640069 K 4 java V 25 dir 1-2798.0.r523741/8334 K 6 korean V 27 dir 1-5873.0.r522132/633701 K 4 lang V 24 dir 1-15.0.r523749/97478 K 4 mail V 25 dir 1-57.0.r523788/680001 K 4 math V 26 dir 1-162.0.r523788/728322 K 4 misc V 25 dir 7-35.0.r523788/757622 K 10 multimedia V 26 dir d-333.0.r523788/782867 K 3 net V 25 dir 1-22.0.r523788/866765 K 6 net-im V 29 dir 15-11144.0.r523788/877631 K 8 net-mgmt V 27 dir r-1011.0.r523788/900074 K 7 net-p2p V 28 dir g-29106.0.r523788/908949 K 4 news V 24 dir 1-145.0.r523591/5789 K 6 polish V 27 dir tv-38973.0.r522913/2383 K 10 ports-mgmt V 25 dir 1-5132.0.r523745/5556 K 10 portuguese V 28 dir 1-17842.0.r520009/165560 K 5 print V 24 dir 1-79.0.r523463/14033 K 7 russian V 25 dir 1-1559.0.r521629/3177 K 7 science V 27 dir n-5356.0.r523788/929250 K 8 security V 26 dir 1-269.0.r523788/999896 K 6 shells V 22 dir w-6.0.r522703/4257 K 8 sysutils V 27 dir b-339.0.r523788/1077669 K 8 textproc V 26 dir 1-322.0.r523721/101804 K 9 ukrainian V 28 dir g-39704.0.r520009/169623 K 10 vietnamese V 27 dir 1-4812.0.r520009/171322 K 3 www V 27 dir 1-114.0.r523788/1223405 K 3 x11 V 24 dir 1-16.0.r523696/27000 K 10 x11-clocks V 27 dir 1-931.0.r522541/1386124 K 11 x11-drivers V 27 dir 1-157567.0.r521606/4371 K 6 x11-fm V 24 dir 1-691.0.r523246/2480 K 9 x11-fonts V 25 dir 1-543.0.r523724/13977 K 11 x11-servers V 26 dir 1n-710.0.r521430/10230 K 10 x11-themes V 29 dir 1-14410.0.r523121/1105277 K 12 x11-toolkits V 25 dir 1-120.0.r523366/90797 K 6 x11-wm V 25 dir 1-40.0.r523601/817379 END ENDREP id: 2-1.0.r523791/11464 type: dir pred: 2-1.0.r523790/62626 count: 515100 text: 523791 7876 3575 0 7a406d14a3ff2c4bd8e0109dae510bb4 props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / PLAIN K 8 branches V 24 dir 0-1.0.r523744/152500 K 4 head V 23 dir 2-1.0.r523791/11464 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r523251/1643 K 4 tags V 22 dir 8-1.0.r514565/5542 END ENDREP id: 0.0.r523791/11901 type: dir pred: 0.0.r523790/63065 count: 523791 text: 523791 11682 206 0 eb42e62184b6131a17b24660295b741d props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 56 _4.0.t523790-b85r add-file true true /head/astro/merkaartor/files/patch-src-ImportExport-ImportExportGdal.h 11901 12125