From bd37b398c6bc7b65dcc6aee731f2551090311ef1 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Tue, 21 Aug 2012 18:04:15 +0900 Subject: [PATCH] upload tizen2.0 source --- AUTHORS | 0 COPYING | 8 +- ChangeLog | 285 ++++++ INSTALL | 290 ++++++ Makefile.am | 0 NEWS | 0 README | 0 autogen.sh | 12 - configure.ac | 71 +- debian/README.source | 73 -- debian/changelog | 196 ---- debian/compat | 1 - debian/control | 145 --- debian/copyright | 77 -- debian/libxmu-dev.install | 4 - debian/libxmu-headers.install | 1 - debian/libxmu6.install | 1 - debian/libxmuu-dev.install | 4 - debian/libxmuu1.install | 1 - debian/patches/01_dont_export_private_deps.diff | 26 - debian/patches/series | 1 - debian/rules | 113 --- debian/watch | 2 - debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 276 ------ debian/xsfbs/xsfbs.sh | 622 ------------ doc/Makefile.am | 62 +- doc/Xmu.xml | 189 ++-- doc/xlogo.svg | 0 docbook.am | 105 ++ include/Makefile.am | 0 include/X11/Xmu/Atoms.h | 2 +- include/X11/Xmu/CharSet.h | 2 +- include/X11/Xmu/CloseHook.h | 2 +- include/X11/Xmu/Converters.h | 2 +- include/X11/Xmu/CurUtil.h | 2 +- include/X11/Xmu/CvtCache.h | 4 +- include/X11/Xmu/DisplayQue.h | 22 +- include/X11/Xmu/Drawing.h | 2 +- include/X11/Xmu/Editres.h | 0 include/X11/Xmu/EditresP.h | 54 +- include/X11/Xmu/Error.h | 2 +- include/X11/Xmu/ExtAgent.h | 0 include/X11/Xmu/Initer.h | 2 +- include/X11/Xmu/Lookup.h | 0 include/X11/Xmu/Misc.h | 8 +- include/X11/Xmu/StdCmap.h | 2 +- include/X11/Xmu/StdSel.h | 2 +- include/X11/Xmu/SysUtil.h | 0 include/X11/Xmu/WhitePoint.h | 0 include/X11/Xmu/WidgetNode.h | 0 include/X11/Xmu/WinUtil.h | 2 +- include/X11/Xmu/Xct.h | 0 include/X11/Xmu/Xmu.h | 8 +- packaging/{libxmu.spec => libXmu.spec} | 83 +- src/AllCmap.c | 20 +- src/Atoms.c | 14 +- src/ClientWin.c | 4 +- src/Clip.c | 2 +- src/CloseHook.c | 18 +- src/CmapAlloc.c | 26 +- src/CrCmap.c | 42 +- src/CrPixFBit.c | 0 src/CursorName.c | 4 +- src/CvtCache.c | 6 +- src/CvtStdSel.c | 4 +- src/DefErrMsg.c | 14 +- src/DelCmap.c | 4 +- src/DisplayQue.c | 4 +- src/Distinct.c | 0 src/DrRndRect.c | 0 src/DrawLogo.c | 16 +- src/EditresCom.c | 1176 ++++++++++++----------- src/ExtAgent.c | 2 +- src/FToCback.c | 4 +- src/GetHost.c | 0 src/GrayPixmap.c | 10 +- src/Initer.c | 13 +- src/LocBitmap.c | 18 +- src/Lookup.c | 4 +- src/LookupCmap.c | 32 +- src/Lower.c | 11 +- src/Makefile.am | 4 +- src/RdBitF.c | 18 +- src/ScrOfWin.c | 0 src/ShapeWidg.c | 6 +- src/StdCmap.c | 14 +- src/StrToBS.c | 4 +- src/StrToBmap.c | 10 +- src/StrToCurs.c | 44 +- src/StrToGrav.c | 6 +- src/StrToJust.c | 4 +- src/StrToLong.c | 2 +- src/StrToOrnt.c | 4 +- src/StrToShap.c | 4 +- src/StrToWidg.c | 0 src/UpdMapHint.c | 1 - src/VisCmap.c | 6 +- src/WidgetNode.c | 6 +- src/Xct.c | 4 +- src/sharedlib.c | 6 - 101 files changed, 1694 insertions(+), 2695 deletions(-) delete mode 100644 AUTHORS mode change 100755 => 100644 ChangeLog create mode 100644 INSTALL mode change 100755 => 100644 Makefile.am delete mode 100644 NEWS mode change 100755 => 100644 README delete mode 100644 autogen.sh mode change 100755 => 100644 configure.ac delete mode 100644 debian/README.source delete mode 100755 debian/changelog delete mode 100644 debian/compat delete mode 100755 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/libxmu-dev.install delete mode 100644 debian/libxmu-headers.install delete mode 100644 debian/libxmu6.install delete mode 100755 debian/libxmuu-dev.install delete mode 100644 debian/libxmuu1.install delete mode 100644 debian/patches/01_dont_export_private_deps.diff delete mode 100644 debian/patches/series delete mode 100755 debian/rules delete mode 100644 debian/watch delete mode 100644 debian/xsfbs/repack.sh delete mode 100644 debian/xsfbs/xsfbs.mk delete mode 100644 debian/xsfbs/xsfbs.sh mode change 100755 => 100644 doc/Makefile.am mode change 100755 => 100644 doc/Xmu.xml mode change 100755 => 100644 doc/xlogo.svg create mode 100644 docbook.am mode change 100755 => 100644 include/Makefile.am mode change 100755 => 100644 include/X11/Xmu/Atoms.h mode change 100755 => 100644 include/X11/Xmu/CharSet.h mode change 100755 => 100644 include/X11/Xmu/CloseHook.h mode change 100755 => 100644 include/X11/Xmu/Converters.h mode change 100755 => 100644 include/X11/Xmu/CurUtil.h mode change 100755 => 100644 include/X11/Xmu/CvtCache.h mode change 100755 => 100644 include/X11/Xmu/DisplayQue.h mode change 100755 => 100644 include/X11/Xmu/Drawing.h mode change 100755 => 100644 include/X11/Xmu/Editres.h mode change 100755 => 100644 include/X11/Xmu/EditresP.h mode change 100755 => 100644 include/X11/Xmu/Error.h mode change 100755 => 100644 include/X11/Xmu/ExtAgent.h mode change 100755 => 100644 include/X11/Xmu/Initer.h mode change 100755 => 100644 include/X11/Xmu/Lookup.h mode change 100755 => 100644 include/X11/Xmu/Misc.h mode change 100755 => 100644 include/X11/Xmu/StdCmap.h mode change 100755 => 100644 include/X11/Xmu/StdSel.h mode change 100755 => 100644 include/X11/Xmu/SysUtil.h mode change 100755 => 100644 include/X11/Xmu/WhitePoint.h mode change 100755 => 100644 include/X11/Xmu/WidgetNode.h mode change 100755 => 100644 include/X11/Xmu/WinUtil.h mode change 100755 => 100644 include/X11/Xmu/Xct.h mode change 100755 => 100644 include/X11/Xmu/Xmu.h rename packaging/{libxmu.spec => libXmu.spec} (52%) mode change 100755 => 100644 src/AllCmap.c mode change 100755 => 100644 src/Atoms.c mode change 100755 => 100644 src/ClientWin.c mode change 100755 => 100644 src/Clip.c mode change 100755 => 100644 src/CloseHook.c mode change 100755 => 100644 src/CmapAlloc.c mode change 100755 => 100644 src/CrCmap.c mode change 100755 => 100644 src/CrPixFBit.c mode change 100755 => 100644 src/CursorName.c mode change 100755 => 100644 src/CvtCache.c mode change 100755 => 100644 src/CvtStdSel.c mode change 100755 => 100644 src/DefErrMsg.c mode change 100755 => 100644 src/DelCmap.c mode change 100755 => 100644 src/DisplayQue.c mode change 100755 => 100644 src/Distinct.c mode change 100755 => 100644 src/DrRndRect.c mode change 100755 => 100644 src/DrawLogo.c mode change 100755 => 100644 src/EditresCom.c mode change 100755 => 100644 src/ExtAgent.c mode change 100755 => 100644 src/FToCback.c mode change 100755 => 100644 src/GetHost.c mode change 100755 => 100644 src/GrayPixmap.c mode change 100755 => 100644 src/Initer.c mode change 100755 => 100644 src/LocBitmap.c mode change 100755 => 100644 src/Lookup.c mode change 100755 => 100644 src/LookupCmap.c mode change 100755 => 100644 src/Lower.c mode change 100755 => 100644 src/RdBitF.c mode change 100755 => 100644 src/ScrOfWin.c mode change 100755 => 100644 src/ShapeWidg.c mode change 100755 => 100644 src/StdCmap.c mode change 100755 => 100644 src/StrToBS.c mode change 100755 => 100644 src/StrToBmap.c mode change 100755 => 100644 src/StrToCurs.c mode change 100755 => 100644 src/StrToGrav.c mode change 100755 => 100644 src/StrToJust.c mode change 100755 => 100644 src/StrToLong.c mode change 100755 => 100644 src/StrToOrnt.c mode change 100755 => 100644 src/StrToShap.c mode change 100755 => 100644 src/StrToWidg.c mode change 100755 => 100644 src/UpdMapHint.c mode change 100755 => 100644 src/VisCmap.c mode change 100755 => 100644 src/WidgetNode.c mode change 100755 => 100644 src/Xct.c mode change 100755 => 100644 src/sharedlib.c diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/COPYING b/COPYING index ab822fb..67a8b74 100644 --- a/COPYING +++ b/COPYING @@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/ChangeLog b/ChangeLog old mode 100755 new mode 100644 index e2de801..70626ad --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,288 @@ +commit 6437d834cd66621e4e9f4decf7341b6d7ff45556 +Author: Alan Coopersmith +Date: Mon Mar 5 23:00:10 2012 -0800 + + libXmu 1.1.1 + + Signed-off-by: Alan Coopersmith + +commit ccd9e64515d6fc7b5367d6d98ecd3abf5b084026 +Author: Alan Coopersmith +Date: Thu Nov 10 20:34:03 2011 -0800 + + Fix gcc -Wwrite-strings warnings (some, not all) + + Signed-off-by: Alan Coopersmith + +commit 72ac4c4a464b3aec21cdbe367c9d465cbe0f3ff1 +Author: Alan Coopersmith +Date: Thu Nov 10 09:55:07 2011 -0800 + + Drop support for pre-ANSI-C89 preprocessors + + Signed-off-by: Alan Coopersmith + +commit 004d535c707251bd4fb47426f90712c195c6dfc7 +Author: Matt Dew +Date: Tue Oct 4 20:51:48 2011 -0600 + + Cleanup IDs and links in doc + + 1 - fix the capitalization of the ID attributes to match either the + or <funcdef> string it goes with. + 2 - fix any <linkend>'s that were affected by 1. + 3 - any <function> in the docs that has an actual funcdef, + will become an olink. + + Signed-off-by: Matt Dew <marcoz@osource.org> + +commit d7d2ad7dde7b2653aa1e08e9339674bc40f1560a +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sat Sep 24 17:00:09 2011 -0700 + + Fix build with -DDEBUG + + https://bugs.freedesktop.org/show_bug.cgi?id=1069 + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 66492163cb244fbe22c67bebb14c0918dd11eab6 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 16 22:46:25 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6ffa7e4bb1e7efdad4dd987e1fe27cdee96f7063 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 14 14:33:24 2011 -0400 + + docs: use appropriate markup for copyright statement + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 7b2589d66d672d2585d3df4074ce64443f7e4b71 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Sep 12 11:01:19 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 46cc8a399aa16d145a9141d2fa8172282e4b7211 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 8 20:00:00 2011 -0400 + + docbook.am: embed css styles inside the HTML HEAD element + + Rather than referring to the external xorg.css stylesheet, embed the content + of the file in the html output produced. This is accomplished by using + version 1.10 of xorg-xhtml.xsl. + + This makes the whole html docs tree much more relocatable. + In addition, it eliminates xorg.css as a runtime file which makes + xorg-sgml-doctools a build time only package. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 01d2a55b4fd8e3743b1f396f81be6a06f6345ac5 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 7 10:31:04 2011 -0400 + + docbook.am: global maintenance update - entities, images and olinking + + Adding support in libX11 for html chunking caused a reorg of docbook.am + as well as the xorg-sgml-doctools masterdb for olinking. + The parameter img.src.path is added for pdf images. + A searchpath to the root builddir is added for local entities, if present. + + The docbook.am makefile hides all the details and is identical for + all 22 modules having DocBook documentation. It is included by a thin + Makefile.am which requires no docbook knowledge. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 888135ef815766f0421438430ca40809e4f7e411 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Aug 7 21:20:26 2011 -0400 + + docbook pdf: add xsl parameter to locate images + + Unlike html, pdf/ps requires a full path name to find images, + but only needs it to make an internal copy of it at build time. + The image can later be removed and the image still shows up in the pdf doc. + This allows us to use the absolute builddir. + + This parameter must not be used for html which loads the image from disk + at user read time. The image is removed from builddir after build is done, + and we do not know where the image will be installed by the distro. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 5ba82aec6547513ea182cbc6cb95b472bbfb9dc5 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Aug 7 20:30:58 2011 -0400 + + Xmu.xml: Change layout of the X Logo figure + + The floating does not come up right, the figure caption is in the way. + Move the figure out of the paragraph and below the text. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 08fb51c1db9c9693125f4c093d07abc94d6ce0f6 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 12 18:39:46 2011 -0400 + + Install xml versions of specs even if HAVE_XMLTO is false + + DocBook/XML input source is also a usefull output format that can be viewed + with an XML viewer or editor and by some O/S help system. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit a70bedc470f5482dc64b947057e5120c2f322177 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 5 16:27:37 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit 3f3c9a60381371f60a174497ea6d5d90abea4261 +Author: Matt Dew <marcoz@osource.org> +Date: Tue May 31 20:03:23 2011 -0600 + + Add id attributes to funcsynopsis to allow other docs to olink to them. + + Signed-off-by: Matt Dew <marcoz@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 4000666e864e477e712caa0f0c0a5d09006c7752 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Feb 27 15:06:18 2011 -0500 + + Documentation: add Docbook external references support + + When writing technical documentation, it is often necessary to cross + reference to other information. When that other information is not in the + current document, additional support is needed, namely <olink>. + + A new feature with version 1.7 of xorg-sgml-doctools adds references to + other documents within or outside this package. + + This patch adds technical support for this feature but does not change + the content of the documentation as seen by the end user. + + Each book or article must generate a database containing the href + of sections that can be referred to from another document. This database + is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that + the value of DATAROOTDIR for xorg-sgml-doctools and for the package + documentation is the same. This forms a virtual document tree. + + This database is consulted by other documents while they are being generated + in order to fulfill the missing information for linking. + Refer to the xorg-sgml-doctools for further technical information. + + Co-authored-by: Matt Dew <marcoz@osource.org> + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 6ab92082d5f6c842b578a9fe1f9888ed3339336a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Feb 10 22:06:52 2011 -0800 + + Make EditresCom.c identation a lot less random + + 2 spaces! No 4! 2! 3! No, Blue! Red! Aughughurglrgll... + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 70ca0ef2cc0ec84308792a7b184e90c5cb358278 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Feb 2 19:51:54 2011 -0500 + + config: remove config test for snprintf + + The macro HAS_SNPRINTF is hard coded to always be defined. + If it were not defined, Lower.c would include snprintf.c + which does not exist. Seems to be relics from IMakefile + + Other modules are using snprintf unconditionally. + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Julien Cristau <jcristau@debian.org> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9f57096dd0881651de3b710b182db59091e6f421 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Feb 2 11:43:43 2011 -0500 + + config: comment, minor upgrade, quote and layout configure.ac + + Group statements per section as per Autoconf standard layout + Quote statements where appropriate. + Autoconf recommends not using dnl instead of # for comments + + Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. + + This helps automated maintenance and release activities. + Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 1be35fb51871f314bef673975c2be94e5e427696 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Jan 28 19:41:37 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9bd47f1db85b0c997389609ad26a2766f5aeeff5 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Jan 28 16:34:14 2011 -0500 + + config: remove unrequired AC_CONFIG_AUX_DIR + + The default location for the generation of configuation files is the current + package root directory. These files are config.* and friends. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 2f00ed22d17592b963fabd925dba90f2a003d801 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Dec 5 00:13:25 2010 -0800 + + XmuCvtStringToCursor: sprintf -> snprintf & check for XtMalloc failure + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 813ee0dcecc89d3f334d8747b171c71e34a7671e +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Nov 9 13:04:57 2010 -0500 + + config: HTML file generation: use the installed copy of xorg.css + + Currenlty the xorg.css file is copied in each location + where a DocBook/XML file resides. This produces about + 70 copies in the $(docdir) install tree. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + commit 5d9b0896bfdfe60656a2d806a06e17c7adf335b5 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Fri Oct 29 16:52:54 2010 -0700 diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..c9fd2c0 --- /dev/null +++ b/INSTALL @@ -0,0 +1,290 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am old mode 100755 new mode 100644 diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/README b/README old mode 100755 new mode 100644 diff --git a/autogen.sh b/autogen.sh deleted file mode 100644 index 904cd67..0000000 --- a/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 index 69ea570..17fff03 --- a/configure.ac +++ b/configure.ac @@ -1,37 +1,30 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - +# Initialize Autoconf AC_PREREQ([2.60]) - -AC_INIT([libXmu], - [1.1.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [libXmu]) - +AC_INIT([libXmu], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AC_CONFIG_HEADERS([config.h]) +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS +# Initialize libtool +AC_PROG_LIBTOOL + +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS XORG_ENABLE_DOCS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.8) -AM_CONFIG_HEADER([config.h]) - - -# Checks for programs. -AC_PROG_LIBTOOL - -# Checks for pkg-config packages +# Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) PKG_CHECK_MODULES(XMUU, x11) @@ -39,32 +32,16 @@ PKG_CHECK_MODULES(XMUU, x11) # conversion routines for XTRANS_CONNECTION_FLAGS -# -# Assume that we have sprintf. If a system shows up -# that doesn't, we will deal with it at that point. -# -# The way to deal with it is: -# -# 1. Add a test for sprintf it here in configure.ac -# that sets or unsets HAS_SNPRINTF as appropriate -# -# 2. add a copy of xc/lib/misc/snprintf.c -# -# The source file in question is Lower.c -# - -AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()]) -AC_SUBST(HAS_SNPRINTF) - -dnl Allow checking code with lint, sparse, etc. +# Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xmu]) LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/` AC_SUBST(LINTLIBUU) -AC_OUTPUT([Makefile - doc/Makefile - include/Makefile - src/Makefile - xmu.pc - xmuu.pc]) +AC_CONFIG_FILES([Makefile + doc/Makefile + include/Makefile + src/Makefile + xmu.pc + xmuu.pc]) +AC_OUTPUT diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 34ab4bf..0000000 --- a/debian/README.source +++ /dev/null @@ -1,73 +0,0 @@ ------------------------------------------------------- -Quick Guide To Patching This Package For The Impatient ------------------------------------------------------- - -1. Make sure you have quilt installed -2. Unpack the package as usual with "dpkg-source -x" -3. Run the "patch" target in debian/rules -4. Create a new patch with "quilt new" (see quilt(1)) -5. Edit all the files you want to include in the patch with "quilt edit" - (see quilt(1)). -6. Write the patch with "quilt refresh" (see quilt(1)) -7. Run the "clean" target in debian/rules - -Alternatively, instead of using quilt directly, you can drop the patch in to -debian/patches and add the name of the patch to debian/patches/series. - ------------------------------------- -Guide To The X Strike Force Packages ------------------------------------- - -The X Strike Force team maintains X packages in git repositories on -git.debian.org in the pkg-xorg subdirectory. Most upstream packages -are actually maintained in git repositories as well, so they often -just need to be pulled into git.debian.org in a "upstream-*" branch. -Otherwise, the upstream sources are manually installed in the Debian -git repository. - -The .orig.tar.gz upstream source file could be generated this -"upstream-*" branch in the Debian git repository but it is actually -copied from upstream tarballs directly. - -Due to X.org being highly modular, packaging all X.org applications -as their own independent packages would have created too many Debian -packages. For this reason, some X.org applications have been grouped -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. -Most packages, including the X.org server itself and all libraries -and drivers are, however maintained independently. - -The Debian packaging is added by creating the "debian-*" git branch -which contains the aforementioned "upstream-*" branch plus the debian/ -repository files. -When a patch has to be applied to the Debian package, two solutions -are involved: -* If the patch is available in one of the upstream branches, it - may be git'cherry-picked into the Debian repository. In this - case, it appears directly in the .diff.gz. -* Otherwise, the patch is added to debian/patches/ which is managed - with quilt as documented in /usr/share/doc/quilt/README.source. - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. diff --git a/debian/changelog b/debian/changelog deleted file mode 100755 index e91a6bf..0000000 --- a/debian/changelog +++ /dev/null @@ -1,196 +0,0 @@ -libxmu (2:1.1.0-1slp2) unstable; urgency=low - - * [X11R7.6] upgrade package - * Git: 165.213.180.234:slp/pkgs/xorg/lib/libxmu - * Tag: libxmu_1.1.0-1slp2 - - -- SooChan Lim <sc1.lim@samsung.com> Wed, 05 Jan 2011 20:09:15 +0900 - -libxmu (2:1.0.5-9slp2) unstable; urgency=low - - * Enabling creation of *-dbg package - * Git: 165.213.180.234:/git/slp/pkgs/xorg/lib/libxmu - * Tag: libxmu_1.0.5-9slp2 - - -- Sung-Jin Park <sj76.park@samsung.com> Mon, 22 Nov 2010 14:40:58 +0900 - -libxmu (2:1.0.5-8slp2) unstable; urgency=low - - * Add --as-needed - * Git: 165.213.180.234:/git/slp/pkgs/xorg/lib/libxmu - * Tag: libxmu_1.0.5-8slp2 - - -- SooChan Lim <sc1.lim@samsung.com> Sat, 20 Nov 2010 15:20:14 +0900 - -libxmu (2:1.0.5-7slp2) unstable; urgency=low - - * Update maintainer - * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11 - * Tag: libxmu_1.0.5-7slp2 - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 21 Apr 2010 13:56:51 +0900 - -libxmu (2:1.0.5-6slp2) unstable; urgency=low - - * modify the package name - - -- SooChan Lim <sc1.lim@samsung.com> Thu, 25 Mar 2010 17:55:45 +0900 - -libxmu (2:1.0.5-5) unstable; urgency=low - - * Install .la files - - -- Sung-Jin Park <sj76.park@samsung.com> Mon, 07 Dec 2009 10:29:32 +0900 - -libxmu (2:1.0.5-4) unstable; urgency=low - - * Update version not to make version problems on both armel and i386 - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 02 Dec 2009 18:39:25 +0900 - -libxmu (2:1.0.5-3) unstable; urgency=low - - * Update version for upload to debian repository - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 02 Dec 2009 15:50:27 +0900 - -libxmu (2:1.0.5-2) unstable; urgency=low - - * Import Debian Package - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 02 Dec 2009 14:48:42 +0900 - -libxmu (2:1.0.5-1) unstable; urgency=low - - [ Timo Aaltonen ] - * New upstream release. - + Fix 64bit support (closes: #521887) - - [ Julien Cristau ] - * Bump Standards-Version to 3.8.3. - - -- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 19:20:17 +0100 - -libxmu (2:1.0.4-2) unstable; urgency=low - - [ Julien Cristau ] - * Drop -1 debian revisions from build-deps. - * libxmu6{,-dbg}, libxmu-dev, libxmuu1{,-dbg} and libxmuu-dev don't need a - dependency on x11-common. - * Build libxmu-headers in binary-indep instead of binary-arch - (closes: #486418). Thanks, Martin Koeppe! - * Run autoreconf on build; build-depend on automake, libtool, xutils-dev. - * Handle parallel builds. - - [ Brice Goglin ] - * Add a link to www.X.org and a reference to the upstream module - in the long description. - * Add upstream URL to debian/copyright. - * Add README.source, bump Standards-Version to 3.8.2. - * Use updated xsfbs, closes: #538587. - * Move -dbg packages to section debug. - - -- Julien Cristau <jcristau@debian.org> Fri, 07 Aug 2009 14:30:36 +0200 - -libxmu (2:1.0.4-1) unstable; urgency=low - - [ Julien Cristau ] - * New upstream release. - * Make libxmu*-dev depend on libxmu-headers (= ${source:Version}). Thanks, - Josh Triplett. - * Don't export private dependencies in xmu.pc and xmuu.pc. These - dependencies are handled by Requires.private. - * Due to the above, build-depend on quilt and apply the xsfbs patch rules. - * Update xsfbs to the latest version as of 2008-01-06. - * Add myself to Uploaders, and remove Branden and Fabio with their - permission. - * Bump Standards-Version to 3.7.3 (no changes). - * s/^XS-Vcs/Vcs/ - - [ Timo Aaltonen ] - * Bump the epoch so that this can be synced to Ubuntu in the future. - - -- Julien Cristau <jcristau@debian.org> Thu, 17 Jan 2008 14:57:47 +0100 - -libxmu (1:1.0.3-1) unstable; urgency=low - - * New upstream release. - * Install the upstream changelog. - * Remove outdated CVS information from the package descriptions, and add - XS-Vcs-Git and XS-Vcs-Browser. - * Fix package sections (libraries in libs, development stuff in libdevel). - * Use ${binary:Version} instead of ${Source-Version}. - - -- Julien Cristau <jcristau@debian.org> Thu, 12 Apr 2007 13:40:07 +0200 - -libxmu (1:1.0.2-2) unstable; urgency=low - - [ Andres Salomon ] - * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; - idempotency fix. - - [ Drew Parsons ] - * dbg package has priority extra. - - -- David Nusinow <dnusinow@debian.org> Wed, 30 Aug 2006 16:53:25 -0400 - -libxmu (1:1.0.2-1) experimental; urgency=low - - * New upstream release - * Bump debhelper compat to 5 - * Run dh_install with --list-missing - * Version the -headers package's x11-common pre-dep to use version 1:7.0.0 - to match the rest of Debian and shut lintian up - * Bump standards version to 3.7.2.0 - - -- David Nusinow <dnusinow@debian.org> Mon, 3 Jul 2006 18:43:32 -0400 - -libxmu (1:1.0.1-3) unstable; urgency=low - - * Reorder makeshlib command in rules file so that ldconfig is run - properly. Thanks Drew Parsons and Steve Langasek. - - -- David Nusinow <dnusinow@debian.org> Tue, 18 Apr 2006 21:49:59 -0400 - -libxmu (1:1.0.1-2) unstable; urgency=low - - * Upload to unstable - - -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 22:44:59 -0500 - -libxmu (1:1.0.1-1) experimental; urgency=low - - * First upload to Debian - - -- David Nusinow <dnusinow@debian.org> Thu, 29 Dec 2005 20:53:53 -0500 - -libxmu (1:6.2.3-5) breezy; urgency=low - - * Also, libxmu-dev needs to depend on libxt-dev too. - - -- Adam Conrad <adconrad@ubuntu.com> Mon, 25 Jul 2005 09:43:47 +0000 - -libxmu (1:6.2.3-4) breezy; urgency=low - - * Bump libxt-dev build-dep once more, _XOPEN_SOURCE begone! - - -- Adam Conrad <adconrad@ubuntu.com> Sun, 24 Jul 2005 10:48:14 +0000 - -libxmu (1:6.2.3-3) breezy; urgency=low - - * Make libxmu-dev depend on libxext-dev, since libxmu links to it. - - -- Adam Conrad <adconrad@ubuntu.com> Sun, 24 Jul 2005 07:56:02 +0000 - -libxmu (1:6.2.3-2) breezy; urgency=low - - * Bump Build-Depends on libx11-dev, libxext-dev and libxt-dev to avoid - _XOPEN_SOURCE. - - -- Daniel Stone <daniel.stone@ubuntu.com> Sat, 23 Jul 2005 00:20:50 +1000 - -libxmu (1:6.2.3-1) breezy; urgency=low - - * First libxmu release. - - -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100755 index 983edbc..0000000 --- a/debian/control +++ /dev/null @@ -1,145 +0,0 @@ -Source: libxmu -Section: x11 -Priority: optional -Maintainer: Sung-Jin Park <sj76.park@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: SooChan Lim <sc1.lim@samsung.com>, Sung-Jin Park <sj76.park@samsung.com>, David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org> -Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2), libxt-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1), pkg-config, quilt, automake, libtool, xutils-dev -Standards-Version: 3.8.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git - -Package: libxmu6 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: X11 miscellaneous utility library - libXmu provides a set of miscellaneous utility convenience functions for X - libraries to use. libXmuu is a lighter-weight version that does not depend - on libXt or libXext; for more information, see libxmuu1. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu - -Package: libxmu6-dbg -Section: debug -Architecture: any -Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libxmu6 (= ${binary:Version}) -Description: X11 miscellaneous utility library (debug package) - libXmu provides a set of miscellaneous utility convenience functions for X - libraries to use. libXmuu is a lighter-weight version that does not depend - on libXt or libXext; for more information, see libxmuu1. - . - This package contains the debug versions of the library found in libxmu6. - Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu - -Package: libxmu-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxext-dev, libxt-dev, libxmu6 (= ${binary:Version}), libxmu-headers (= ${source:Version}) -Description: X11 miscellaneous utility library (development headers) - libXmu provides a set of miscellaneous utility convenience functions for X - libraries to use. libXmuu is a lighter-weight version that does not depend - on libXt or libXext; for more information, see libxmuu1. - . - This package contains the development headers for the library found in - libxmu6. Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu - -Package: libxmuu1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: X11 miscellaneous micro-utility library - libXmuu provides a set of miscellaneous utility convenience functions for X - libraries to use. It is a lighter version of libXmu that does not depend - on libXt or libXext; for more information on libXmu, see libxmu6. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu - -Package: libxmuu1-dbg -Section: debug -Architecture: any -Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libxmuu1 (= ${binary:Version}) -Description: X11 miscellaneous micro-utility library (debug package) - libXmuu provides a set of miscellaneous utility convenience functions for X - libraries to use. It is a lighter version of libXmu that does not depend - on libXt or libXext; for more information on libXmu, see libxmu6. - . - This package contains the debug versions of the library found in libxmuu1. - Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu - -Package: libxmuu-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxmuu1 (= ${binary:Version}), libxmu-headers (= ${source:Version}) -Description: X11 miscellaneous micro-utility library (development headers) - libXmuu provides a set of miscellaneous utility convenience functions for X - libraries to use. It is a lighter version of libXmu that does not depend - on libXt or libXext; for more information on libXmu, see libxmu6. - . - This package contains the development headers for the library found in - libxmuu1. Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu - -Package: libxmu-headers -Section: libdevel -Architecture: all -Depends: libx11-dev, x11proto-core-dev -Pre-Depends: x11-common (>= 1:7.0.0) -Description: X11 miscellaneous utility library headers - libXmu and libXmuu are miscellaneous utility libraries for X library - developers to abstract some common functions. This package provides the - headers for both libraries (as libXmuu is a subset of libXmu), and - is depended upon by both. For more information, please see libxmu-dev or - libxmuu-dev. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXmu diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 5d8aaa7..0000000 --- a/debian/copyright +++ /dev/null @@ -1,77 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/lib/ - -Copyright 1989, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - ------------ - -Xmu/StrToBmap.c and Xmu/GrayPixmap.c also have: - -Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - ------------ - -And Xmu/Clip.c has: - -Copyright (c) 1998 by The XFree86 Project, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall -not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from the -XFree86 Project. diff --git a/debian/libxmu-dev.install b/debian/libxmu-dev.install deleted file mode 100755 index 024555f..0000000 --- a/debian/libxmu-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/libXmu.a -usr/lib/libXmu.so -usr/lib/libXmu.la -usr/lib/pkgconfig/xmu.pc diff --git a/debian/libxmu-headers.install b/debian/libxmu-headers.install deleted file mode 100644 index 097e3db..0000000 --- a/debian/libxmu-headers.install +++ /dev/null @@ -1 +0,0 @@ -usr/include/X11/* diff --git a/debian/libxmu6.install b/debian/libxmu6.install deleted file mode 100644 index 8bb0da2..0000000 --- a/debian/libxmu6.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libXmu.so.6* diff --git a/debian/libxmuu-dev.install b/debian/libxmuu-dev.install deleted file mode 100755 index d813eb5..0000000 --- a/debian/libxmuu-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/libXmuu.a -usr/lib/libXmuu.so -usr/lib/libXmuu.la -usr/lib/pkgconfig/xmuu.pc diff --git a/debian/libxmuu1.install b/debian/libxmuu1.install deleted file mode 100644 index 4ccea84..0000000 --- a/debian/libxmuu1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libXmuu.so.1* diff --git a/debian/patches/01_dont_export_private_deps.diff b/debian/patches/01_dont_export_private_deps.diff deleted file mode 100644 index 64a5828..0000000 --- a/debian/patches/01_dont_export_private_deps.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/xmu.pc.in b/xmu.pc.in -index a086f83..15dabbf 100644 ---- a/xmu.pc.in -+++ b/xmu.pc.in -@@ -6,7 +6,7 @@ includedir=@includedir@ - Name: Xmu - Description: Xmu Library - Version: @PACKAGE_VERSION@ --Requires: xproto x11 xt -+Requires: xproto - Requires.private: x11 xt xext - Cflags: -I${includedir} - Libs: -L${libdir} -lXmu -diff --git a/xmuu.pc.in b/xmuu.pc.in -index 1e91ac4..72fa5f9 100644 ---- a/xmuu.pc.in -+++ b/xmuu.pc.in -@@ -6,7 +6,7 @@ includedir=@includedir@ - Name: Xmuu - Description: Mini Xmu Library - Version: @PACKAGE_VERSION@ --Requires: xproto x11 -+Requires: xproto - Requires.private: x11 - Cflags: -I${includedir} - Libs: -L${libdir} -lXmuu diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e22712f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_dont_export_private_deps.diff diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 7d98f76..0000000 --- a/debian/rules +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for the Debian libxmu package. -# Copyright © 2004 Scott James Remnant <scott@netsplit.com> -# Copyright © 2005 Daniel Stone <daniel@fooishbar.org> -# Copyright © 2005 David Nusinow <dnusinow@debian.org> - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include debian/xsfbs/xsfbs.mk - -CFLAGS = -Wall -g -LDFLAGS += -Wl,--hash-style=both -Wl,--as-needed -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build=$(DEB_HOST_GNU_TYPE) -else - confflags += --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -# confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -endif - -configure: -#configure: $(STAMP_DIR)/patch - dh_testdir - autoreconf -vfi - -build: build-stamp -build-stamp: configure - dh_testdir - - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ - ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(confflags) \ - CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) - >$@ - -clean: xsfclean - dh_testdir - dh_testroot - rm -f build-stamp - - rm -f config.cache config.log config.status - rm -f */config.cache */config.log */config.status - rm -f conftest* */conftest* - rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* - rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure - rm -f depcomp install-sh ltmain.sh missing mkinstalldirs - rm -f $$(find -name Makefile.in) - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - -# Build architecture-dependent files here. -binary-arch: DH_OPTIONS=-s -binary-arch: install - dh_testdir - dh_testroot - -# dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing -Xusr/include -X.la -# dh_installchangelogs ChangeLog - dh_link - dh_strip -Nlibxmuu1 -Nlibxmu6 - dh_strip -plibxmuu1 -Nlibxmu6 --dbg-package=libxmuu1-dbg - dh_strip -plibxmu6 -Nlibxmuu1 --dbg-package=libxmu6-dbg - dh_compress - dh_fixperms - dh_makeshlibs - dh_shlibdeps - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-independent files here. -binary-indep: DH_OPTIONS=-i -binary-indep: build install - dh_installdocs - dh_install --sourcedir=debian/tmp - dh_installchangelogs ChangeLog - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1764a17..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/lib/ libXmu-(.*)\.tar\.gz diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100644 index 5935cc9..0000000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set -e - -if ! [ -d debian/prune ]; then - exit 0 -fi - -if [ "x$1" != x--upstream-version ]; then - exit 1 -fi - -version="$2" -filename="$3" - -if [ -z "$version" ] || ! [ -f "$filename" ]; then - exit 1 -fi - -dir="$(pwd)" -tempdir="$(mktemp -d)" - -cd "$tempdir" -tar xf "$dir/$filename" -cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done - -tar czf "$dir/$filename" * -cd "$dir" -rm -rf "$tempdir" -echo "Done pruning upstream tarball" - -exit 0 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk deleted file mode 100644 index 5e16b10..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,276 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. - -# Originally by Stephen Early <sde1000@debian.org> -# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us> -# Modified by Adam Heath <doogie@debian.org> -# Modified by Branden Robinson <branden@debian.org> -# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net> -# Modified by David Nusinow <dnusinow@debian.org> -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# force quilt to not use ~/.quiltrc and to use debian/patches -QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null - -# Set up parameters for the upstream build environment. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) - -# Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the codename of a release in the Debian part of the -# version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts - >$@ - -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir - mkdir -p $(STAMP_DIR)/log - -# Apply all patches to the upstream source. -.PHONY: patch -stampdir_targets+=patch -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/log - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - if $(QUILT) applied >/dev/null 2>/dev/null; then \ - if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) - dh_clean - -# Remove files from the upstream source tree that we don't need, or which have -# licensing problems. It must be run before creating the .orig.tar.gz. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: prune-upstream-tree -prune-upstream-tree: - # Ensure we're in the correct directory. - dh_testdir - grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf - -# Verify that there are no offsets or fuzz in the patches we apply. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: patch-audit -patch-audit: prepare unpatch - @echo -n "Auditing patches..."; \ - >$(STAMP_DIR)/log/patch; \ - FUZZY=; \ - while [ -n "$$($(QUILT) next)" ]; do \ - RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ - case "$$RESULT" in \ - succeeded) \ - echo "fuzzy patch: $$($(QUILT) top)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ - FUZZY=yes; \ - ;; \ - FAILED) \ - echo "broken patch: $$($(QUILT) next)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ - exit 1; \ - ;; \ - esac; \ - done; \ - if [ -n "$$FUZZY" ]; then \ - echo "there were fuzzy patches; please fix."; \ - exit 1; \ - else \ - echo "done."; \ - fi - -# Generate the maintainer scripts. -.PHONY: genscripts -stampdir_targets+=genscripts -genscripts: $(STAMP_DIR)/genscripts -$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir - for FILE in debian/*.config.in \ - debian/*.postinst.in \ - debian/*.postrm.in \ - debian/*.preinst.in \ - debian/*.prerm.in; do \ - if [ -e "$$FILE" ]; then \ - MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ - sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ - cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ - sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ - sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ - -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ - rm $$MAINTSCRIPT.tmp; \ - fi; \ - done - # Validate syntax of generated shell scripts. - #sh debian/scripts/validate-posix-sh debian/*.config \ - # debian/*.postinst \ - # debian/*.postrm \ - # debian/*.preinst \ - # debian/*.prerm - >$@ - -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed - @exit 1 -else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 813fd8d..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,622 +0,0 @@ -# This is the X Strike Force shell library for X Window System package -# maintainer scripts. It serves to define shell functions commonly used by -# such packages, and performs some error checking necessary for proper operation -# of those functions. By itself, it does not "do" much; the maintainer scripts -# invoke the functions defined here to accomplish package installation and -# removal tasks. - -# If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -# skip past this library by scanning forward in this file to the string -# "GOBSTOPPER". - -SOURCE_VERSION=@SOURCE_VERSION@ -OFFICIAL_BUILD=@OFFICIAL_BUILD@ - -# Use special abnormal exit codes so that problems with this library are more -# easily tracked down. -SHELL_LIB_INTERNAL_ERROR=86 -SHELL_LIB_THROWN_ERROR=74 -SHELL_LIB_USAGE_ERROR=99 - -# old -> new variable names -if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then - DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -fi -if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then - DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -fi - -# initial sanity checks -if [ -z "$THIS_PACKAGE" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_PACKAGE shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_SCRIPT shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -reject_unlikely_path_chars () { - # syntax: reject_unlikely_path_chars [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters unlikely to be seen in a path and which the shell might - # interpret and barf if any are found - while [ -n "$1" ]; do - # does the operand contain any funny characters? - if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ - "encountered possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the -# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -# the script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -message () { - # pretty-print messages of arbitrary length - reject_nondigits "$COLUMNS" - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -observe () { - # syntax: observe message ... - # - # issue observational message suitable for logging someday when support for - # it exists in dpkg - if [ -n "$DEBUG_XORG_PACKAGE" ]; then - message "$THIS_PACKAGE $THIS_SCRIPT note: $*" - fi -} - -warn () { - # syntax: warn message ... - # - # issue warning message suitable for logging someday when support for - # it exists in dpkg; also send to standard error - message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -} - -die () { - # syntax: die message ... - # - # exit script with error message - message "$THIS_PACKAGE $THIS_SCRIPT error: $*" - exit $SHELL_LIB_THROWN_ERROR -} - -internal_error () { - # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message - message "internal error: $*" - if [ -n "$OFFICIAL_BUILD" ]; then - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - fi - exit $SHELL_LIB_INTERNAL_ERROR -} - -usage_error () { - message "usage error: $*" - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - exit $SHELL_LIB_USAGE_ERROR -} - -font_update () { - # run $UPDATECMDS in $FONTDIRS - - local dir cmd shortcmd x_font_dir_prefix - - x_font_dir_prefix="/usr/share/fonts/X11" - - if [ -z "$UPDATECMDS" ]; then - usage_error "font_update() called but \$UPDATECMDS not set" - fi - if [ -z "$FONTDIRS" ]; then - usage_error "font_update() called but \$FONTDIRS not set" - fi - - reject_unlikely_path_chars "$UPDATECMDS" - reject_unlikely_path_chars "$FONTDIRS" - - for dir in $FONTDIRS; do - if [ -d "$x_font_dir_prefix/$dir" ]; then - for cmd in $UPDATECMDS; do - if which "$cmd" > /dev/null 2>&1; then - shortcmd=${cmd##*/} - observe "running $shortcmd in $dir font directory" - cmd_opts= - if [ "$shortcmd" = "update-fonts-alias" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-dir" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-scale" ]; then - cmd_opts=--x11r7-layout - fi - $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ - "failed; font directory data may not" \ - "be up to date" - else - warn "$cmd not found; not updating corresponding $dir font" \ - "directory data" - fi - done - else - warn "$dir is not a directory; not updating font directory data" - fi - done -} - -remove_conffile_prepare () { - # syntax: remove_conffile_prepare filename official_md5sum ... - # - # Check a conffile "filename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 2 ]; then - usage_error "remove_conffile_prepare() called with wrong number of" \ - "arguments; expected at least 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - shift - - # does the conffile even exist? - if [ -e "$conffile" ]; then - # calculate its checksum - current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') - # compare it to each supplied checksum - while [ -n "$1" ]; do - if [ "$current_checksum" = "$1" ]; then - # we found a match; move the confffile and stop looking - observe "preparing obsolete conffile $conffile for removal" - mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" - break - fi - shift - done - fi -} - -remove_conffile_lookup () { - # syntax: remove_conffile_lookup package filename - # - # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal - # if it matches the actual file's md5sum. - # - # Call this function when you would call remove_conffile_prepare but only - # want to check against dpkg's status database instead of known checksums. - - local package conffile old_md5sum - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "remove_conffile_lookup() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - package="$1" - conffile="$2" - - if ! [ -e "$conffile" ]; then - return - fi - old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ - awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" - if [ -n "$old_md5sum" ]; then - remove_conffile_prepare "$conffile" "$old_md5sum" - fi -} - -remove_conffile_commit () { - # syntax: remove_conffile_commit filename - # - # Complete the removal of a conffile "filename" that has become obsolete. - # - # Call this function from a postinst script after having used - # remove_conffile_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_commit() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - # if the temporary file created by remove_conffile_prepare() exists, remove it - if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then - observe "committing removal of obsolete conffile $conffile" - rm "$conffile.$THIS_PACKAGE-tmp" - fi -} - -remove_conffile_rollback () { - # syntax: remove_conffile_rollback filename - # - # Roll back the removal of a conffile "filename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" is after having used remove_conffile_prepare() in the - # preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_rollback() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - # if the temporary file created by remove_conffile_prepare() exists, move it - # back - if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then - observe "rolling back removal of obsolete conffile $conffile" - mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" - fi -} - -replace_conffile_with_symlink_prepare () { - # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ - # official_md5sum ... - # - # Check a conffile "oldfilename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. Otherwise copy it - # to newfilename and let dpkg handle it through conffiles mechanism. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 3 ]; then - usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ - " number of arguments; expected at least 3, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - oldconffile="$1" - shift - newconffile="$1" - shift - - remove_conffile_prepare "$_oldconffile" "$@" - # If $oldconffile still exists, then md5sums didn't match. - # Copy it to new one. - if [ -f "$oldconffile" ]; then - cp "$oldconffile" "$newconffile" - fi - -} - -replace_conffile_with_symlink_commit () { - # syntax: replace_conffile_with_symlink_commit oldfilename - # - # Complete the removal of a conffile "oldfilename" that has been - # replaced by a symlink. - # - # Call this function from a postinst script after having used - # replace_conffile_with_symlink_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "replace_conffile_with_symlink_commit() called with wrong" \ - "number of arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - remove_conffile_commit "$conffile" -} - -replace_conffile_with_symlink_rollback () { - # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename - # - # Roll back the replacing of a conffile "oldfilename" with symlink to - # "newfilename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" and verify $2 to ensure the package failed to upgrade - # from a version (or install over a version removed-but-not-purged) prior - # to the one in which the conffile was obsoleted. - # You should have used replace_conffile_with_symlink_prepare() in the - # preinst. - - local conffile - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ - "number of arguments; expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - oldconffile="$1" - newconffile="$2" - - remove_conffile_rollback "$_oldconffile" - if [ -f "$newconffile" ]; then - rm "$newconffile" - fi -} - -run () { - # syntax: run command [ argument ... ] - # - # Run specified command with optional arguments and report its exit status. - # Useful for commands whose exit status may be nonzero, but still acceptable, - # or commands whose failure is not fatal to us. - # - # NOTE: Do *not* use this function with db_get or db_metaget commands; in - # those cases the return value of the debconf command *must* be checked - # before the string returned by debconf is used for anything. - - local retval - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "run() called with wrong number of arguments; expected at" \ - "least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - "$@" || retval=$? - - if [ ${retval:-0} -ne 0 ]; then - observe "command \"$*\" exited with status $retval" - fi -} - -make_symlink_sane () { - # syntax: make_symlink_sane symlink target - # - # Ensure that the symbolic link symlink exists, and points to target. - # - # If symlink does not exist, create it and point it at target. - # - # If symlink exists but is not a symbolic link, back it up. - # - # If symlink exists, is a symbolic link, but points to the wrong location, fix - # it. - # - # If symlink exists, is a symbolic link, and already points to target, do - # nothing. - # - # This function wouldn't be needed if ln had an -I, --idempotent option. - - # Validate arguments. - if [ $# -ne 2 ]; then - usage_error "make_symlink_sane() called with wrong number of arguments;" \ - "expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - # We could just use the positional parameters as-is, but that makes things - # harder to follow. - local symlink target - - symlink="$1" - target="$2" - - if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then - observe "link from $symlink to $target already exists" - else - observe "creating symbolic link from $symlink to $target" - mkdir -p "${target%/*}" "${symlink%/*}" - ln -s -b -S ".dpkg-old" "$target" "$symlink" - fi -} - -migrate_dir_to_symlink () { - # syntax: migrate_dir_to_symlink old_location new_location - # - # Per Debian Policy section 6.5.4, "A directory will never be replaced by a - # symbolic link to a directory or vice versa; instead, the existing state - # (symlink or not) will be left alone and dpkg will follow the symlink if - # there is one." - # - # We have to do it ourselves. - # - # This function moves the contents of old_location, a directory, into - # new_location, a directory, then makes old_location a symbolic link to - # new_location. - # - # old_location need not exist, but if it does, it must be a directory (or a - # symlink to a directory). If it is not, it is backed up. If new_location - # exists already and is not a directory, it is backed up. - # - # This function should be called from a package's preinst so that other - # packages unpacked after this one --- but before this package's postinst runs - # --- are unpacked into new_location even if their payloads contain - # old_location filespecs. - - # Validate arguments. - if [ $# -ne 2 ]; then - usage_error "migrate_dir_to_symlink() called with wrong number of" - "arguments; expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - # We could just use the positional parameters as-is, but that makes things - # harder to follow. - local new old - - old="$1" - new="$2" - - # Is old location a symlink? - if [ -L "$old" ]; then - # Does it already point to new location? - if [ "$(readlink "$old")" = "$new" ]; then - # Nothing to do; migration has already been done. - observe "migration of $old to $new already done" - return 0 - else - # Back it up. - warn "backing up symbolic link $old as $old.dpkg-old" - mv -b "$old" "$old.dpkg-old" - fi - fi - - # Does old location exist, but is not a directory? - if [ -e "$old" ] && ! [ -d "$old" ]; then - # Back it up. - warn "backing up non-directory $old as $old.dpkg-old" - mv -b "$old" "$old.dpkg-old" - fi - - observe "migrating $old to $new" - - # Is new location a symlink? - if [ -L "$new" ]; then - # Does it point the wrong way, i.e., back to where we're migrating from? - if [ "$(readlink "$new")" = "$old" ]; then - # Get rid of it. - observe "removing symbolic link $new which points to $old" - rm "$new" - else - # Back it up. - warn "backing up symbolic link $new as $new.dpkg-old" - mv -b "$new" "$new.dpkg-old" - fi - fi - - # Does new location exist, but is not a directory? - if [ -e "$new" ] && ! [ -d "$new" ]; then - warn "backing up non-directory $new as $new.dpkg-old" - mv -b "$new" "$new.dpkg-old" - fi - - # Create new directory if it does not yet exist. - if ! [ -e "$new" ]; then - observe "creating $new" - mkdir -p "$new" - fi - - # Copy files in old location to new location. Back up any filenames that - # already exist in the new location with the extension ".dpkg-old". - observe "copying files from $old to $new" - if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then - die "error(s) encountered while copying files from $old to $new" - fi - - # Remove files at old location. - observe "removing $old" - rm -r "$old" - - # Create symlink from old location to new location. - make_symlink_sane "$old" "$new" -} - -# vim:set ai et sw=2 ts=2 tw=80: - -# GOBSTOPPER: The X Strike Force shell library ends here. diff --git a/doc/Makefile.am b/doc/Makefile.am old mode 100755 new mode 100644 index 3c1df53..11a2fe1 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,62 +1,16 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# if ENABLE_DOCS -dist_doc_DATA = Xmu.xml xlogo.svg -if HAVE_XMLTO -doc_DATA = Xmu.html +# Main DocBook/XML files (DOCTYPE book) +docbook = Xmu.xml -if HAVE_FOP -doc_DATA += Xmu.pdf Xmu.ps -endif +# Included chapters, appendix, images +chapters = xlogo.svg -if HAVE_XMLTO_TEXT -doc_DATA += Xmu.txt -endif +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am -if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/ - -doc_DATA += xorg.css -xorg.css: $(STYLESHEET_SRCDIR)/xorg.css - $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ -endif - -XML_SOURCEFILES = $(srcdir)/Xmu.xml $(XSL_STYLESHEET) - -Xmu.txt: $(XML_SOURCEFILES) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $(srcdir)/Xmu.xml - -Xmu.html: $(XML_SOURCEFILES) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $(srcdir)/Xmu.xml - -Xmu.pdf: $(XML_SOURCEFILES) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $(srcdir)/Xmu.xml - -Xmu.ps: $(XML_SOURCEFILES) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $(srcdir)/Xmu.xml -endif HAVE_XMLTO endif ENABLE_DOCS diff --git a/doc/Xmu.xml b/doc/Xmu.xml old mode 100755 new mode 100644 index bd79d6e..2d363a9 --- a/doc/Xmu.xml +++ b/doc/Xmu.xml @@ -1,19 +1,22 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <!-- lifted from troff+ms+XMan by doclifter --> <article id='xmu'> <articleinfo> <title>Xmu and Xmuu Library API Reference + X Version 11, Release &fullrelvers; + 1989X Consortium + “Don't ask.” -Copyright © 1989 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights @@ -46,8 +49,8 @@ is a trademark of The Open Group. - - Introduction + +Introduction The Xmu Library is a collection of miscellaneous (some might say random) @@ -78,8 +81,8 @@ cc -o xapplication xapplication.o `pkg-config --libs xmu` - - Atom Functions + +Atom Functions To use the functions and macros defined in this section, you should include @@ -200,11 +203,11 @@ value is cached, such that subsequent requests do not cause another round-trip to the server. - + - XmuMakeAtom + - + AtomPtr XmuMakeAtom const char *name @@ -225,15 +228,15 @@ for an Atom with the given name. -XmuInternAtom + can be used to cache the Atom value for one or more displays. - + - XmuNameOfAtom + - + char *XmuNameOfAtom AtomPtr atom_ptr @@ -251,11 +254,11 @@ specifies the AtomPtr The function returns the name of an AtomPtr. - + - XmuInternAtom + - + Atom XmuInternAtom Display *dpy @@ -287,11 +290,11 @@ is cached, such that subsequent requests do not cause another round-trip to the server. - + - XmuGetAtomName + - + char *XmuGetAtomName Display *dpy @@ -319,11 +322,11 @@ The result is cached, such that subsequent requests do not cause another round-trip to the server. - + - XmuInternStrings + - + void XmuInternStrings Display *dpy @@ -368,8 +371,8 @@ The caller is responsible for preallocating the array pointed at by atoms. - - Error Handler Functions + +Error Handler Functions To use the functions defined in this section, you should include the header @@ -381,11 +384,11 @@ file and link against the libXmu or libXmuu library. - + - XmuPrintDefaultErrorMessage + - + int XmuPrintDefaultErrorMessage Display *dpy @@ -451,21 +454,21 @@ specifies the error This function ignores errors for BadWindow errors for -XQueryTree +XQueryTree and -XGetWindowAttributes, +XGetWindowAttributes, and ignores BadDrawable errors for -XGetGeometry; +XGetGeometry; it returns 0 in those cases. Otherwise, it prints the default error message, and returns a non-zero value if the caller should consider exiting, and 0 if the caller should not exit. - - System Utility Functions + +System Utility Functions To use the functions defined in this section, you should include the header @@ -547,8 +550,8 @@ in software that needs to continue to support non-Unix98 compliant platforms. - - Window Utility Functions + +Window Utility Functions To use the functions defined in this section, you should include the header @@ -672,17 +675,17 @@ and flags in the hints structure, and then stores the hints for the window using - XSetWMNormalHints + XSetWMNormalHints -XSetWMNormalHints +XSetWMNormalHints and returns True. If NULL is passed for the hints structure, then the current hints are read back from the window using - XGetWMNormalHints + XGetWMNormalHints -XGetWMNormalHints +XGetWMNormalHints and are used instead, and True is returned; otherwise @@ -692,8 +695,8 @@ is returned. - - Cursor Utility Functions + +Cursor Utility Functions To use the functions defined in this section, you should include the header @@ -733,8 +736,8 @@ manual. - - Graphics Functions + +Graphics Functions To use the functions defined in this section, you should include the header @@ -978,7 +981,13 @@ specifies the logo height -