[SCM] live-build branch, debian-next, updated. debian/3.0_a51-1-22-g495a237
Daniel Baumann
daniel at debian.org
Wed Jul 18 20:09:40 UTC 2012
The following commit has been merged in the debian-next branch:
commit 495a237cd2c53cea7f97bba13b41299c91ff2fd0
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 18 22:10:15 2012 +0200
Slightly updating strings in splash.svg for better organization of the information presented.
diff --git a/share/bootloaders/isolinux/splash.svg.in b/share/bootloaders/isolinux/splash.svg.in
index d27a98c..5cd100b 100644
--- a/share/bootloaders/isolinux/splash.svg.in
+++ b/share/bootloaders/isolinux/splash.svg.in
@@ -15,7 +15,7 @@
id="svg3320"
version="1.1"
inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="splash.svg">
+ sodipodi:docname="splash.svg.in">
<defs
id="defs3322">
<radialGradient
@@ -211,7 +211,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -239,46 +239,56 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3913">@PROJECT@ @DISTRIBUTION@ @VERSION@ @ARCHITECTURE@</tspan><tspan
+ id="tspan3045">@PROJECT@ @VERSION@ (@DISTRIBUTION@")</tspan><tspan
y="639.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3915">@DESCRIPTION@ (@YEAR at -@MONTH at -@DAY@ @HOUR@:@MINUTE@:@SECOND@)</tspan><tspan
+ id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3098" /><tspan
+ id="tspan3037" /><tspan
y="679.20679"
x="190.68135"
sodipodi:role="line"
- style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3102">linux @LINUX_VERSIONS@</tspan><tspan
+ style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+ id="tspan3039">Build: @YEAR at -@MONTH at -@DAY@ @HOUR@:@MINUTE@:@SECOND@</tspan><tspan
y="699.20673"
x="190.68135"
sodipodi:role="line"
- style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3076">live-build @LIVE_BUILD_VERSION@</tspan><tspan
+ style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+ id="tspan3098" /><tspan
y="719.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3102">linux: @LINUX_VERSIONS@</tspan><tspan
y="739.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3076">live-build: @LIVE_BUILD_VERSION@</tspan><tspan
y="759.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3012">live-tools @LIVE_TOOLS_VERSION@</tspan><tspan
+ id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
+ id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ y="799.20654"
+ x="190.68135"
+ sodipodi:role="line"
+ style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
+ id="tspan3012">live-tools: @LIVE_TOOLS_VERSION@</tspan><tspan
+ y="819.20654"
+ x="190.68135"
+ sodipodi:role="line"
+ style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3066" /></text>
<text
xml:space="preserve"
diff --git a/share/bootloaders/pxelinux/splash.svg.in b/share/bootloaders/pxelinux/splash.svg.in
index d27a98c..5cd100b 100644
--- a/share/bootloaders/pxelinux/splash.svg.in
+++ b/share/bootloaders/pxelinux/splash.svg.in
@@ -15,7 +15,7 @@
id="svg3320"
version="1.1"
inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="splash.svg">
+ sodipodi:docname="splash.svg.in">
<defs
id="defs3322">
<radialGradient
@@ -211,7 +211,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -239,46 +239,56 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3913">@PROJECT@ @DISTRIBUTION@ @VERSION@ @ARCHITECTURE@</tspan><tspan
+ id="tspan3045">@PROJECT@ @VERSION@ (@DISTRIBUTION@")</tspan><tspan
y="639.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3915">@DESCRIPTION@ (@YEAR at -@MONTH at -@DAY@ @HOUR@:@MINUTE@:@SECOND@)</tspan><tspan
+ id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3098" /><tspan
+ id="tspan3037" /><tspan
y="679.20679"
x="190.68135"
sodipodi:role="line"
- style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3102">linux @LINUX_VERSIONS@</tspan><tspan
+ style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+ id="tspan3039">Build: @YEAR at -@MONTH at -@DAY@ @HOUR@:@MINUTE@:@SECOND@</tspan><tspan
y="699.20673"
x="190.68135"
sodipodi:role="line"
- style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3076">live-build @LIVE_BUILD_VERSION@</tspan><tspan
+ style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+ id="tspan3098" /><tspan
y="719.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3102">linux: @LINUX_VERSIONS@</tspan><tspan
y="739.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3076">live-build: @LIVE_BUILD_VERSION@</tspan><tspan
y="759.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3012">live-tools @LIVE_TOOLS_VERSION@</tspan><tspan
+ id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
+ id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ y="799.20654"
+ x="190.68135"
+ sodipodi:role="line"
+ style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
+ id="tspan3012">live-tools: @LIVE_TOOLS_VERSION@</tspan><tspan
+ y="819.20654"
+ x="190.68135"
+ sodipodi:role="line"
+ style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3066" /></text>
<text
xml:space="preserve"
diff --git a/share/bootloaders/syslinux/splash.svg.in b/share/bootloaders/syslinux/splash.svg.in
index d27a98c..5cd100b 100644
--- a/share/bootloaders/syslinux/splash.svg.in
+++ b/share/bootloaders/syslinux/splash.svg.in
@@ -15,7 +15,7 @@
id="svg3320"
version="1.1"
inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="splash.svg">
+ sodipodi:docname="splash.svg.in">
<defs
id="defs3322">
<radialGradient
@@ -211,7 +211,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -239,46 +239,56 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3913">@PROJECT@ @DISTRIBUTION@ @VERSION@ @ARCHITECTURE@</tspan><tspan
+ id="tspan3045">@PROJECT@ @VERSION@ (@DISTRIBUTION@")</tspan><tspan
y="639.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3915">@DESCRIPTION@ (@YEAR at -@MONTH at -@DAY@ @HOUR@:@MINUTE@:@SECOND@)</tspan><tspan
+ id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
- id="tspan3098" /><tspan
+ id="tspan3037" /><tspan
y="679.20679"
x="190.68135"
sodipodi:role="line"
- style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3102">linux @LINUX_VERSIONS@</tspan><tspan
+ style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+ id="tspan3039">Build: @YEAR at -@MONTH at -@DAY@ @HOUR@:@MINUTE@:@SECOND@</tspan><tspan
y="699.20673"
x="190.68135"
sodipodi:role="line"
- style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3076">live-build @LIVE_BUILD_VERSION@</tspan><tspan
+ style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+ id="tspan3098" /><tspan
y="719.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3102">linux: @LINUX_VERSIONS@</tspan><tspan
y="739.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3076">live-build: @LIVE_BUILD_VERSION@</tspan><tspan
y="759.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3012">live-tools @LIVE_TOOLS_VERSION@</tspan><tspan
+ id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
+ id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ y="799.20654"
+ x="190.68135"
+ sodipodi:role="line"
+ style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
+ id="tspan3012">live-tools: @LIVE_TOOLS_VERSION@</tspan><tspan
+ y="819.20654"
+ x="190.68135"
+ sodipodi:role="line"
+ style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3066" /></text>
<text
xml:space="preserve"
--
live-build
More information about the debian-live-changes
mailing list