Permalink
Browse files

Merge branch 'integration'

  • Loading branch information...
2 parents 2e6eead + c83ebb6 commit 138d7f65af8c0df8db01643219230a751a80a5b9 @kreincke kreincke committed Mar 6, 2013
Showing with 482,740 additions and 4,828 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 000-branch-master
  3. +17 −0 CHANGES
  4. +4 −4 Makefile
  5. +1 −1 bibfiles/oscCopiedButNotRead.bib
  6. +752 −10 bibfiles/oscResourcesDe.bib
  7. +773 −25 bibfiles/oscResourcesEn.bib
  8. +12 −8 btexmat/oscBibDataCheckEn.tex
  9. 0 btexmat/oscBibRevAllDe.tex
  10. 0 btexmat/oscBibRevAllEn.tex
  11. 0 btexmat/oscBibRevCopiedButNotRead.tex
  12. 0 btexmat/oscBibRevNextAction.tex
  13. 0 btexmat/oscBibRevResourcesDe.tex
  14. 0 btexmat/oscBibRevResourcesEn.tex
  15. 0 btexmat/oscHyphenationDeInc.tex
  16. +3 −1 btexmat/oscHyphenationEnInc.tex
  17. 0 btexmat/oscJbibCfgDeInc.tex
  18. +8 −8 btexmat/oscJbibCfgEnInc.tex
  19. +7 −7 btexmat/oscLicenseFootnoteInc.tex
  20. +10 −14 btexmat/oscLicenseHintInc.tex
  21. +3 −1 btexmat/oscNclAbbreviationsDeInc.tex
  22. +19 −2 btexmat/oscNclAbbreviationsEnInc.tex
  23. +24 −24 btexmat/oscNclJournalsInc.tex
  24. +53 −49 extracts/arlBriVol2004a.tex
  25. +49 −45 extracts/breGlaGra2008a.tex
  26. +71 −67 extracts/bruHarPicCreFieHen2004a.tex
  27. +58 −54 extracts/buchtala2007a.tex
  28. +38 −34 extracts/denicolo2010a.tex
  29. +126 −122 extracts/eckl2004a.tex
  30. +20 −16 extracts/euler2006a.tex
  31. +24 −20 extracts/ifross2005a.tex
  32. +6 −2 extracts/jaeMet2002a06a11a.tex
  33. +41 −37 extracts/kaes2008a.tex
  34. +85 −81 extracts/koglin2007a.tex
  35. +11 −7 extracts/kreutzer2008a.tex
  36. +22 −17 extracts/kreutzer2008b.tex
  37. +9 −5 extracts/kreutzer2008c.tex
  38. +70 −66 extracts/mundhenke2007a.tex
  39. +273 −270 extracts/oberhem2008a.tex
  40. +74 −70 extracts/renVetRexKet2005a.tex
  41. +34 −30 extracts/sebald2008a.tex
  42. +13 −9 extracts/seeKra2008a.tex
  43. +69 −65 extracts/spindler2004a.tex
  44. +18 −14 extracts/stallman1984a.tex
  45. +9 −5 extracts/stallman1994a.tex
  46. +29 −25 extracts/stallman1996a.tex
  47. +16 −12 extracts/stallman1996b.tex
  48. +25 −21 extracts/stallman1996c.tex
  49. +24 −20 extracts/stallman1998a.tex
  50. +73 −69 extracts/stallman1999a.tex
  51. +23 −19 extracts/stallman2000a.tex
  52. +56 −52 extracts/stallman2001a.tex
  53. +4 −0 extracts/stallman2002b.tex
  54. +33 −29 extracts/suchomski2011a.tex
  55. +29 −25 extracts/taubert2006a.tex
  56. +96 −92 extracts/viesel2006a.tex
  57. +10 −6 extracts/vwdjDebVEee2003a.tex
  58. +177 −173 extracts/widmer2003a.tex
  59. +80 −76 extracts/williams2002a.tex
  60. +6 −6 oslic-de.tex
  61. +95 −73 oslic-en.tex
  62. +1 −0 rel-date.tex
  63. +1 −0 rel-number.tex
  64. +0 −1 release.tex
  65. +4 −4 snippets/20110912-TopicTopoi.tex
  66. +0 −31 snippets/en/01-introduction/0100-chapterAbstractInc.tex
  67. +0 −28 snippets/en/01-introduction/0101-chapterStartInc.tex
  68. +304 −0 snippets/en/01C-IntroductionInc.tex
  69. +0 −32 snippets/en/02-prolegomena/0200-chapterAbstractInc.tex
  70. +0 −116 snippets/en/02-prolegomena/0201-why01Inc.tex
  71. +0 −91 snippets/en/02-prolegomena/0202-APC-LicenseMissedInc.tex
  72. +0 −73 snippets/en/02-prolegomena/0203-ifrossWithoutGuideInc.tex
  73. +0 −72 snippets/en/02-prolegomena/0204-AnotherCompendiumTryInc.tex
  74. +0 −130 snippets/en/02-prolegomena/0205-why02Inc.tex
  75. +0 −102 snippets/en/02-prolegomena/0206-whatInc.tex
  76. +1,538 −0 snippets/en/02C-SameIdeaDifferentLicenseModelsInc.tex
  77. +0 −35 snippets/en/03-osIdeaAndConcepts/0300-chapterAbstractInc.tex
  78. +0 −28 snippets/en/03-osIdeaAndConcepts/0301-chapterStartInc.tex
  79. +0 −40 snippets/en/03-osIdeaAndConcepts/0302-osOsiAndOsd.tex
  80. +0 −51 snippets/en/03-osIdeaAndConcepts/0303-osHistory.tex
  81. +0 −35 snippets/en/03-osIdeaAndConcepts/0304-fsVsOs.tex
  82. +3 −6 ...pets/en/{05-osImportantMinorPoints/0500-chapterAbstractInc.tex → 03C-ImportantMinorPointsInc.tex}
  83. +558 −0 snippets/en/03C-osImportantMinorPoints/0301-osAndPatentsInc.tex
  84. +102 −0 snippets/en/03C-osImportantMinorPoints/0302-derivativeWorksInc.tex
  85. +8 −8 ...ints/0503-licenseCompatibility.tex → 03C-osImportantMinorPoints/0303-licenseCompatibilityInc.tex}
  86. +2 −2 ...5-osImportantMinorPoints/0504-osAndMoney.tex → 03C-osImportantMinorPoints/0304-osAndMoneyInc.tex}
  87. +0 −39 snippets/en/04-sameIdeaDifferentLicenseModels/0400-chapterAbstractInc.tex
  88. +0 −98 snippets/en/04-sameIdeaDifferentLicenseModels/0401-chapterStartInc.tex
  89. +207 −15 snippets/en/{06-osUseCases/0602-chapterTheOslicUseCasesInc.tex → 04C-OsucConceptAndTaxonomyInc.tex}
  90. +0 −28 snippets/en/05-osImportantMinorPoints/0501-chapterStartInc.tex
  91. +0 −45 snippets/en/05-osImportantMinorPoints/0502-derivativeWorks.tex
  92. +0 −35 snippets/en/05-osImportantMinorPoints/0505-oslicAndPatents.tex
  93. +788 −0 snippets/en/05C-OsToDoListFinderInc.tex
  94. +0 −35 snippets/en/06-osUseCases/0600-chapterAbstractInc.tex
  95. +0 −187 snippets/en/06-osUseCases/0601-chapterStartInc.tex
  96. +75 −0 snippets/en/06C-OsFulfillmentByToDoListsInc.tex
  97. +534 −0 snippets/en/06C-osFulfillmentByToDoLists/0601-apacheFulfillToDoList.tex
  98. +559 −0 snippets/en/06C-osFulfillmentByToDoLists/0602-bsdFulfillToDoList.tex
  99. +271 −0 snippets/en/06C-osFulfillmentByToDoLists/0603-mitFulfillToDoList.tex
  100. +420 −0 snippets/en/06C-osFulfillmentByToDoLists/0604-msplFulfillToDoList.tex
  101. +80 −0 snippets/en/06C-osFulfillmentByToDoLists/0605-pglFulfillToDoList.tex
  102. +79 −0 snippets/en/06C-osFulfillmentByToDoLists/0606-phpFulfillToDoList.tex
  103. +80 −0 snippets/en/06C-osFulfillmentByToDoLists/0607-eplFulfillToDoList.tex
  104. +79 −0 snippets/en/06C-osFulfillmentByToDoLists/0608-euplFulfillToDoList.tex
  105. +10 −9 ...ToDoLists/0805-mitFulfillToDoList.tex → 06C-osFulfillmentByToDoLists/0609-mplFulfillToDoList.tex}
  106. +79 −0 snippets/en/06C-osFulfillmentByToDoLists/0610-lgplFulfillToDoList.tex
  107. +79 −0 snippets/en/06C-osFulfillmentByToDoLists/0611-agplFulfillToDoList.tex
  108. +78 −0 snippets/en/06C-osFulfillmentByToDoLists/0612-gplFulfillToDoList.tex
  109. +0 −35 snippets/en/07-osToDoListFinder/0700-chapterAbstractInc.tex
  110. +0 −541 snippets/en/07-osToDoListFinder/0701-chapterStartInc.tex
  111. +4 −3 snippets/en/{09-osLegalEnvironments/0900-chapterAbstractInc.tex → 07C-LegalEnvironmentsInc.tex}
  112. +0 −33 snippets/en/08-osFulfillmentByToDoLists/0800-chapterAbstractInc.tex
  113. +0 −28 snippets/en/08-osFulfillmentByToDoLists/0801-chapterStartInc.tex
  114. +0 −45 snippets/en/08-osFulfillmentByToDoLists/0802-apacheFulfillToDoList.tex
  115. +0 −529 snippets/en/08-osFulfillmentByToDoLists/0803-bsdFulfillToDoList.tex
  116. +0 −42 snippets/en/08-osFulfillmentByToDoLists/0804-gplv2FulfillToDoList.tex
  117. +2 −2 snippets/en/{0a-Conclusion/0a00-chapterAbstractInc.tex → 08C-ConclusionInc.tex}
  118. +0 −28 snippets/en/09-osLegalEnvironments/0901-chapterStartInc.tex
  119. +29 −25 ...s/en/{02-prolegomena/0207-PrintAndBibWebAndFreeWebEn.tex → 09C-Appendices/0901-BiblioHintInc.tex}
  120. +116 −0 snippets/en/09C-Appendices/0902-MythsOfOsInc.tex
  121. +469 −0 snippets/en/09C-Appendices/0903-ProlegomenaInc.tex
  122. +0 −28 snippets/en/0a-Conclusion/0a01-chapterStartInc.tex
  123. +0 −31 snippets/en/0b-Appendices/0b00-chapterAbstractInc.tex
  124. +0 −28 snippets/en/0b-Appendices/0b01-chapterStartInc.tex
  125. +0 −108 snippets/en/0b-Appendices/0b02-MythsOfOsEn.tex
  126. +38 −18 snippets/en/20110928-Changes.tex
  127. +21 −9 snippets/en/20120222-DisclaimerInc.tex
  128. +6 −2 snippets/oscSnippetFrame.tex
  129. +5 −4 snippets/oscSnippetInc.tex
  130. +14 −10 snippets/oscUbLitRecherche.tex
  131. +11 −7 templates/oscBibDataCheckDe.tex
  132. +12 −8 templates/oscBibDataCheckEn.tex
  133. +4 −0 templates/oscExtractTplDe.tex
  134. +4 −0 templates/oscExtractTplEn.tex
  135. +7 −0 templates/oslicQuotationTexlipseTemplates-enquote.xml
  136. +472,446 −0 xtras/e+d.dict
  137. +29 −0 xtras/e+d_user.dict
