libxcursor: Changes to 'debian-unstable'
INSTALL | 103 ++++++++++++++++++++++++++-----------------------------
debian/changelog | 10 ++---
debian/rules | 2 -
3 files changed, 55 insertions(+), 60 deletions(-)
New commits:
commit 422429d7f36659bf458de68d8201ab6afde3347f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 15:30:12 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index bf11d93..80c4a8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
+libxcursor (1:1.1.10-1) unstable; urgency=low
[ Julien Cristau ]
* Drop the -1 debian revisions from build-depends.
@@ -21,7 +21,7 @@ libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
* Drop pre-dependency on x11-common from libxcursor-dev. This was needed
for upgrades from sarge.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 13:51:43 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 15:30:10 +0100
libxcursor (1:1.1.9-1) unstable; urgency=low
commit ba5227f54afefff74b7c17abf2570da917c2e807
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 15:28:46 2009 +0100
kill vim modeline from changelog
diff --git a/debian/changelog b/debian/changelog
index 764150b..bf11d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
* Remove /usr/X11R6/lib/X11/icons from the cursor path (closes: #557292).
+ * Kill vim modeline from debian changelog, it makes lintian angry.
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
@@ -355,5 +356,3 @@ xcursor (1.0.2-0beta1) unstable; urgency=low
* Initial Beta Release.
-- ISHIKAWA Mutsumi <ishikawa@debian.org> Thu, 22 May 2003 02:31:37 +0900
-
- vim:set ai et sts=2 sw=2 tw=78:
commit 95e21003298317dcbd4c50547b4d9144e4e074a1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 15:21:34 2009 +0100
Restore upstream's INSTALL file
diff --git a/INSTALL b/INSTALL
index 5458714..54caf7c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+ 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.
+ These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -26,9 +20,9 @@ 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
+the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.
+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
@@ -38,17 +32,20 @@ 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'.
+`configure' by a program called `autoconf'. You only 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.
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -70,49 +67,51 @@ The simplest way to compile this package is:
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
is an example:
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+ ./configure CC=c89 CFLAGS=-O2 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
+ 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
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as 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.
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have 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.
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'.
+ 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'.
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.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH 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=DIR' to specify different values for particular
+options like `--bindir=PATH' 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.
@@ -123,7 +122,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
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
@@ -138,11 +137,11 @@ you can use the `configure' options `--x-includes=DIR' and
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:
@@ -157,7 +156,7 @@ where SYSTEM can have one of these forms:
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
+use the `--target=TYPE' option to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -168,9 +167,9 @@ 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'.
+ 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.
@@ -179,7 +178,7 @@ 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
+ 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
@@ -187,18 +186,14 @@ 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
+will cause 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.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
commit b49cd18f2dc2a04c3966c7eb83ee36f4a53d588b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 15:11:22 2009 +0100
Remove /usr/X11R6/lib/X11/icons from the cursor path (closes: #557292).
diff --git a/debian/changelog b/debian/changelog
index b7be1bd..764150b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
* Drop the -1 debian revisions from build-depends.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
+ * Remove /usr/X11R6/lib/X11/icons from the cursor path (closes: #557292).
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
diff --git a/debian/rules b/debian/rules
index 99d6b58..d069fe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ build-stamp:
mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --with-cursorpath=~/.icons:\$${datadir}/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons \
+ --with-cursorpath=~/.icons:\$${datadir}/icons:/usr/share/pixmaps \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
commit 11c120c529b398dc6b607e1f312f7b7dff82c370
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 15:06:46 2009 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index 81e90dd..b7be1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
* Move -dbg package to section debug.
[ Timo Aaltonen ]
- * New upstream release.
+ * New upstream release (closes: #554238).
* Run autoreconf on build. Add build-deps on automake, libtool
and xutils-dev.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
Reply to: