Mercurial Mercurial > upstream > oracle > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6611183 xscreensaver needs to put Sun logos in files loaded at runtime
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Wed, 27 Feb 2008 16:49:21 -0800
changeset 337 4d1a5dcaada1
parent 336 3d1f724208a5
child 338 c24d5b47ebad
6611183 xscreensaver needs to put Sun logos in files loaded at runtime [fix install & packaging of logo files]
open-src/app/xscreensaver/Makefile file | annotate | diff | comparison | revisions
packages/SUNWxwsvr/prototype file | annotate | diff | comparison | revisions 
--- a/open-src/app/xscreensaver/Makefile	Tue Feb 26 17:17:28 2008 -0800
+++ b/open-src/app/xscreensaver/Makefile	Wed Feb 27 16:49:21 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.85	08/02/26
+# @(#)Makefile	1.86	08/02/27
 #
 
 PWD:sh=pwd
@@ -199,7 +199,7 @@
 	(cd $(SOURCE_DIR) ; chmod a+x install-sh intltool-*; \
 	 $(MAKE) -e $(XS_MAKE_ENV) install )
 	mkdir -p $(POT_DEST)
-	cp -p $(XS_POT) $(POT_DEST)/xscreensaver.pot
+	cp -pf $(XS_POT) $(POT_DEST)/xscreensaver.pot
 	mkdir -p $(LOGO_DEST)
-	cp -p driver/*logo.xpm $(LOGO_DEST)
+	cp -pf $(SOURCE_DIR)/driver/*logo.xpm $(LOGO_DEST)
 
--- a/packages/SUNWxwsvr/prototype	Tue Feb 26 17:17:28 2008 -0800
+++ b/packages/SUNWxwsvr/prototype	Wed Feb 27 16:49:21 2008 -0800
@@ -27,7 +27,7 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype	1.9	08/02/26 SMI"
+# ident	"@(#)prototype	1.10	08/02/27 SMI"
 #
 # XScreenSaver daemon and utility programs
 
@@ -115,7 +115,7 @@
 f none X11/lib/xscreensaver/config/screensaver-power.png 0444 root bin
 f none X11/lib/xscreensaver/config/screensaver-snap.png 0444 root bin
 f none X11/lib/xscreensaver/config/xscreensaver-demo.glade2 0444 root bin
+f none X11/lib/xscreensaver/config/sunlogo.xpm 0444 root bin
+f none X11/lib/xscreensaver/config/tsunlogo.xpm 0444 root bin
 !search	     $HOME/share/pixmaps
 f none X11/lib/xscreensaver/config/xscreensaver.xpm 0444 root bin
-f none X11/lib/xscreensaver/config/sunlogo.xpm 0444 root bin
-f none X11/lib/xscreensaver/config/tsunlogo.xpm 0444 root bin
upstream/oracle/xnv