View
@@ -7,6 +7,7 @@
*.toc
*.url
*.bak
+*.ilg
.DS_Store
.project
.texlipse
View
@@ -0,0 +1 @@
+flag file for indicating which branch is used
View
17 CHANGES
@@ -1,3 +1,20 @@
+2012-02-16: closure of the integration of the results of the first call for reviews
+2012-02-11: integrated the received feedback
+2013-02-10: collection of
+- refactoring the structure
+- new introduction
+- improved classification chapter
+2013-02-01: collection of many improvements concerning
+- the license classification
+- the license finder
+- the set of evaluated licenses
+2012-08-17: preparation for release 0.5.0
+- added eclipse license integration structure
+- integrated dictionaries for using the eclipse spell checker methods
+2012-07-12: release 0.4.1
+- integrated csquotes into all pages
+- replaced qlqq and grqq by enquote{} for using
+ language specific quotation styles
2012-07-05: release 0.4.0
- textual improvements
2012-07-03: release 0.3.99
View
@@ -56,7 +56,7 @@ dpdf: apdf
@ latex $<
@ latex $<
@ latex $<
- @ latex2rtf -o `basename $@ .rtf`-`cat release.tex`.rtf $<
+ @ latex2rtf -o `basename $@ .rtf`-`cat re-number.tex`.rtf $<
.dvi.ps:
@ echo "### `date +'%Y%m%dT%H%M%S'`"
@@ -67,11 +67,11 @@ dpdf: apdf
@ echo "### `date +'%Y%m%dT%H%M%S'`"
@ echo "### converting $< to $@"
@ ps2pdf $<
- @ mv $@ `basename $@ .pdf`-`cat release.tex`.pdf
+ @ mv $@ `basename $@ .pdf`-`cat rel-number.tex`.pdf
dist:
- tar -czvf ../${OSLICDIR}-`cat release.tex`.tar.gz --exclude=${OSLICDIR}/ecopies/* ../${OSLICDIR}
- zip -r ../${OSLICDIR}-`cat release.tex`.zip --exclude=../${OSLICDIR}/ecopies/* ../${OSLICDIR}
+ tar -czvf ../${OSLICDIR}-`cat rel-number.tex`.tar.gz --exclude=${OSLICDIR}/ecopies/* ../${OSLICDIR}
+ zip -r ../${OSLICDIR}-`cat rel-number.tex`.zip --exclude=../${OSLICDIR}/ecopies/* ../${OSLICDIR}
clearAuxFiles:
$(foreach EXT, ${AUX_EXTS}, if [ ! "x`ls *.${EXT} 2>/dev/null`" = "x" ]; then rm *.${EXT}; fi;)
@@ -1,4 +1,4 @@
-% This file was created with JabRef 2.8.
+% This file was created with JabRef 2.8.1.
% Encoding: UTF8
@INPROCEEDINGS{AlsAsuSca2009a,
Oops, something went wrong.

0 comments on commit 138d7f6

Please sign in to comment.