debian/changelog | 11 ++++++++--- debian/control | 8 +++++++- debian/copyright | 28 ++++++++++++++++++++++++++-- debian/rules | 16 ++++++---------- 4 files changed, 47 insertions(+), 16 deletions(-)
New commits: commit 94b5fce589c728fad5f8b6734f4d1d0cff6b2980 Author: Julien Cristau <[email protected]> Date: Tue Jan 5 12:15:35 2010 +0000 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 33ab8e7..9effa64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,18 @@ -xcursor-themes (1.0.2-1) UNRELEASED; urgency=low +xcursor-themes (1.0.2-1) unstable; urgency=low [ David Nusinow ] * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a * Put dh_clean -k back where it belongs but use dh_prep instead [ Timo Aaltonen ] - * New upstream release. + * New upstream release (closes: #561604). [ Julien Cristau ] * Add build-dep on xutils-dev. * Fill in debian/copyright from upstream COPYING. * Make debian/rules parallel-safe, parse space-separated DEB_BUILD_OPTIONS. - -- Timo Aaltonen <[email protected]> Tue, 05 Jan 2010 11:03:23 +0200 + -- Julien Cristau <[email protected]> Tue, 05 Jan 2010 12:15:29 +0000 xcursor-themes (1.0.1-6) unstable; urgency=low commit c1ee089a32d5656ff71f082d9da78d1f9dabaf86 Author: Julien Cristau <[email protected]> Date: Tue Jan 5 12:00:03 2010 +0000 Make debian/rules parallel-safe, parse space-separated DEB_BUILD_OPTIONS. diff --git a/debian/changelog b/debian/changelog index b68a9b6..33ab8e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xcursor-themes (1.0.2-1) UNRELEASED; urgency=low [ Julien Cristau ] * Add build-dep on xutils-dev. * Fill in debian/copyright from upstream COPYING. + * Make debian/rules parallel-safe, parse space-separated DEB_BUILD_OPTIONS. -- Timo Aaltonen <[email protected]> Tue, 05 Jan 2010 11:03:23 +0200 diff --git a/debian/rules b/debian/rules index f839af2..fffa963 100755 --- a/debian/rules +++ b/debian/rules @@ -10,14 +10,11 @@ include debian/xsfbs/xsfbs.mk CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) @@ -37,19 +34,18 @@ configure: autoreconf -vfi build: build-stamp -build-stamp: configure genscripts +build-stamp: configure $(STAMP_DIR)/genscripts dh_testdir mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && CFLAGS="$(CFLAGS)" \ + cd obj-$(DEB_BUILD_GNU_TYPE) && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --sysconfdir=/etc \ - $(confflags) + $(confflags) CFLAGS="$(CFLAGS)" cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + >$@ - touch build-stamp - -clean: xsfclean cleanscripts +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp commit 8380751b2a6f7a1a0bbea19eaf2d90d6d4c6b653 Author: Julien Cristau <[email protected]> Date: Tue Jan 5 11:59:59 2010 +0000 Fill in debian/copyright from upstream COPYING. diff --git a/debian/changelog b/debian/changelog index 5eb9da1..b68a9b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xcursor-themes (1.0.2-1) UNRELEASED; urgency=low [ Julien Cristau ] * Add build-dep on xutils-dev. + * Fill in debian/copyright from upstream COPYING. -- Timo Aaltonen <[email protected]> Tue, 05 Jan 2010 11:03:23 +0200 diff --git a/debian/copyright b/debian/copyright index 0422670..587aa2d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,2 +1,26 @@ -This package is licensed under the MIT/X11 licence; please see -/usr/share/doc/x11-common/copyright for full copyright information. +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/data/ + +Copyright (C) 1994-2003 The XFree86 Project, Inc. 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 fur- +nished 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, FIT- +NESS 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 CON- +NECTION 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 deal- +ings in this Software without prior written authorization from the XFree86 +Project. commit e289865bfb788fec473e8a64d75397621635bf8b Author: Julien Cristau <[email protected]> Date: Tue Jan 5 11:59:55 2010 +0000 Add build-dep on xutils-dev. diff --git a/debian/changelog b/debian/changelog index 9ca23e3..5eb9da1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ xcursor-themes (1.0.2-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release. + [ Julien Cristau ] + * Add build-dep on xutils-dev. + -- Timo Aaltonen <[email protected]> Tue, 05 Jan 2010 11:03:23 +0200 xcursor-themes (1.0.1-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 09a949f..a3cb13e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,13 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]> -Build-Depends: debhelper (>= 7.0.0), pkg-config, x11-apps | xcursorgen, libxcursor-dev, automake +Build-Depends: + debhelper (>= 7.0.0), + pkg-config, + x11-apps | xcursorgen, + libxcursor-dev, + automake, + xutils-dev (>= 1:7.4+4), Standards-Version: 3.8.3.0 Package: xcursor-themes -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
