Merge branch '2.4' into 2.5

2008-11-01 10:14:16 +01:00 · 2008-11-01 10:14:16 +01:00 · 73bf8142a8
commit 73bf8142a8
parent d4ad8d5b25 c05bc43e85
31 changed files with 418 additions and 74 deletions
--- a/alsa-lib/.md5sum
+++ b/alsa-lib/.md5sum
@ -1 +1 @@
-4284535ff10f5e71152f8f69b325d08d  alsa-lib-1.0.17a.tar.bz2
+de60df7541fafe8c6a3397e0f105ff0e  alsa-lib-1.0.18.tar.bz2
--- a/alsa-lib/Pkgfile
+++ b/alsa-lib/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer: Tilman Sauerbeck, tilman at crux dot nu

 name=alsa-lib
-version=1.0.17a
+version=1.0.18
 release=1
 source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2)

--- a/alsa-utils/.md5sum
+++ b/alsa-utils/.md5sum
@ -1,2 +1,2 @@
-14ccd0c900bf663afb36eac6f92d41d6  alsa-utils-1.0.17.tar.bz2
+0a6b26d27cc2adfd591d91d8c155fdb7  alsa-utils-1.0.18.tar.bz2
 7ca87ae2d727887898e1feb47a48d3f9  rc.alsa
--- a/alsa-utils/Pkgfile
+++ b/alsa-utils/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: gettext, alsa-lib, dialog

 name=alsa-utils
-version=1.0.17
+version=1.0.18
 release=1
 source=(ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2 \
 	rc.alsa)
