[glabels/global-template] Merged CD disc label with included rectangular labels

[Mario BlÃttermann <mariobl src gnome org>]

commit 9ab6ad75e2ed04e9edf5cbf0c86d86751060f518
Author: Mario BlÃttermann <mario blaettermann gmail com>
Date:   Fri Apr 20 22:38:49 2012 +0200

    Merged CD disc label with included rectangular labels

 templates/jac-iso-templates.xml |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/templates/jac-iso-templates.xml b/templates/jac-iso-templates.xml
index 7f5e4f1..18d6cb6 100644
--- a/templates/jac-iso-templates.xml
+++ b/templates/jac-iso-templates.xml
@@ -10,20 +10,16 @@
   <!-- JAC CD label sheet with rectangular labels.                          -->
   <!-- ==================================================================== -->
 
-  <Template brand="JAC" part="987349-1" size="A4" _description="CD/DVD Labels">
+  <Template brand="JAC" part="987349" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
+    <Meta category="rectangle-label"/>
     <Label-cd id="0" radius="58mm" hole="20.8mm" waste="0mm">
       <Markup-margin size="3.175mm"/>
       <Layout nx="1" ny="2" x0="5.5mm" y0="5.5mm" dx="116mm" dy="169mm"/>
       <Layout nx="1" ny="1" x0="87.5mm" y0="90mm" dx="116mm" dy="116mm"/>
     </Label-cd>
-  </Template>
-
-  <Template brand="JAC" part="987349-2" size="A4" _description="Rectangular labels">
-    <Meta category="label"/>
-    <Meta category="rectangle-label"/>
-    <Label-rectangle id="0" width="70mm" height="34mm" round="1.2mm" x_waste="5mm" y_waste="1.5mm">
+    <Label-rectangle id="1" width="70mm" height="34mm" round="1.2mm" x_waste="5mm" y_waste="1.5mm">
       <Markup-margin size="2mm"/>
       <Layout nx="1" ny="2" x0="133.5mm" y0="5.5mm" dx="80mm" dy="39mm"/>
       <Layout nx="1" ny="2" x0="133mm" y0="216.5mm" dx="80mm" dy="39mm"/>