X Strike Force X.Org X11 SVN commit: r1123 - in branches/modular/data: . data xbitmaps-X11R7.0-1.0.1 xbitmaps-X11R7.0-1.0.1/debian xcursor-themes-X11R7.0-1.0.1 xcursor-themes-X11R7.0-1.0.1/debian
Author: dnusinow
Date: 2006-01-26 21:55:05 -0500 (Thu, 26 Jan 2006)
New Revision: 1123
Added:
branches/modular/data/xbitmaps-X11R7.0-1.0.1/
branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/
branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/changelog
branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/compat
branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/control
branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/copyright
branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/rules
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/changelog
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/compat
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/control
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/copyright
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/core.theme
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/handhelds.theme
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/redglass.theme
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/rules
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/whiteglass.theme
branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/xcursor-themes.install
branches/modular/data/xkbdata-X11R7.0-1.0.1/
Removed:
branches/modular/data/data/xbitmaps-X11R7.0-1.0.1/
branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/
branches/modular/data/data/xkbdata-X11R7.0-1.0.1/
Log:
Move the data and add packaging for what ubuntu has already packaged
Copied: branches/modular/data/xbitmaps-X11R7.0-1.0.1 (from rev 1122, branches/modular/data/data/xbitmaps-X11R7.0-1.0.1)
Added: branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/data/data/xbitmaps-X11R7.0-1.0.1/debian/changelog 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/changelog 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,29 @@
+xbitmaps (1.0.1-1) experimental; urgency=low
+
+ * First upload to Debian
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 26 Jan 2006 21:48:49 -0500
+
+xbitmaps (1.0.1-0ubuntu2) dapper; urgency=low
+
+ * Change dependency on x-common to x11-common.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Thu, 19 Jan 2006 18:38:13 +1100
+
+xbitmaps (1.0.1-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Fri, 6 Jan 2006 07:47:41 +1100
+
+xbitmaps (1.0.0-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 19 Dec 2005 09:29:29 +1100
+
+xbitmaps (0.99.0-1) breezy; urgency=low
+
+ * First xbitmaps release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 11 Jul 2005 15:07:19 +1000
Added: branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/compat
===================================================================
--- branches/modular/data/data/xbitmaps-X11R7.0-1.0.1/debian/compat 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/compat 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1 @@
+4
Added: branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/control
===================================================================
--- branches/modular/data/data/xbitmaps-X11R7.0-1.0.1/debian/control 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/control 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,17 @@
+Source: xbitmaps
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.1.0
+
+Package: xbitmaps
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: xlibs-data (<< 6.8.2-35)
+Replaces: xlibs-data (<< 6.8.2-35)
+Pre-Depends: x11-common (>= 1:1.0.0-1)
+Description: Base X bitmaps
+ This package contains the base X bitmaps, which are used in many legacy X
+ clients.
Added: branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/copyright
===================================================================
--- branches/modular/data/data/xbitmaps-X11R7.0-1.0.1/debian/copyright 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/copyright 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,23 @@
+Copyright 1988, 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.
Added: branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/data/data/xbitmaps-X11R7.0-1.0.1/debian/rules 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/rules 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,91 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian xbitmaps 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
+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) && CFLAGS="$(CFLAGS)" \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+ $(confflags)
+ 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/xbitmaps install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs
+ dh_install --sourcedir=debian/tmp
+ dh_installchangelogs
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ 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
Property changes on: branches/modular/data/xbitmaps-X11R7.0-1.0.1/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Copied: branches/modular/data/xcursor-themes-X11R7.0-1.0.1 (from rev 1122, branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1)
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/changelog 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/changelog 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,29 @@
+xcursor-themes (1.0.1-1) experimental; urgency=low
+
+ * First upload to Debian
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 26 Jan 2006 21:53:08 -0500
+
+xcursor-themes (1.0.1-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Fri, 6 Jan 2006 07:43:34 +1100
+
+xcursor-themes (1.0.0.0-0ubuntu1) dapper; urgency=low
+
+ * New upstream release (1.0.0).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 19 Dec 2005 09:30:29 +1100
+
+xcursor-themes (1.0.0-2) breezy; urgency=low
+
+ * Add Conflicts/Replaces with old xlibs-data.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Tue, 12 Jul 2005 12:09:33 +1000
+
+xcursor-themes (1.0.0-1) breezy; urgency=low
+
+ * First xcursor-themes release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 11 Jul 2005 15:07:19 +1000
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/compat
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/compat 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/compat 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1 @@
+4
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/control
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/control 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/control 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,19 @@
+Source: xcursor-themes
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Build-Depends: debhelper (>= 4.0.0), xcursorgen | xbase-clients (<< 6.8.2-35)
+Standards-Version: 3.6.1.0
+
+Package: xcursor-themes
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: xlibs-data (<< 6.8.2-35)
+Replaces: xlibs-data (<< 6.8.2-35)
+Description: Base X cursor themes
+ This package contains the base X cursor themes -- handhelds, redglass, and
+ whiteglass. These themes used to be contained in the xlibs-data package. They
+ are for use with the Xcursor library.
+ .
+ Please see libxcursor1 for more information.
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/copyright
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/copyright 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/copyright 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,2 @@
+This package is licensed under the MIT/X11 licence; please see
+/usr/share/doc/x-common/copyright for full copyright information.
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/core.theme
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/core.theme 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/core.theme 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=core
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/handhelds.theme
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/handhelds.theme 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/handhelds.theme 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=handhelds
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/redglass.theme
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/redglass.theme 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/redglass.theme 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=redglass
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/rules 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/rules 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian xcursor-themes 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
+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) && CFLAGS="$(CFLAGS)" \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+ $(confflags)
+ 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
+
+ install -d $(CURDIR)/debian/tmp/etc/X11/cursors
+ install -m 644 $(CURDIR)/debian/*.theme $(CURDIR)/debian/tmp/etc/X11/cursors/
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs
+ dh_install --sourcedir=debian/tmp
+ dh_installchangelogs
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ 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
Property changes on: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/whiteglass.theme
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/whiteglass.theme 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/whiteglass.theme 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=whiteglass
Added: branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/xcursor-themes.install
===================================================================
--- branches/modular/data/data/xcursor-themes-X11R7.0-1.0.1/debian/xcursor-themes.install 2006-01-27 02:44:46 UTC (rev 1122)
+++ branches/modular/data/xcursor-themes-X11R7.0-1.0.1/debian/xcursor-themes.install 2006-01-27 02:55:05 UTC (rev 1123)
@@ -0,0 +1,2 @@
+usr/share/icons/*
+etc/X11/cursors/*
Copied: branches/modular/data/xkbdata-X11R7.0-1.0.1 (from rev 1122, branches/modular/data/data/xkbdata-X11R7.0-1.0.1)
Reply to: