Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10446
Modified Files:
xinitrc.info
Added Files:
xinitrc.patch
Log Message:
Sync with 10.7/
Index: xinitrc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/xinitrc.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xinitrc.info 16 Feb 2012 09:32:34 -0000 1.3
+++ xinitrc.info 28 Jan 2013 17:24:34 -0000 1.4
@@ -1,16 +1,51 @@
-# Id: xinitrc.info.in,v 1.2 2008/02/16 12:30:56 okayama Exp
Package: xinitrc
Version: 1.5
-# Revision is always 1
-Revision: 1
-Description: Alternative X11 initialization script
+Revision: 2
+Description: X11 initialization script handler
Source: http://hnd.jp.asi.finkmirrors.net/pkgdists/%n-%v.tar.gz
Source-MD5: 3bf8a01cfbdaed6e44bd30e18a32e194
-#Type: nosource
-#Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: 28411818dff4c291d441662909cecde4
License: Public Domain
Maintainer: AIDA Shinra <[email protected]>
Depends: x11
CompileScript: sh ./build.sh prefix=%p build
InstallScript: sh ./build.sh prefix=%p destdir=%d install
PostInstScript: update-sys-xinitrc postinst
+DescDetail: <<
+The xinitrc package provides a Fink-controlled mechanism by which Fink
+packages can have executables run, environment variables set, etc., at
+X11 startup, by running wrapper scripts in %p/etc/xinitrc.d. On a stock X11
+this can be done via scripts in /usr/X11/lib/X11/xinit/xinitrc.d , but for
+Fink packages this would entail installing files outside of the Fink tree,
+which is normally forbidden.
+
+In addition, 'xinitrc' provides well-defined points for system administrators
+to set up the X11 environment as they require. Consult the following files
+for more information:
+
+%p/share/doc/xinitrc/numbering.txt
+%p/share/doc/xinitrc/README.txt
+
+Note: This package installs its own /usr/X11/lib/X11/xinit/xinitrc, though it
+renames the original version installed the system so that it isn't lost.
+
+Note: This package will need to be reinstalled every time X11 is updated,
+including OS updates.
+<<
+DescUsage: <<
+Packages that need xinitrc's functionality should install a sh script named
+'%p/etc/xinitrc.d/XYfoo.sh', where XY should follow the convention in
+%p/share/doc/xinitrc/numbering.txt, and 'foo' can refer to the package,
+executable, or some other unique name.
+
+The contents of the script should either terminate or run in the background so
+that the X11 startup will proceed normally and e.g. run a window manager.
+<<
+DescPackaging: <<
+1.5-2: source /usr/X11/lib/X11/xinit/xinitrc.d/98-user.sh in xinitrc.sh so
+ that users don't experience a change in behavior when installing the
+ package. Currently we just patch that in.
+ Anybody backporting to 10.4 will require a different patch, as per
the
+ 10.4 section of
http://finkers.wordpress.com/2010/06/18/finks-xinitrc-gnome-and-kde/
+<<
--- NEW FILE: xinitrc.patch ---
diff -Nurd xinitrc-1.5/sedsrc/xinitrc.sh.in
xinitrc-1.5.patched/sedsrc/xinitrc.sh.in
--- xinitrc-1.5/sedsrc/xinitrc.sh.in 2008-02-21 09:24:08.000000000 -0700
+++ xinitrc-1.5.patched/sedsrc/xinitrc.sh.in 2013-01-27 18:36:14.000000000
-0700
@@ -38,6 +38,11 @@
unset xinitrc__f
fi
+# Read in user scripts via stock X11 script
+if test -f "$x_xinitdir/xinitrc.d/98-user.sh"; then
+ . "$x_xinitdir/xinitrc.d/98-user.sh"
+fi
+
# Hook for system administrators.
if test -f "$fink_sysconfdir/xinitrc-last-hook"; then
. "$fink_sysconfdir/xinitrc-last-hook"
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
