template files: remove all relative paths to re-eanable to use "new from template"

- this brings back all our template files (they are no example files, would have been a regression otherwise because LyX 2.0 offers them already in "new from template")
- the thesis files will stay in the examples folder for now until we have a real fiix for bug #8643

RELEASE-NOTES

@@ -183,8 +183,7 @@ The following LyX key bindings have been changed:
 
 The following LyX documents have been moved:
 
-- 'AEA', 'JASA', 'springer', 'ACM-siggraph', and 'thesis' have been moved
-  from templates to examples (see #8643).
+- all thesis template files have been moved to the examples folder
 
 
 The following metadata files have been added to the tarball:

lib/Makefile.am

@@ -214,34 +214,6 @@ dist_slexamples_DATA = \
 	examples/sl/primer_surov.lyx \
 	examples/sl/splash.lyx
 
-springerexamplesdir = $(pkgdatadir)/examples/springer
-dist_springerexamples_DATA = \
-	examples/springer/svjour3.lyx \
-	examples/springer/svmono_acknow.lyx \
-	examples/springer/svmono_acronym.lyx \
-	examples/springer/svmono_appendix.lyx \
-	examples/springer/svmono_book-master.lyx \
-	examples/springer/svmono_chapter.lyx \
-	examples/springer/svmono_dedication.lyx \
-	examples/springer/svmono_foreword.lyx \
-	examples/springer/svmono_glossary.lyx \
-	examples/springer/svmono_part.lyx \
-	examples/springer/svmono_preface.lyx \
-	examples/springer/svmono_referenc.lyx \
-	examples/springer/svmono_solutions.lyx \
-	examples/springer/svmult_acknow.lyx \
-	examples/springer/svmult_acronym.lyx \
-	examples/springer/svmult_appendix.lyx \
-	examples/springer/svmult_author.lyx \
-	examples/springer/svmult_cblist.lyx \
-	examples/springer/svmult_dedication.lyx \
-	examples/springer/svmult_editor-master.lyx \
-	examples/springer/svmult_foreword.lyx \
-	examples/springer/svmult_glossary.lyx \
-	examples/springer/svmult_part.lyx \
-	examples/springer/svmult_preface.lyx \
-	examples/springer/svmult_referenc.lyx
-
 skexamplesdir = $(pkgdatadir)/examples/sk
 dist_skexamples_DATA = \
 	examples/sk/splash.lyx
@@ -272,14 +244,11 @@ dist_ukexamples_DATA = \
 
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = \
-	examples/ACM-siggraph.lyx \
-	examples/AEA.lyx \
 	examples/Braille.lyx \
 	examples/CV-image.eps \
 	examples/CV-image.png \
 	examples/Foils.lyx \
 	examples/ItemizeBullets.lyx \
-	examples/JASA.lyx \
 	examples/Literate.lyx \
 	examples/aa_sample.lyx \
 	examples/aas_sample.lyx \
@@ -2123,7 +2092,9 @@ templatesdir = $(pkgdatadir)/templates
 dist_templates_DATA = \
 	templates/aa.lyx \
 	templates/aastex.lyx \
+	templates/ACM-siggraph.lyx \
 	templates/ACM-sigplan.lyx \
+	templates/AEA.lyx \
 	templates/AGUTeX.lyx \
 	templates/APA.lyx \
 	templates/APA6.lyx \
@@ -2148,6 +2119,7 @@ dist_templates_DATA = \
 	templates/IJMPC.lyx \
 	templates/IJMPD.lyx \
 	templates/IOP-article.lyx \
+	templates/JASA.lyx \
 	templates/JSS-article.lyx \
 	templates/kluwer.lyx \
 	templates/koma-letter2.lyx \
@@ -2159,6 +2131,34 @@ dist_templates_DATA = \
 	templates/revtex4-1.lyx \
 	templates/slides.lyx
 
+springertemplatesdir = $(pkgdatadir)/templates/springer
+dist_springertemplates_DATA = \
+	templates/springer/svjour3.lyx \
+	templates/springer/svmono_acknow.lyx \
+	templates/springer/svmono_acronym.lyx \
+	templates/springer/svmono_appendix.lyx \
+	templates/springer/svmono_book-master.lyx \
+	templates/springer/svmono_chapter.lyx \
+	templates/springer/svmono_dedication.lyx \
+	templates/springer/svmono_foreword.lyx \
+	templates/springer/svmono_glossary.lyx \
+	templates/springer/svmono_part.lyx \
+	templates/springer/svmono_preface.lyx
+	templates/springer/svmono_referenc.lyx \
+	templates/springer/svmono_solutions.lyx \
+	templates/springer/svmult_acknow.lyx \
+	templates/springer/svmult_acronym.lyx \
+	templates/springer/svmult_appendix.lyx \
+	templates/springer/svmult_author.lyx \
+	templates/springer/svmult_cblist.lyx \
+	templates/springer/svmult_dedication.lyx \
+	templates/springer/svmult_editor-master.lyx \
+	templates/springer/svmult_foreword.lyx \
+	templates/springer/svmult_glossary.lyx \
+	templates/springer/svmult_part.lyx \
+	templates/springer/svmult_preface.lyx \
+	templates/springer/svmult_referenc.lyx
+
 texdir = $(pkgdatadir)/tex
 dist_tex_DATA = \
 	tex/broadway.cls \

lib/templates/ACM-siggraph.lyx

@@ -387,9 +387,22 @@ radiosity, global illumination, constant time
 \end_layout
 
 \begin_layout Teaser
-\begin_inset Graphics
-	filename beamer-icsi-logo.pdf
-	width 40col%
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "40col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+remove this box by an image
+\end_layout
 
 \end_inset
 
@@ -467,7 +480,7 @@ Citations can be done this way
 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "Jobs95"
+key "proceedings-full"
 
 \end_inset
 
@@ -480,7 +493,7 @@ key "Jobs95"
 status open
 
 \begin_layout Plain Layout
-Jobs95
+proceedings-full
 \end_layout
 
 \end_inset
@@ -498,7 +511,7 @@ Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit
 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "Pellacini:2005:LAH"
+key "incollection-full"
 
 \end_inset
 
@@ -509,7 +522,7 @@ key "Pellacini:2005:LAH"
 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "notes2002"
+key "booklet-full"
 
 \end_inset
 
@@ -522,7 +535,7 @@ key "notes2002"
 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "Park:2006:DSI"
+key "whole-set"
 
 \end_inset
 
@@ -815,7 +828,7 @@ To Robert, for all the bagels.
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../examples/biblioExample"
+bibfiles "xampl"
 options "acmsiggraph"
 
 \end_inset

lib/templates/AEA.lyx

@@ -597,7 +597,7 @@ all cited references
 s put one in: 
 \begin_inset CommandInset citation
 LatexCommand citet
-key "Cotton1999"
+key "techreport-full"
 
 \end_inset
 
@@ -607,7 +607,7 @@ key "Cotton1999"
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../examples/biblioExample"
+bibfiles "xampl"
 options "aea"
 
 \end_inset

lib/templates/JASA.lyx

@@ -328,7 +328,7 @@ Introduction
 Bla bla, as listed in 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "Parkin2005,LComp2004"
+key "whole-collection,proceedings-full"
 
 \end_inset
 
@@ -458,7 +458,7 @@ jasanum
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../examples/biblioExample"
+bibfiles "xampl"
 options "jasaauthyear"
 
 \end_inset

lib/templates/springer/svjour3.lyx

@@ -504,14 +504,14 @@ name "sec:Section-title"
 Text with citations 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "Bringhurst2005"
+key "whole-collection"
 
 \end_inset
 
 , 
 \begin_inset CommandInset citation
 LatexCommand cite
-key "Jobs95"
+key "techreport-full"
 
 \end_inset
 
@@ -915,7 +915,7 @@ ftp://ftp.springer.de/pub/tex/latex/svjour3/bibtex
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../../examples/biblioExample"
+bibfiles "xampl"
 options "bibtotoc,spbasic"
 
 \end_inset

lib/templates/springer/svmono_appendix.lyx

@@ -193,8 +193,22 @@ sidecaption[t]
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../CV-image.png
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "25col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+replace this box by an image
+\end_layout
 
 \end_inset
 

lib/templates/springer/svmono_chapter.lyx

@@ -446,9 +446,22 @@ sidecaption
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../CV-image.png
-	scale 65
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "7.5cm"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+replace this box by an image
+\end_layout
 
 \end_inset
 
@@ -641,8 +654,22 @@ sidecaption[t]
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../CV-image.png
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "25col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+replace this box by an image
+\end_layout
 
 \end_inset
 

lib/templates/springer/svmult_appendix.lyx

@@ -192,8 +192,22 @@ sidecaption[t]
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../CV-image.png
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "25col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+replace this box by an image
+\end_layout
 
 \end_inset
 

lib/templates/springer/svmult_author.lyx

@@ -611,9 +611,22 @@ sidecaption
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../CV-image.png
-	scale 65
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "7.5cm"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+replace this box by an image
+\end_layout
 
 \end_inset
 
@@ -798,8 +811,22 @@ sidecaption[t]
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../CV-image.png
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+use_makebox 0
+width "25col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+replace this box by an image
+\end_layout
 
 \end_inset