[med-svn] r20570 - in trunk/packages/aegean/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2015-11-27 23:44:12 +0000 (Fri, 27 Nov 2015)
New Revision: 20570

Added:
   trunk/packages/aegean/trunk/debian/patches/adjust_datapath
   trunk/packages/aegean/trunk/debian/patches/follow_links
Modified:
   trunk/packages/aegean/trunk/debian/aegean.links
   trunk/packages/aegean/trunk/debian/patches/series
Log:
fix links, follow symlinks when creating HTML output


Modified: trunk/packages/aegean/trunk/debian/aegean.links
===================================================================
--- trunk/packages/aegean/trunk/debian/aegean.links	2015-11-27 22:52:32 UTC (rev 20569)
+++ trunk/packages/aegean/trunk/debian/aegean.links	2015-11-27 23:44:12 UTC (rev 20570)
@@ -1,4 +1,4 @@
 /usr/share/javascript/mootools/mootools.js /usr/share/aegean/vendor/mootools-core-1.3.2-full-nocompat-yc.js
 /usr/share/javascript/mootools/mootools-more.js /usr/share/aegean/vendor/mootools-more-1.3.2.1.js
 /usr/share/javascript/jquery/jquery.js /usr/share/aegean/vendor/jquery.js
-/usr/share/javascript/jquery/jquery.dataTables.js /usr/share/aegean/vendor/jquery.dataTables.js
+/usr/share/javascript/jquery-datatables/jquery.dataTables.js /usr/share/aegean/vendor/jquery.dataTables.js

Added: trunk/packages/aegean/trunk/debian/patches/adjust_datapath
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/adjust_datapath	                        (rev 0)
+++ trunk/packages/aegean/trunk/debian/patches/adjust_datapath	2015-11-27 23:44:12 UTC (rev 20570)
@@ -0,0 +1,43 @@
+Description: Adjust_datapath
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@
+ 
+ # Compilation settings
+ CC=gcc
+-CFLAGS += -Wall -DAGN_DATA_PATH='"$(prefix)/share/aegean"' -Wno-unused-result
++CFLAGS += -Wall -DAGN_DATA_PATH='"/usr/share/aegean"' -Wno-unused-result
+ GTFLAGS=prefix=$(prefix)
+ SYSTEM:=$(shell uname -s)
+ MACHINE:=$(shell uname -m)
+@@ -87,13 +87,13 @@
+ 		@ mkdir -p $(prefix)/bin/
+ 		cp data/scripts/*.p? $(prefix)/bin/.
+ 
+-uninstall:	
++uninstall:
+ 		for exe in $(INSTALL_BINS); do rm -r $(prefix)/$$exe; done
+ 		rm -r $(prefix)/include/aegean/
+ 		rm -r $(prefix)/share/aegean/
+ 		rm $(prefix)/lib/libaegean.a
+ 
+-clean:		
++clean:
+ 		rm -rf README $(BINS) libaegean.a $(AGN_OBJS) inc/core/AgnVersion.h bin/*.dSYM
+ 
+ $(AGN_OBJS):	obj/%.o : src/core/%.c inc/core/%.h inc/core/AgnVersion.h
+@@ -145,12 +145,12 @@
+ 		@ echo "[create libaegean]"
+ 		@ ar ru libaegean.a $(AGN_OBJS)
+ 
+-inc/core/AgnVersion.h:	
++inc/core/AgnVersion.h:
+ 			@ echo "[print $@]"
+ 			@ data/scripts/version.py > $@
+ 
+ test:		agn-test
+-		
++
+ 
+ agn-test:	all
+ 		@ $(MEMCHECK) bin/unittests

Added: trunk/packages/aegean/trunk/debian/patches/follow_links
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/follow_links	                        (rev 0)
+++ trunk/packages/aegean/trunk/debian/patches/follow_links	2015-11-27 23:44:12 UTC (rev 20570)
@@ -0,0 +1,12 @@
+Description: Follow_links
+--- a/src/ParsEval/pe_options.c
++++ b/src/ParsEval/pe_options.c
+@@ -265,7 +265,7 @@
+     }
+ 
+     char copy_cmd[1024];
+-    sprintf(copy_cmd,"cp -r %s/* %s", options->data_path, options->outfilename);
++    sprintf(copy_cmd,"cp -LR %s/* %s", options->data_path, options->outfilename);
+     if(options->debug)
+       fprintf(stderr, "debug: copying shared data: '%s'\n", copy_cmd);
+     if(system(copy_cmd) != 0)

Modified: trunk/packages/aegean/trunk/debian/patches/series
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/series	2015-11-27 22:52:32 UTC (rev 20569)
+++ trunk/packages/aegean/trunk/debian/patches/series	2015-11-27 23:44:12 UTC (rev 20570)
@@ -3,3 +3,5 @@
 includepaths
 add_version
 fix_m64_on_some_archs
+adjust_datapath
+follow_links