diff -r e5259db5befc -r 068c11b419c9 packages/upgrade-X
--- a/packages/upgrade-X	Sat Jan 10 10:35:32 2009 -0800
+++ b/packages/upgrade-X	Thu Jan 15 12:55:00 2009 -0800
@@ -2,9 +2,9 @@
 
 ###
 #
-# @(#)upgrade-X	1.44 08/10/30
+# @(#)upgrade-X	1.45 09/01/14
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -178,7 +178,6 @@
 	SUNWxorg-clientlibs
 	SUNWxorg-compatlinks
 	SUNWxorg-devel-docs
-	SUNWxorg-doc
 	SUNWxorg-graphics-ddx
 	SUNWxorg-headers
 	SUNWxorg-server
@@ -262,6 +261,10 @@
 # snv_98: 6741034 Merge SUNWi1of into SUNWxwfnt
 REM_PKGS+=" SUNWi1of"
 
+# snv_107: 
+# Merged SUNWxorg-doc into SUNWxorg-server & SUNWxorg-graphics-ddx
+REM_PKGS+=" SUNWxorg-doc"
+
 # Various compatibility links in SUNWxorg-server have been replaced with
 # files in other packages, so we need to remove SUNWxorg-server first
 # (for example: 6658871 changed /usr/X11/lib/X11/fonts/Type1 from a link