Clarify sponsorship dependencies (Jonas' sponsorships depend only indirectly on Google), and extend with Siri sponsored by Debian (instead of Google).

1 files changed, 27 insertions, 19 deletions

diff --git a/data/2014/europe.ttl b/data/2014/europe.ttl
index 7d55319..6198f3e 100644
--- a/data/2014/europe.ttl
+++ b/data/2014/europe.ttl
@@ -61,9 +61,9 @@
 	foaf:name "Siri Reiter" ;
 	foaf:Homepage <http://sirireiter.dk/> .
 
-:sponsorshipDebian
+:sponsorshipDebianJonas
 	rdfs:label "Debian sponsorship Paris <-> Barcelona for Jonas"@en ;
-	rdfs:comment "depends on Google, FOSDEM, Greens/EFA and EPFSUG sponsorships"@en ;
+	rdfs:comment "depends on FOSDEM, Greens/EFA and EPFSUG sponsorships, and on Siri sponsored via same route"@en ;
 	payment:payer :debian ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -72,9 +72,9 @@
 	] ;
 	payment:totalNetAmount "179.20"^^xsd:decimal .
 
-:sponsorshipDebianSplitTickets
+:sponsorshipDebianJonasSplitTickets
 	rdfs:label "Debian sponsorship Paris <-> Barcelona for Jonas"@en ;
-	rdfs:comment "depends on Google, FOSDEM, Greens/EFA and EPFSUG sponsorships"@en ;
+	rdfs:comment "depends on FOSDEM, Greens/EFA and EPFSUG sponsorships, and on Siri sponsored via same route"@en ;
 	payment:payer :debian ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -89,9 +89,9 @@
 	payment:totalNetAmount "196.90"^^xsd:decimal .
 #	payment:totalNetAmount "251.40"^^xsd:decimal .
 
-:sponsorshipDebianSoloEvent
+:sponsorshipDebianJonasSoloEvent
 	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Jonas"@en ;
-	rdfs:comment "depends on Google sponsorship"@en ;
+	rdfs:comment "depends on Siri sponsored via same route"@en ;
 	payment:payer :debian ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -100,23 +100,31 @@
 	] ;
 	payment:totalNetAmount "239.00"^^xsd:decimal .
 
-:sponsorshipDebianSoloSponsor
-	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri and Jonas"@en ;
+:sponsorshipDebianSiri
+	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
 	payment:payer :debian ;
-	payment:payee :jonas, :Siri ;
+	payment:payee :siri ;
+	payment:expenditureLine [ a payment:ExpenditureLine ;
+		payment:payment :offerDbInterrail10 ;
+		payment:netAmount "339.00"^^xsd:decimal
+	] ;
+	payment:totalNetAmount "339.00"^^xsd:decimal .
+
+:sponsorshipDebianSiriSoloEvent
+	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
+	rdfs:comment "independent from other sponsorships, but disqualifies Jonas"@en ;
+	payment:payer :debian ;
+	payment:payee :siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbInterrail5 ;
-		payment:netAmount "239.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
 		payment:payment :offerDbInterrail5 ;
 		payment:netAmount "239.00"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "478.00"^^xsd:decimal .
+	payment:totalNetAmount "239.00"^^xsd:decimal .
 
 :sponsorshipGreens
 	rdfs:label "Greens/EFA sponsorship Paris -> Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Debian, Google, FOSDEM and EPFSUG sponsorships"@en ;
+	rdfs:comment "depends on Debian, FOSDEM and EPFSUG sponsorships"@en ;
 	payment:payer :greens ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -140,7 +148,7 @@
 
 :sponsorshipGreensNoBahncard
 	rdfs:label "Greens/EFA sponsorship Paris -> Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Debian, Google, FOSDEM and EPFSUG sponsorships"@en ;
+	rdfs:comment "depends on Debian, FOSDEM and EPFSUG sponsorships"@en ;
 	payment:payer :greens ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -264,7 +272,7 @@
 
 :sponsorshipEpfsug
 	rdfs:label "EPFSUG sponsorship Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Google and Greens/EFA sponsorships incl. Bahncard"@en ;
+	rdfs:comment "depends on Greens/EFA sponsorships incl. Bahncard"@en ;
 	payment:payer :epfsug ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -281,7 +289,7 @@
 
 :sponsorshipEpfsugBahncard
 	rdfs:label "EPFSUG sponsorship Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Google and Greens/EFA sponsorships excl. Bahncard25"@en ;
+	rdfs:comment "depends on Greens/EFA sponsorships excl. Bahncard25"@en ;
 	payment:payer :epfsug ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -392,7 +400,7 @@
 
 :sponsorshipFosdem
 	rdfs:label "FOSDEM sponsorship Brussels -> Paris for Jonas"@en ;
-	rdfs:comment "depends on Debian, Google, EPFSUG and Greens/EFA sponsorships"@en ;
+	rdfs:comment "depends on Debian, EPFSUG and Greens/EFA sponsorships"@en ;
 	payment:payer :fosdem ;
 	payment:payee :jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -414,7 +422,7 @@
 	payment:totalNetAmount "339.00"^^xsd:decimal .
 
 :sponsorshipGoogle
-	rdfs:comment "independent from other sponsorships, excludes Siri from either EPFSUG or Greens/EFA event"@en ;
+	rdfs:comment "independent from other sponsorships, but disqualifies Jonas"@en ;
 	payment:payer :google ;
 	payment:payee :siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;