--- a/components/gutenprint/gutenprint.p5m	Thu Feb 16 05:27:59 2012 -0800
+++ b/components/gutenprint/gutenprint.p5m	Thu Feb 16 09:29:52 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -78,6 +78,8 @@
 dir path=usr/share/locale/en_GB/LC_MESSAGES
 dir path=usr/share/locale/es
 dir path=usr/share/locale/es/LC_MESSAGES
+dir path=usr/share/locale/fi
+dir path=usr/share/locale/fi/LC_MESSAGES
 dir path=usr/share/locale/fr
 dir path=usr/share/locale/fr/LC_MESSAGES
 dir path=usr/share/locale/hu
@@ -98,6 +100,8 @@
 dir path=usr/share/locale/ru/LC_MESSAGES
 dir path=usr/share/locale/sk
 dir path=usr/share/locale/sk/LC_MESSAGES
+dir path=usr/share/locale/sl
+dir path=usr/share/locale/sl/LC_MESSAGES
 dir path=usr/share/locale/sv
 dir path=usr/share/locale/sv/LC_MESSAGES
 dir path=usr/share/locale/zh_TW
@@ -148,7 +152,7 @@
 file path=usr/lib/gutenprint/5.2/modules/print-pcl.so
 file path=usr/lib/gutenprint/5.2/modules/print-ps.so
 file path=usr/lib/gutenprint/5.2/modules/print-raw.so
-file path=usr/lib/libgutenprint.so.2.0.5
+file path=usr/lib/libgutenprint.so.2.0.8
 file path=usr/lib/libgutenprintui2.so.1.0.0
 file path=usr/lib/pkgconfig/gutenprint.pc
 file path=usr/lib/pkgconfig/gutenprintui2.pc
@@ -176,6 +180,7 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/nx100.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen0.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen1.xml
@@ -191,6 +196,9 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_pigment.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
@@ -199,11 +207,14 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/x80.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/artisan.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/b500.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd.xml
 file \
     path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/pro3880.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/r1800.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/r2400.xml
@@ -240,11 +251,13 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_pigment.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/picturemate_4.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/picturemate_6.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/pro3880_ultrachrome_k3v.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_gen1.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_gen2.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_pigment.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/r800.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
@@ -255,7 +268,23 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_100.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_101.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_102.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_103.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_104.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_105.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_106.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_107.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_108.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_109.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_11.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_110.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_111.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_112.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_113.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_114.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_115.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_12.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_13.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_14.xml
@@ -351,6 +380,7 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_96.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_97.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/model/model_98.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml
@@ -401,6 +431,8 @@
 file path=usr/share/locale/el/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/es/LC_MESSAGES/gutenprint.mo
+file path=usr/share/locale/fi/LC_MESSAGES/gutenprint.mo
+file path=usr/share/locale/fr/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/hu/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/it/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/ja/LC_MESSAGES/gutenprint.mo
@@ -410,6 +442,7 @@
 file path=usr/share/locale/pt/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/ru/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/sk/LC_MESSAGES/gutenprint.mo
+file path=usr/share/locale/sl/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/sv/LC_MESSAGES/gutenprint.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
 file path=usr/share/man/man1/escputil.1
@@ -420,8 +453,8 @@
 legacy pkg=SUNWgimpprint \
     desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers" \
     name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
-license gutenprint.license license=GPLv2
-link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.5
-link path=usr/lib/libgutenprint.so.2 target=libgutenprint.so.2.0.5
+license gutenprint.license license="GPLv2, FDLv1.2"
+link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.8
+link path=usr/lib/libgutenprint.so.2 target=libgutenprint.so.2.0.8
 link path=usr/lib/libgutenprintui2.so target=libgutenprintui2.so.1.0.0
 link path=usr/lib/libgutenprintui2.so.1 target=libgutenprintui2.so.1.0.0