Author: dnusinow Date: 2006-01-23 22:44:30 -0500 (Mon, 23 Jan 2006) New Revision: 1114
Modified: branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/changelog branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/control branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor-dev.install branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor1.install branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/rules Log: Import newest package from Ubuntu, which happily de-cdbsifies this lib, bringing it in line with the other libs Modified: branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/changelog =================================================================== --- branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/changelog 2006-01-24 03:09:30 UTC (rev 1113) +++ branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/changelog 2006-01-24 03:44:30 UTC (rev 1114) @@ -1,10 +1,28 @@ -xcursor (1.1.5.2-1) UNRELEASED; urgency=low +libxcursor (1.1.5.2-1) experimental; urgency=low - * Update to Debian modular tree dependencies. - * Add myself to uploaders + * First upload to Debian - -- David Nusinow <[EMAIL PROTECTED]> Thu, 29 Dec 2005 20:51:32 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Mon, 23 Jan 2006 22:43:51 -0500 +libxcursor (1.1.5.2-0ubuntu2) dapper; urgency=low + + * Change dependency on x-common to x11-common. + + -- Daniel Stone <[EMAIL PROTECTED]> Thu, 19 Jan 2006 18:24:22 +1100 + +libxcursor (1.1.5.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Repackage in line with all the other X libraries. + + -- Daniel Stone <[EMAIL PROTECTED]> Mon, 12 Dec 2005 15:14:52 +1100 + +xcursor (1.1.5-0ubuntu1) breezy; urgency=low + + * New upstream release. + + -- Daniel Stone <[EMAIL PROTECTED]> Wed, 16 Nov 2005 10:09:16 +1100 + xcursor (1.1.4-0ubuntu5) breezy; urgency=low * Bump Build-Depends on x11proto-core-dev, libx11-dev and libxfixes-dev Modified: branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/control =================================================================== --- branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/control 2006-01-24 03:09:30 UTC (rev 1113) +++ branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/control 2006-01-24 03:44:30 UTC (rev 1114) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Branden Robinson <[EMAIL PROTECTED]>, ISHIKAWA Mutsumi <[EMAIL PROTECTED]>, Daniel Stone <[EMAIL PROTECTED]>, David Nusinow <[EMAIL PROTECTED]> -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), x11proto-core-dev (>= 7.0.1-1), libx11-dev (>= 1:0.9.2-1), libxrender-dev (>= 1:0.9.0-2), libxfixes-dev (>= 1:3.0.0-4), pkg-config +Build-Depends: debhelper (>= 4.0.0), x11proto-core-dev (>= 6.2.1+cvs.20050722-1), libx11-dev (>= 1:6.2.1+cvs.20050722-1), libxrender-dev (>= 1:0.9.0-1), libxfixes-dev (>= 1:3.0.0-2), pkg-config Standards-Version: 3.6.1 Package: libxcursor1 Modified: branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor-dev.install =================================================================== --- branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor-dev.install 2006-01-24 03:09:30 UTC (rev 1113) +++ branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor-dev.install 2006-01-24 03:44:30 UTC (rev 1114) @@ -1,5 +1,5 @@ -debian/tmp/usr/include/X11/Xcursor/Xcursor.h -debian/tmp/usr/lib/libXcursor.a -debian/tmp/usr/lib/libXcursor.so -debian/tmp/usr/lib/pkgconfig/*.pc -debian/tmp/usr/share/man/man3/Xcursor.3 +usr/include/X11/Xcursor/Xcursor.h +usr/lib/libXcursor.a +usr/lib/libXcursor.so +usr/lib/pkgconfig/*.pc +usr/share/man/man3/* Modified: branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor1.install =================================================================== --- branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor1.install 2006-01-24 03:09:30 UTC (rev 1113) +++ branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/libxcursor1.install 2006-01-24 03:44:30 UTC (rev 1114) @@ -1 +1 @@ -debian/tmp/usr/lib/libXcursor.so.* usr/lib/ +usr/lib/libXcursor.so.* Modified: branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/rules =================================================================== --- branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/rules 2006-01-24 03:09:30 UTC (rev 1113) +++ branches/modular/lib/libXcursor-X11R7.0-1.1.5.2/debian/rules 2006-01-24 03:44:30 UTC (rev 1114) @@ -1,18 +1,93 @@ #!/usr/bin/make -f +# debian/rules for the Debian libxcursor package. +# Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]> +# Copyright © 2005 Daniel Stone <[EMAIL PROTECTED]> +# Copyright © 2005 David Nusinow <[EMAIL PROTECTED]> -# $Id: rules 50 2004-04-19 17:28:45Z branden $ +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -# Import Common Debian Build System (CDBS). -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +# set this to the name of the main shlib's binary package +PACKAGE = libxcursor1 -# RPATH is considered harmful by the Debian Project. -DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath +include debian/xsfbs/xsfbs.mk -export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig -# In Xcursor 1.1.2: -# XcursorImages structure added member *name. -# XcursorImagesSetName() added. -# XcursorLibraryPath() added. -# -DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libxcursor1 (>> 1.1.2)" +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +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_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + + +build: build-stamp +build-stamp: + dh_testdir + + mkdir 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)" + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + + touch build-stamp + +clean: + 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-* + + 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: build install + dh_testdir + dh_testroot + + dh_installdocs + dh_install --sourcedir=debian/tmp + dh_installchangelogs + dh_link + dh_strip --dbg-package=$(PACKAGE) + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_makeshlibs -V "libxcursor1 (>> 1.1.2)" + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