@ -12,8 +12,17 @@ source=(ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2 \
 build() {
 	cd $name-$version
 	./configure --prefix=/usr --disable-nls --mandir=/usr/man
+
+	# alsactl_init.7 is generated using xmlto, which we don't have
+	touch alsactl/alsactl_init.7
+
 	make
 	make DESTDIR=$PKG install
 	rm -rf $PKG/usr/share $PKG/usr/man/fr
+
+	# see above
+	rm -f $PKG/usr/man/man7/alsactl_init.7
+	rmdir $PKG/usr/man/man7
+
 	install -D -m 0755 $SRC/rc.alsa $PKG/etc/rc.d/alsa
 }
--- a/cairo/.footprint
+++ b/cairo/.footprint
@ -15,9 +15,9 @@ drwxr-xr-x	root/root	usr/include/cairo/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcairo.a
 -rwxr-xr-x	root/root	usr/lib/libcairo.la
-lrwxrwxrwx	root/root	usr/lib/libcairo.so -> libcairo.so.2.10800.0
-lrwxrwxrwx	root/root	usr/lib/libcairo.so.2 -> libcairo.so.2.10800.0
-rwxr-xr-x	root/root	usr/lib/libcairo.so.2.10800.0
+lrwxrwxrwx	root/root	usr/lib/libcairo.so -> libcairo.so.2.10800.2
+lrwxrwxrwx	root/root	usr/lib/libcairo.so.2 -> libcairo.so.2.10800.2
+-rwxr-xr-x	root/root	usr/lib/libcairo.so.2.10800.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-ft.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-glitz.pc
--- a/cairo/.md5sum
+++ b/cairo/.md5sum
@ -1 +1 @@
-4ea70ea87b47e92d318d4e7f5b940f47  cairo-1.8.0.tar.gz
+44d406e199c338cb60f7db32ffb32bdb  cairo-1.8.2.tar.gz
--- a/cairo/Pkgfile
+++ b/cairo/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: fontconfig, glitz, libpng, xorg-libxrender, xorg-libpixman

 name=cairo
-version=1.8.0
+version=1.8.2
 release=1
 source=(http://cairographics.org/releases/$name-$version.tar.gz)

--- a/gimp/.footprint
+++ b/gimp/.footprint
@ -433,41 +433,41 @@ drwxr-xr-x	root/root	usr/lib/gimp/2.0/plug-ins/
 -rwxr-xr-x	root/root	usr/lib/gimp/2.0/plug-ins/whirl-pinch
 -rwxr-xr-x	root/root	usr/lib/gimp/2.0/plug-ins/wind
 -rwxr-xr-x	root/root	usr/lib/libgimp-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimp-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimp-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpbase-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpbase-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpbase-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpcolor-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpcolor-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpcolor-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpconfig-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpconfig-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpconfig-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpmath-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpmath-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpmath-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpmodule-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpmodule-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpmodule-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpthumb-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpthumb-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpthumb-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpui-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpui-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpui-2.0.so.0.600.2
 -rwxr-xr-x	root/root	usr/lib/libgimpwidgets-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.600.1
-lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.600.1
-rwxr-xr-x	root/root	usr/lib/libgimpwidgets-2.0.so.0.600.1
+lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.600.2
+lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.600.2
+-rwxr-xr-x	root/root	usr/lib/libgimpwidgets-2.0.so.0.600.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gimp-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gimpthumb-2.0.pc
--- a/gimp/.md5sum
+++ b/gimp/.md5sum
@ -1 +1 @@
-2fa176d1da75575c88b01019d014744d  gimp-2.6.1.tar.bz2
+3664d12f26447c0edc3f611987b9bf2d  gimp-2.6.2.tar.bz2
--- a/gimp/Pkgfile
+++ b/gimp/Pkgfile
@ -6,7 +6,7 @@
 # Nice to have: gimp-print

 name=gimp
-version=2.6.1
+version=2.6.2
 release=1
 source=(ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2)

--- a/hpijs/.footprint
+++ b/hpijs/.footprint
@ -35,10 +35,15 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_8550-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CM1015-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CM1312_MFP_Series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CM2320_MFP_Series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CM3530_MFP.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CM4730_MFP-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CM6030_MFP-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP1510_Series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP2020_Series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP2020d_Series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP3505-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP3525.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP4005-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Color_LaserJet_CP6015-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_1200-ps.ppd.gz
@ -95,12 +100,14 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_M5035_MFP-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_M9040_M9050_MFP-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_P2015-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_P2055.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_P3004-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_P3005-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_LaserJet_P4010_P4510_Series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Mopier_240-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/HP_Mopier_320-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-2000c-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-2500c-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-910-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-915-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_1000-hpijs.ppd.gz
@ -109,51 +116,131 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2200-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2230-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2250-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2280-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2300-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2600-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_2800-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-business_inkjet_3000-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_inkjet_cp1700-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2500-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2500_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2500_series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2550-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2605-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2605dn-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2605dtn-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2700-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2700n-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2800-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2820-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2830-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_2840-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3000-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3500-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3500n-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3550-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3550n-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3600-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3700-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3700n-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3700n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_3800-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4500-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4550-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4600-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4600_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4600_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4610-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4650-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4700-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_4730mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5500-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5550-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_5m-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_8500-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_8550-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_9500-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm1015-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm1017-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1515n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1518ni-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025dn-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025n-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp2025x-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp3505-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp3525-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp4005-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-cp1160-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1100-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1120-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1125-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1200c-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1220c-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1280-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1600c-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1600cm-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_1600cn-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3320-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3325-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3420-hpijs.ppd.gz
@ -284,6 +371,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_f300_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_f4100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_f4200_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_f4210_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_f4213_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_f735-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-dj350-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-dj450-hpijs.ppd.gz
@ -300,116 +389,233 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1160-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1160_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1200-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1200-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1200n-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1200n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1220-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1220-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1220se-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1220se-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1300-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1300-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1300n-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1300n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1300xi-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320n-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320nw-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320nw-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2200-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2200-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2200_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2200_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2300-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2300-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2300_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2300_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2410-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2410-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2420-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2420-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2430-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2430-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3015-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3015-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3020-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3020-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3030-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3030-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3050-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3050-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3052-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3052-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3055-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3100-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3150-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200m-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200m-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200se-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3200se-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3330-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3380-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3380-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3390-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3390-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_3392-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4000_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4050_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4100_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4100_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4150_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4200-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4200-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4240-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4240-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4250-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4250-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4300-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4300-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4345_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4350-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4350-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4_plus-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4l-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4ml-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4ml-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4mp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4mp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4si-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4si-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4v-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_4v-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5200-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5200-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5200l-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5200l-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5200lx-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5200lx-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5l-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5mp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5mp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5p-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5p-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6l-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6mp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6p-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6p-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8000-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8000-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8000_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8100_mfp-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8100_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8100_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8150_mfp-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8150_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9000_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9000_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9040-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9040-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9040_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9050-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9050-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9050_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9055mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_9065mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1522_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m2727_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m2727nfs_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m3027_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m3035_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m4345_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2014-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015dn_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015n_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2015x_series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p2055-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p3004-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p3005-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4014-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4014-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4014dn-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4014dn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4014n-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4014n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015dn-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015dn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015n-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015tn-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015tn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015x-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4015x-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515n-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515tn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515x-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515x-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_p4515xm-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_320-hpijs-pcl3.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_320-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_4100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_4105-hpijs.ppd.gz
@ -442,6 +648,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j3500_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j3600_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j4500_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j4660_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j4680_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j5500_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j5700_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_j6400_series-hpijs.ppd.gz
@ -456,6 +664,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5300-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5400-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k550-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k850-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k8600-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_l7300-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_l7400-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_l7500-hpijs.ppd.gz
@ -512,9 +722,12 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_420_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_470_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7150-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7150~-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7200_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7200_series~-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7345-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7350-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7350~-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7400_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7550-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7600_series-hpijs.ppd.gz
@ -538,12 +751,14 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_a630_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_a710_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_a820_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_b8500_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c3100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c4100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c4200_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c4340_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c4380_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c4400_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c4500_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c5100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c5200_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_c5300_series-hpijs.ppd.gz
--- a/hpijs/.md5sum
+++ b/hpijs/.md5sum
@ -1 +1 @@
-2e20dba86abb99a3ca59d05e814ce9a1  hplip-2.8.9.tar.gz
+a9ad78c4f0d884caac6b176b3cb9bf21  hplip-2.8.10.tar.gz
--- a/hpijs/Pkgfile
+++ b/hpijs/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  ghostscript

 name=hpijs
-version=2.8.9
+version=2.8.10
 release=1
 source=(http://dl.sourceforge.net/sourceforge/hplip/hplip-$version.tar.gz)

--- a/libc-client/.md5sum
+++ b/libc-client/.md5sum
@ -1 +1 @@
-4d59ce6303cf8ef93ff51341b1ce2df7  imap-2007b.tar.Z
+80cdf8366a69417818f4d73181f16b9d  imap-2007d.tar.Z
--- a/libc-client/Pkgfile
+++ b/libc-client/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  openssl

 name=libc-client
-version=2007b
+version=2007d
 release=1
 source=(ftp://ftp.cac.washington.edu/imap/imap-$version.tar.Z)

--- a/libdrm/.md5sum
+++ b/libdrm/.md5sum
@ -1 +1 @@
-3ab868dd3e4622bf49ca194c62a1fded  libdrm-2.4.0.tar.bz2
+05feb4c5a48f1f0870a7cbe7617d6cf7  libdrm-2.4.1.tar.bz2
--- a/libdrm/Pkgfile
+++ b/libdrm/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: libpthread-stubs

 name=libdrm
-version=2.4.0
+version=2.4.1
 release=1
 source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2)

--- a/libpng/.footprint
+++ b/libpng/.footprint
@ -12,13 +12,13 @@ drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libpng.a -> libpng12.a
 lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng12.la
 lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng12.so
-lrwxrwxrwx	root/root	usr/lib/libpng.so.3 -> libpng.so.3.32.0
-rwxr-xr-x	root/root	usr/lib/libpng.so.3.32.0
+lrwxrwxrwx	root/root	usr/lib/libpng.so.3 -> libpng.so.3.33.0
+-rwxr-xr-x	root/root	usr/lib/libpng.so.3.33.0
 -rw-r--r--	root/root	usr/lib/libpng12.a
 -rwxr-xr-x	root/root	usr/lib/libpng12.la
-lrwxrwxrwx	root/root	usr/lib/libpng12.so -> libpng12.so.0.32.0
-lrwxrwxrwx	root/root	usr/lib/libpng12.so.0 -> libpng12.so.0.32.0
-rwxr-xr-x	root/root	usr/lib/libpng12.so.0.32.0
+lrwxrwxrwx	root/root	usr/lib/libpng12.so -> libpng12.so.0.33.0
+lrwxrwxrwx	root/root	usr/lib/libpng12.so.0 -> libpng12.so.0.33.0
+-rwxr-xr-x	root/root	usr/lib/libpng12.so.0.33.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng12.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpng12.pc
--- a/libpng/.md5sum
+++ b/libpng/.md5sum
@ -1 +1 @@
-df4a20c6f24a6f642ae11c9a5a4ffa7f  libpng-1.2.32.tar.bz2
+0532c28ba1b17ee2095ad50731c2c75c  libpng-1.2.33.tar.bz2
--- a/libpng/Pkgfile
+++ b/libpng/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  zlib

 name=libpng
-version=1.2.32
+version=1.2.33
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)

--- a/openbox/.md5sum
+++ b/openbox/.md5sum
@ -1 +1 @@
-32f1d6ba35210e9b440b4a2eaf00e1c6  openbox-3.4.7.3.tar.gz
+2b3da7af287e5b6ababf371b4de0cd43  openbox-3.4.7.3.tar.gz
--- a/openbox/Pkgfile
+++ b/openbox/Pkgfile
@ -5,7 +5,7 @@

 name=openbox
 version=3.4.7.3
-release=1
+release=2
 source=(http://www.icculus.org/$name/releases/$name-$version.tar.gz)

 build() {
--- a/pango/.footprint
+++ b/pango/.footprint
@ -10,6 +10,7 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/pango-1.0/
 drwxr-xr-x	root/root	usr/include/pango-1.0/pango/
 -rw-r--r--	root/root	usr/include/pango-1.0/pango/pango-attributes.h
+-rw-r--r--	root/root	usr/include/pango-1.0/pango/pango-bidi-type.h
 -rw-r--r--	root/root	usr/include/pango-1.0/pango/pango-break.h
 -rw-r--r--	root/root	usr/include/pango-1.0/pango/pango-context.h
 -rw-r--r--	root/root	usr/include/pango-1.0/pango/pango-coverage.h
@ -44,25 +45,25 @@ drwxr-xr-x	root/root	usr/include/pango-1.0/pango/
 -rw-r--r--	root/root	usr/include/pango-1.0/pango/pangoxft.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libpango-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2002.3
-lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2002.3
-rwxr-xr-x	root/root	usr/lib/libpango-1.0.so.0.2002.3
+lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2202.0
+lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2202.0
+-rwxr-xr-x	root/root	usr/lib/libpango-1.0.so.0.2202.0
 -rwxr-xr-x	root/root	usr/lib/libpangocairo-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2002.3
-lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2002.3
-rwxr-xr-x	root/root	usr/lib/libpangocairo-1.0.so.0.2002.3
+lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2202.0
+lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2202.0
+-rwxr-xr-x	root/root	usr/lib/libpangocairo-1.0.so.0.2202.0
 -rw-r--r--	root/root	usr/lib/libpangoft2-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2002.3
-lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2002.3
-rwxr-xr-x	root/root	usr/lib/libpangoft2-1.0.so.0.2002.3
+lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2202.0
+lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2202.0
+-rwxr-xr-x	root/root	usr/lib/libpangoft2-1.0.so.0.2202.0
 -rw-r--r--	root/root	usr/lib/libpangox-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.2002.3
-lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.2002.3
-rwxr-xr-x	root/root	usr/lib/libpangox-1.0.so.0.2002.3
+lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.2202.0
+lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.2202.0
+-rwxr-xr-x	root/root	usr/lib/libpangox-1.0.so.0.2202.0
 -rw-r--r--	root/root	usr/lib/libpangoxft-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.2002.3
-lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.2002.3
-rwxr-xr-x	root/root	usr/lib/libpangoxft-1.0.so.0.2002.3
+lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.2202.0
+lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.2202.0
+-rwxr-xr-x	root/root	usr/lib/libpangoxft-1.0.so.0.2202.0
 drwxr-xr-x	root/root	usr/lib/pango/
 drwxr-xr-x	root/root	usr/lib/pango/1.6.0/
 drwxr-xr-x	root/root	usr/lib/pango/1.6.0/modules/
--- a/pango/.md5sum
+++ b/pango/.md5sum
@ -1,2 +1,2 @@
-052b60a12f6b2eb4f251ab961f2b2b84  pango-1.20.5.tar.bz2
+0d4dc87f9b523e9030afccb2d05afe0b  pango-1.22.2.tar.bz2
 8b5a9003811b050cd34e6be45cf4fdd5  pango.modules
--- a/pango/Pkgfile
+++ b/pango/Pkgfile
@ -4,9 +4,9 @@
 # Depends on: cairo, glib, xorg-libsm, xorg-libxext, xorg-libxft

 name=pango
-version=1.20.5
+version=1.22.2
 release=1
-source=(http://download.gnome.org/sources/$name/1.20/$name-$version.tar.bz2 \
+source=(http://download.gnome.org/sources/$name/1.22/$name-$version.tar.bz2 \
 	pango.modules)

 build () {
--- a/uw-imap/.md5sum
+++ b/uw-imap/.md5sum
@ -1 +1 @@
-4d59ce6303cf8ef93ff51341b1ce2df7  imap-2007b.tar.Z
+80cdf8366a69417818f4d73181f16b9d  imap-2007d.tar.Z
--- a/uw-imap/Pkgfile
+++ b/uw-imap/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  openssl

 name=uw-imap
-version=2007b
+version=2007d
 release=1
 source=(ftp://ftp.cac.washington.edu/imap/imap-$version.tar.Z)

--- a/xulrunner/.footprint
+++ b/xulrunner/.footprint
@ -2116,6 +2116,8 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/mozilla-gtkmozembed-embedding.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mozilla-gtkmozembed.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mozilla-js.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/mozilla-nspr.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/mozilla-nss.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mozilla-plugin.pc
 drwxr-xr-x	root/root	usr/lib/xulrunner-1.9.0.3/
 -rwxr-xr-x	root/root	usr/lib/xulrunner-1.9.0.3/LICENSE
--- a/xulrunner/.md5sum
+++ b/xulrunner/.md5sum
@ -1,2 +1,3 @@
 e076a4a889fce0c4ca237ac30bfadb43  firefox-3.0.3-source.tar.bz2
 3a043809a9e0dbf39efe95359fcc5fe7  mozconfig
+7a5151f90cb360bc1ea911e5cf7208e9  xulrunner.diff
--- a/xulrunner/Pkgfile
+++ b/xulrunner/Pkgfile
@ -7,7 +7,7 @@ name=xulrunner
 version=1.9.0.3
 release=2
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.3/source/firefox-3.0.3-source.tar.bz2
-        mozconfig)
+        mozconfig $name.diff)

 build() {
 	export MOZ_CO_PROJECT="xulrunner"
@ -15,6 +15,8 @@ build() {

 	cd mozilla

+	patch -Np1 -i $SRC/$name.diff
+
 	# make configure accept our version of sqlite
 	sed -i -e 's/^SQLITE_VERSION=3.5.9$/SQLITE_VERSION=3.5/' configure

--- a/xulrunner/xulrunner.diff
+++ b/xulrunner/xulrunner.diff
@ -0,0 +1,114 @@
+---
+ xulrunner/installer/Makefile.in                     |   17 ++++++++++++++---
+ xulrunner/installer/libxul-embedding-unstable.pc.in |    2 +-
+ xulrunner/installer/libxul-embedding.pc.in          |    2 +-
+ xulrunner/installer/mozilla-nss.pc.in               |    6 +++---
+ 4 files changed, 19 insertions(+), 8 deletions(-)
+
+Index: mozilla/xulrunner/installer/Makefile.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/Makefile.in
+++ mozilla/xulrunner/installer/Makefile.in
+@@ -90,40 +90,51 @@
+ 	mozilla-plugin.pc \
+ 	mozilla-gtkmozembed.pc \
+ 	mozilla-gtkmozembed-embedding.pc \
+ 	$(NULL)
+ 
+ ifdef MOZ_NATIVE_NSPR
+ NSPR_NAME=nspr
+ NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags)
+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs)
+ else
+-pkg_config_files += mozilla-nspr.pc
+ NSPR_NAME=mozilla-nspr
+ FULL_NSPR_CFLAGS=-I\$${includedir}/stable
+ FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
+ NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
+ endif
+pkg_config_files += mozilla-nspr.pc
+ 
+ $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
+ 
+-ifndef MOZ_NATIVE_NSS
+-pkg_config_files += mozilla-nss.pc
+ifdef MOZ_NATIVE_NSS
+NSS_VERSION=$(shell $(NSS_CONFIG) --version)
+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
+else
+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version)
+FULL_NSS_CFLAGS=-I\$${includedir}/stable
+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs))
+ endif
+pkg_config_files += mozilla-nss.pc
+ 
+ %.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed \
+ 	-e "s|%prefix%|$(prefix)|" \
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+ 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
+	-e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \
+	-e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \
+ 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
+ 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
+ 	chmod 644 $@
+ 
+ install:: $(pkg_config_files)
+ 	@echo pkg_config_file: $(pkg_config_files)
+ 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
+ 
+Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in
+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+@@ -3,9 +3,9 @@
+ includedir=%includedir%
+ idldir=%idldir%
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS%
+Index: mozilla/xulrunner/installer/libxul-embedding.pc.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in
+++ mozilla/xulrunner/installer/libxul-embedding.pc.in
+@@ -7,9 +7,9 @@
+ # Note: the default pkg-config cflags will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+ 
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS%
+Index: mozilla/xulrunner/installer/mozilla-nss.pc.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in
+++ mozilla/xulrunner/installer/mozilla-nss.pc.in
+@@ -1,10 +1,10 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ 
+ Name: NSS
+ Description: Mozilla Network Security Services
+-Version: %MOZILLA_VERSION%
+Version: %NSS_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3
+-Cflags: -I${includedir}/stable
+Libs: %FULL_NSS_LIBS%
+Cflags: %FULL_NSS_CFLAGS%