SOURCES: dxsamples-unused_bin.patch (NEW), dxsamples-DESTDIR.patch...

Sat Feb 4 13:27:17 CET 2006

Author: maciek2w                     Date: Sat Feb  4 12:27:17 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- packed examples
- rel. 9

---- Files affected:
SOURCES:
   dxsamples-unused_bin.patch (NONE -> 1.1)  (NEW), dxsamples-DESTDIR.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/dxsamples-unused_bin.patch
diff -u /dev/null SOURCES/dxsamples-unused_bin.patch:1.1

--- /dev/null	Sat Feb  4 13:27:17 2006
+++ SOURCES/dxsamples-unused_bin.patch	Sat Feb  4 13:27:12 2006
@@ -0,0 +1,9 @@
+--- dx-4.3.2/dxsamples-4.3.2/data/Makefile.am.orig	2006-02-04 11:39:22.000000000 +0100
++++ dx-4.3.2/dxsamples-4.3.2/data/Makefile.am	2006-02-04 11:40:20.000000000 +0100
+@@ -3,5 +3,5 @@
+ 
+ datadir = $(prefix)/dx/samples/data
+ 
+-data_DATA =  2D2ormorevarnotseries.data 2D2ormorevarnotseries.general 3D2ormorevarnotseries.data 3D2ormorevarnotseries.general CO2.general CO2.lis CO2fragment.lis FacesLoopsEdges.dx FacesLoopsEdges_hole.dx MOS_key.txt MOS_lookup.txt MOS_state_order.txt MOS_states.dx MOS_zips.dx MRI.data Polylines.dx ROM_ozone.dx README background.tiff block_example.data block_example.general blue_yellow.cm categorical.data categorical.data1 census.general census.spreadsheet census.tab census_normalized.dx cloudwater.dx colo_elev.general colorado.tiff colorado_elev.vit cyan_red.cm cylinder.rgb cylinder.size cylinder.tiff datadepconnections.dx datawithattribute.dx deformedregular.dx dx_logo.gif dx_logo2.tif dx_logo.tiff external.data externalfilter externalfilter.c externalfilter_alphax externalfilter_hp700 externalfilter_ibm6000 externalfilter_sgi externalfilter_solaris fontlayout.dx general.exampledata general.exampleheader griddeddata.data grocery.txt group.dx head_slice.dx heat.cm homeown
 .txt hyper.dx image.dx image.general imide.rgb imide.size imide_potential.dx invalid_field.bin invalid_field.dx irregirreg2.bin irregirreg2.dx irregular.dx labelled_series.dx labels.dx magnetism.dx majority.data mixed_freq.cm mri.general multigrid1.dx multigrid2.dx multigrid3.dx npp.dx oriented_labels.dx pos_conn.data product1.dx product2.dx rain.cm rainwater.dx record_datafile record_deformed record_deformed.general record_depconnections record_depconnections.general record_multiscalar record_multiscalar.general record_multiscalardepconn record_multiscalardepconn.general record_multiscalarmixed record_multiscalarmixed.general record_scalar record_scalar.general record_scalarvector1 record_scalarvector1.general record_scalarvector2 record_scalarvector2.general record_scattered.general record_series record_series.general record_vectordata1 record_vectordata1.general record_vectordata2 record_vectordata2.general record_withheader record_withheader.general regseries.dx regular.
 dx regularskewed.dx salesdata.data salesdata.txt sampletext.dx segmented_black-red.cm segmented_green-white.cm segmented_high-freq.cm segmented_hue.cm segmented_low-freq.cm series.dx seriesdata.dx solid.dx southeastern_topo.dx spreadsheet_2var spreadsheet_2var.general spreadsheet_deformed spreadsheet_deformed.general spreadsheet_layout.general spreadsheet_scattered.general spreadsheet_series.general storm_data.dx temp_wind.general temp_wind.lis temperature.dx test.hdf topo_one_deg.dx topography_km-gray.cm topography_km.cm topography_m-gray.cm topography_m.cm velocity.dx violet_to_white.cm watermolecule.dx wind.dx windbarbs.dx windbarbsdata.dx zipcode.data
