[Galago-commits] r2471 - in trunk/notification-daemon: . data
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Sun Jan 22 23:51:45 PST 2006
Author: chipx86
Date: 2006-01-22 23:51:43 -0800 (Sun, 22 Jan 2006)
New Revision: 2471
Added:
trunk/notification-daemon/data/notification-daemon.service.in
Removed:
trunk/notification-daemon/notification-daemon.service.in
Modified:
trunk/notification-daemon/ChangeLog
trunk/notification-daemon/INSTALL
trunk/notification-daemon/Makefile.am
trunk/notification-daemon/configure.ac
trunk/notification-daemon/data/Makefile.am
Log:
Move notification-daemon.service.in to data/.
Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog 2006-01-23 07:48:19 UTC (rev 2470)
+++ trunk/notification-daemon/ChangeLog 2006-01-23 07:51:43 UTC (rev 2471)
@@ -1,3 +1,13 @@
+Sun Jan 22 23:51:17 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * data/Makefile.am:
+ A data/notification-daemon.service.in:
+ D notification-daemon.service.in:
+ * INSTALL:
+ * Makefile.am:
+ * configure.ac:
+ - Move notification-daemon.service.in to data/.
+
Sun Jan 22 23:38:31 PST 2006 Christian Hammond <chipx86 at chipx86.com>
* src/daemon.c:
Modified: trunk/notification-daemon/INSTALL
===================================================================
--- trunk/notification-daemon/INSTALL 2006-01-23 07:48:19 UTC (rev 2470)
+++ trunk/notification-daemon/INSTALL 2006-01-23 07:51:43 UTC (rev 2471)
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
- This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- These are generic installation instructions.
+These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -67,9 +70,9 @@
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.
+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
@@ -82,7 +85,7 @@
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+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 must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -99,19 +102,19 @@
Installation Names
==================
- By default, `make install' will install the package's files in
+By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+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.
@@ -122,7 +125,7 @@
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+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
@@ -137,11 +140,11 @@
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
+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:
@@ -167,9 +170,9 @@
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'.
+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.
@@ -178,7 +181,7 @@
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+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
@@ -186,14 +189,18 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Modified: trunk/notification-daemon/Makefile.am
===================================================================
--- trunk/notification-daemon/Makefile.am 2006-01-23 07:48:19 UTC (rev 2470)
+++ trunk/notification-daemon/Makefile.am 2006-01-23 07:51:43 UTC (rev 2471)
@@ -1,14 +1,10 @@
SUBDIRS = data po src themes
-servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = notification-daemon.service
-
EXTRA_DIST = \
AUTHORS NEWS INSTALL COPYING README \
ChangeLog \
autogen.sh \
- configure.ac \
- notification-daemon.service
+ configure.ac
$(OBJECTS): libtool
libtool: $(LIBTOOL_DEPS)
Modified: trunk/notification-daemon/configure.ac
===================================================================
--- trunk/notification-daemon/configure.ac 2006-01-23 07:48:19 UTC (rev 2470)
+++ trunk/notification-daemon/configure.ac 2006-01-23 07:51:43 UTC (rev 2471)
@@ -156,8 +156,8 @@
dnl ################################################################
AC_CONFIG_FILES([
Makefile
-notification-daemon.service
data/Makefile
+data/notification-daemon.service
po/Makefile.in
src/Makefile
themes/Makefile
@@ -177,4 +177,3 @@
echo "Now type make to compile"
echo "Then su to root and type: make install"
echo
-
Modified: trunk/notification-daemon/data/Makefile.am
===================================================================
--- trunk/notification-daemon/data/Makefile.am 2006-01-23 07:48:19 UTC (rev 2470)
+++ trunk/notification-daemon/data/Makefile.am 2006-01-23 07:51:43 UTC (rev 2471)
@@ -1,3 +1,6 @@
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = notification-daemon.service
+
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = notification-daemon.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@@ -10,5 +13,8 @@
done \
fi
-EXTRA_DIST = $(schemas_in_files)
+EXTRA_DIST = \
+ $(schemas_in_files) \
+ notification-daemon.service
+
CLEANFILES = $(schemas_DATA)
Copied: trunk/notification-daemon/data/notification-daemon.service.in (from rev 2429, trunk/notification-daemon/notification-daemon.service.in)
Deleted: trunk/notification-daemon/notification-daemon.service.in
===================================================================
--- trunk/notification-daemon/notification-daemon.service.in 2006-01-23 07:48:19 UTC (rev 2470)
+++ trunk/notification-daemon/notification-daemon.service.in 2006-01-23 07:51:43 UTC (rev 2471)
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Notifications
-Exec=@LIBEXECDIR@/notification-daemon
More information about the galago-commits
mailing list