++data_DATA =  2D2ormorevarnotseries.data 2D2ormorevarnotseries.general 3D2ormorevarnotseries.data 3D2ormorevarnotseries.general CO2.general CO2.lis CO2fragment.lis FacesLoopsEdges.dx FacesLoopsEdges_hole.dx MOS_key.txt MOS_lookup.txt MOS_state_order.txt MOS_states.dx MOS_zips.dx MRI.data Polylines.dx ROM_ozone.dx README background.tiff block_example.data block_example.general blue_yellow.cm categorical.data categorical.data1 census.general census.spreadsheet census.tab census_normalized.dx cloudwater.dx colo_elev.general colorado.tiff colorado_elev.vit cyan_red.cm cylinder.rgb cylinder.size cylinder.tiff datadepconnections.dx datawithattribute.dx deformedregular.dx dx_logo.gif dx_logo2.tif dx_logo.tiff external.data externalfilter externalfilter.c fontlayout.dx general.exampledata general.exampleheader griddeddata.data grocery.txt group.dx head_slice.dx heat.cm homeown.txt hyper.dx image.dx image.general imide.rgb imide.size imide_potential.dx invalid_field.bin invalid_field
 .dx irregirreg2.bin irregirreg2.dx irregular.dx labelled_series.dx labels.dx magnetism.dx majority.data mixed_freq.cm mri.general multigrid1.dx multigrid2.dx multigrid3.dx npp.dx oriented_labels.dx pos_conn.data product1.dx product2.dx rain.cm rainwater.dx record_datafile record_deformed record_deformed.general record_depconnections record_depconnections.general record_multiscalar record_multiscalar.general record_multiscalardepconn record_multiscalardepconn.general record_multiscalarmixed record_multiscalarmixed.general record_scalar record_scalar.general record_scalarvector1 record_scalarvector1.general record_scalarvector2 record_scalarvector2.general record_scattered.general record_series record_series.general record_vectordata1 record_vectordata1.general record_vectordata2 record_vectordata2.general record_withheader record_withheader.general regseries.dx regular.dx regularskewed.dx salesdata.data salesdata.txt sampletext.dx segmented_black-red.cm segmented_green-white.
 cm segmented_high-freq.cm segmented_hue.cm segmented_low-freq.cm series.dx seriesdata.dx solid.dx southeastern_topo.dx spreadsheet_2var spreadsheet_2var.general spreadsheet_deformed spreadsheet_deformed.general spreadsheet_layout.general spreadsheet_scattered.general spreadsheet_series.general storm_data.dx temp_wind.general temp_wind.lis temperature.dx test.hdf topo_one_deg.dx topography_km-gray.cm topography_km.cm topography_m-gray.cm topography_m.cm velocity.dx violet_to_white.cm watermolecule.dx wind.dx windbarbs.dx windbarbsdata.dx zipcode.data
+ EXTRA_DIST = $(data_DATA)

================================================================
Index: SOURCES/dxsamples-DESTDIR.patch
diff -u SOURCES/dxsamples-DESTDIR.patch:1.1 SOURCES/dxsamples-DESTDIR.patch:1.2
--- SOURCES/dxsamples-DESTDIR.patch:1.1	Fri May  6 15:24:08 2005
+++ SOURCES/dxsamples-DESTDIR.patch	Sat Feb  4 13:27:12 2006
@@ -265,3 +265,37 @@
  
  uninstall-local:
  	rm $(datadir)/makefile
+--- dxsamples-4.3.2/java/Makefile.am.orig	2006-02-04 11:59:32.000000000 +0100
++++ dxsamples-4.3.2/java/Makefile.am	2006-02-04 11:59:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+  
+-javasampdir = $(prefix)/dx/java/htmlpages
++javasampdir = $(prefix)/dx/samples/java/htmlpages
+ javasamp_DATA = $(WEB_FILES)
+ EXTRA_DIST = $(WEB_FILES)
+  
+--- dxsamples-4.3.2/java/nets/Makefile.am.orig	2006-02-04 12:34:45.000000000 +0100
++++ dxsamples-4.3.2/java/nets/Makefile.am	2006-02-04 12:34:55.000000000 +0100
+@@ -1,4 +1,4 @@
+-javanetsdir = $(prefix)/dx/java/server/nets
++javanetsdir = $(prefix)/dx/samples/java/server/nets
+ javanets_DATA = $(NET_FILES)
+ EXTRA_DIST = $(NET_FILES)
+ NET_FILES = AutoInsurance.cfg AutoInsurance.net \
+--- dxsamples-4.3.2/java/userdata/Makefile.am.orig	2006-02-04 12:33:39.000000000 +0100
++++ dxsamples-4.3.2/java/userdata/Makefile.am	2006-02-04 12:33:56.000000000 +0100
+@@ -1,4 +1,4 @@
+-javadatadir = $(prefix)/dx/java/server/userdata
++javadatadir = $(prefix)/dx/samples/java/server/userdata
+ DATA_FILES = AutoInsurance.txt CCAll.dx Makefile.am Norm.dx apt.txt arf.txt asr.txt enhigh.cxn enhigh.txt enlow.cxn enlow.txt ibm94.txt ibm95.txt ibm96.txt mf1.txt npvcall.cm npvcall2.cm option.cm
+ javadata_DATA = $(DATA_FILES)
+ EXTRA_DIST = $(DATA_FILES)
+--- dxsamples-4.3.2/java/usermacros/Makefile.am.orig	2006-02-04 12:39:29.000000000 +0100
++++ dxsamples-4.3.2/java/usermacros/Makefile.am	2006-02-04 12:39:35.000000000 +0100
+@@ -1,4 +1,4 @@
+-javamacrodir = $(prefix)/dx/java/server/usermacros
++javamacrodir = $(prefix)/dx/samples/java/server/usermacros
+ 
+ MACRO_FILES = ClassifyMacro.net Legend2Macro.net MOSFromLongLat.net \
+ 	bschols.net kmeansmacro.net logn.net optsurf.net \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/dxsamples-DESTDIR.patch?r1=1.1&r2=1.2&f=u

