xbitmaps: Changes to 'debian-unstable'
.gitignore | 10
COPYING | 58 +++-
ChangeLog | 122 ++++++++-
Makefile.am | 12
black6 | 4
box6 | 4
configure.ac | 10
debian/README.source | 73 +++++
debian/changelog | 20 +
debian/compat | 2
debian/control | 14 -
debian/rules | 30 +-
debian/watch | 2
debian/xbitmaps.install | 2
debian/xsfbs/repack.sh | 32 ++
debian/xsfbs/xsfbs.mk | 276 +++++++++++++++++++++
debian/xsfbs/xsfbs.sh | 622 ++++++++++++++++++++++++++++++++++++++++++++++++
17 files changed, 1245 insertions(+), 48 deletions(-)
New commits:
commit f87b8419b1641a3907f7aeb3bf2e1493604be3f9
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:46:13 2010 +0000
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 607d3df..970432d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xbitmaps (1.1.0-1) UNRELEASED; urgency=low
+xbitmaps (1.1.0-1) unstable; urgency=low
[ Andres Salomon ]
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
@@ -20,7 +20,7 @@ xbitmaps (1.1.0-1) UNRELEASED; urgency=low
* Install xbitmaps.pc in /usr/share instead of /usr/lib (closes: #551113).
Thanks, Colin Watson!
- -- Julien Cristau <jcristau@debian.org> Mon, 04 Jan 2010 17:33:46 +0000
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 Jan 2010 17:45:12 +0000
xbitmaps (1.0.1-2) unstable; urgency=low
commit 39ed2854209b1e383e8ed9add972eae74f4153c2
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:43:24 2010 +0000
Install xbitmaps.pc in /usr/share instead of /usr/lib (closes: #551113).
Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 2c3a91d..607d3df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ xbitmaps (1.1.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* New upstream release.
* Install the upstream changelog.
+ * Install xbitmaps.pc in /usr/share instead of /usr/lib (closes: #551113).
+ Thanks, Colin Watson!
-- Julien Cristau <jcristau@debian.org> Mon, 04 Jan 2010 17:33:46 +0000
diff --git a/debian/rules b/debian/rules
index 8c42c46..e490329 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/xbitmaps install
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install
diff --git a/debian/xbitmaps.install b/debian/xbitmaps.install
new file mode 100644
index 0000000..c9bbe47
--- /dev/null
+++ b/debian/xbitmaps.install
@@ -0,0 +1,2 @@
+usr/include/X11/bitmaps
+usr/lib/pkgconfig/xbitmaps.pc usr/share/pkgconfig
commit 2efc5c39edce1565b6a32dd1b4a5be7f1b4b86d0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:38:55 2010 +0000
Fix clean rule
diff --git a/debian/rules b/debian/rules
index 9473d77..8c42c46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ clean:
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
rm -f aclocal.m4 config.h.in configure install-sh missing
+ rm -f config.guess config.sub
find -name Makefile.in -delete
dh_clean
commit 732f0aabbf680b5104a51bb9c7efc7088230112f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:35:28 2010 +0000
Install the upstream changelog.
diff --git a/debian/changelog b/debian/changelog
index 675bf17..2c3a91d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xbitmaps (1.1.0-1) UNRELEASED; urgency=low
x11-common.
* Bump Standards-Version to 3.8.3.
* New upstream release.
+ * Install the upstream changelog.
-- Julien Cristau <jcristau@debian.org> Mon, 04 Jan 2010 17:33:46 +0000
diff --git a/debian/rules b/debian/rules
index 42bfd3a..9473d77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ binary-indep: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_installman
dh_link
dh_strip
commit 09903005634a87573fcea1f2aa8deda529a56430
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:34:59 2010 +0000
Bump xutils-dev build-dep
diff --git a/debian/control b/debian/control
index dd7ff34..639dacb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends:
debhelper (>= 5),
- xutils-dev,
+ xutils-dev (>= 1:7.5~),
automake,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xbitmaps
commit b1d0c5d27c1edbe1e5c50327f3c2951b956291bf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:34:21 2010 +0000
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e309e94
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,118 @@
+commit 193b9cc84f98af912e15fe7dc8bd16537b6a5f46
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 12 22:10:25 2009 -0700
+
+ xbitmaps 1.1.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 67ff90dc164d24bcc5efd7ae0eabdc674e7d7bda
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 12 22:07:50 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 1af293c2c0a1c058313a77074e62633c429d6b72
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 12 22:04:01 2009 -0700
+
+ Move black6 & box6 bitmaps from xmh module
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 234a598e41331bb29c10b77ac747e3009be37d27
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Tue Jan 27 15:23:52 2009 -0200
+
+ Correct make distcheck.
+
+commit 315699dafe12d8aefe52d230209d07a23ce1dd77
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Apr 1 11:21:59 2008 -0700
+
+ Create COPYING file from notice in terminal & X11R6.6 release notes
+
+ Bitmaps are unchanged from X11R6.6 (and much earlier X11 releases actually),
+ so this notice should still apply
+
+commit c6333fd4d5d71f022f3449fa7334db1887c9d2d9
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:35 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 9e1b04c09b7e29d469004532c815ef1d23519673
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:58 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 9ea77f242301dae5e78699ee5790e820cb17ab6e
+Author: Matthieu Herrb <matthieu@deville.herrb.com>
+Date: Mon Jul 31 17:02:44 2006 +0200
+
+ add .gitignore
+
+commit e497ae8e1cf7ab73d81b58ced9ff5f9c93469e8c
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:55 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit ab7c82c376d52183784af30abed63ed05d81cb1f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:23:39 2005 +0000
+
+ Stub COPYING files
+
+commit dfc57e683ca62aeeef14edbb9fa209a20421b12a
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:12 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 25f5688a3d9fea7105b46d747bdc5f84ba53c79f
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:58 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 7bfe2d14acc9bed4f5e8e8cc16bc8a46eafcae3b
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 5 00:25:06 2005 +0000
+
+ Add missing xlogo64 and xsnow files
+
+commit 69ecde64ec8cb3907ced612ca156a3ea4518239c
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:39 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit e064819df8ea9f09c925772056aa441cd36d7aab
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Fri Jul 15 16:43:19 2005 +0000
+
+ Build system for bitmaps
+
+commit 7eb852a0c6231282cfddb446e2b12f6436e95347
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 21ce3c7cde6e61e116b428160121b34f150ccc71
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:35 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/debian/changelog b/debian/changelog
index e891d71..675bf17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xbitmaps (1.0.1-3) UNRELEASED; urgency=low
+xbitmaps (1.1.0-1) UNRELEASED; urgency=low
[ Andres Salomon ]
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
@@ -15,8 +15,9 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
* Drop Conflicts/Replaces on pre-etch xlibs-data, and Pre-Depends on etch
x11-common.
* Bump Standards-Version to 3.8.3.
+ * New upstream release.
- -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 Jan 2010 17:33:46 +0000
xbitmaps (1.0.1-2) unstable; urgency=low
commit 4e2f70c8d83d193e7b69d0d911585ab16eb7ad2a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:31:38 2010 +0000
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 024b8da..e891d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
* Build the package in binary-indep, not binary-arch (lintian).
* Drop Conflicts/Replaces on pre-etch xlibs-data, and Pre-Depends on etch
x11-common.
+ * Bump Standards-Version to 3.8.3.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/control b/debian/control
index 9bfd028..dd7ff34 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5),
xutils-dev,
automake,
-Standards-Version: 3.6.1
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xbitmaps
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xbitmaps.git
commit ab328dee4ecfd49174551ce559ff4ed93d8d6909
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:21:44 2010 +0000
Drop Conflicts/Replaces on pre-etch xlibs-data, and Pre-Depends on etch x11-common.
diff --git a/debian/changelog b/debian/changelog
index b49dd02..024b8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
* Remove Branden and Fabio from Uploaders.
* Add Vcs-{Git,Browser} control fields.
* Build the package in binary-indep, not binary-arch (lintian).
+ * Drop Conflicts/Replaces on pre-etch xlibs-data, and Pre-Depends on etch
+ x11-common.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/control b/debian/control
index a012a1f..9bfd028 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xbitmaps.git
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.
commit 14b34e7f973d4871d840f662b954b1bce0fd728b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:19:51 2010 +0000
Build the package in binary-indep, not binary-arch (lintian).
diff --git a/debian/changelog b/debian/changelog
index 0df57fd..b49dd02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
* Bump debhelper compat level to 5.
* Remove Branden and Fabio from Uploaders.
* Add Vcs-{Git,Browser} control fields.
+ * Build the package in binary-indep, not binary-arch (lintian).
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/rules b/debian/rules
index ed79b7e..42bfd3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,10 @@ install: build
# Build architecture-dependent files here.
binary-arch: build install
+# Nothing to do
+
+# Build architecture-independent files here.
+binary-indep: build install
dh_testdir
dh_testroot
@@ -84,9 +88,5 @@ binary-arch: build install
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
commit fd9b7e1ac40768c12dd5b99296b7d75c51e5cd58
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:16:34 2010 +0000
Add Vcs-{Git,Browser} control fields.
diff --git a/debian/changelog b/debian/changelog
index 763c378..0df57fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
* Run autoreconf at build time.
* Bump debhelper compat level to 5.
* Remove Branden and Fabio from Uploaders.
+ * Add Vcs-{Git,Browser} control fields.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/control b/debian/control
index 852de4a..a012a1f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Build-Depends:
xutils-dev,
automake,
Standards-Version: 3.6.1
+Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xbitmaps
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xbitmaps.git
Package: xbitmaps
Architecture: all
commit 017e639c70197729c878c988f2847500c2aba7bb
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:15:23 2010 +0000
Remove Branden and Fabio from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 6cbb84d..763c378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
* Add watch file.
* Run autoreconf at build time.
* Bump debhelper compat level to 5.
+ * Remove Branden and Fabio from Uploaders.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/control b/debian/control
index 2460346..852de4a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ 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>
+Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends:
debhelper (>= 5),
xutils-dev,
commit b9796704eed616727be9c2c40c6ee01be0ab54cf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:15:03 2010 +0000
Bump debhelper compat level to 5.
diff --git a/debian/changelog b/debian/changelog
index 67246e1..6cbb84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add watch file.
* Run autoreconf at build time.
+ * Bump debhelper compat level to 5.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 8b75901..2460346 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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),
+ debhelper (>= 5),
xutils-dev,
automake,
Standards-Version: 3.6.1
commit cf4ccd55111df78b5f6c5e0817bc66fc32a5456c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:14:43 2010 +0000
Run autoreconf at build time.
diff --git a/debian/changelog b/debian/changelog
index 0a9aade..67246e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add watch file.
+ * Run autoreconf at build time.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
diff --git a/debian/control b/debian/control
index c27de6a..8b75901 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,10 @@ 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)
+Build-Depends:
+ debhelper (>= 4.0.0),
+ xutils-dev,
+ automake,
Standards-Version: 3.6.1
Package: xbitmaps
diff --git a/debian/rules b/debian/rules
index bc9bfbd..ed79b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,17 +7,17 @@
# 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)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -33,15 +33,14 @@ endif
build: build-stamp
build-stamp:
dh_testdir
-
- test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ autoreconf -vfi
+ mkdir -p 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
@@ -53,6 +52,8 @@ clean:
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
+ rm -f aclocal.m4 config.h.in configure install-sh missing
+ find -name Makefile.in -delete
dh_clean
commit c7ef340103e06082fb38dbfc05110bd394187e10
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 4 17:06:55 2010 +0000
Add watch file.
diff --git a/debian/changelog b/debian/changelog
index 49335cb..0a9aade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xbitmaps (1.0.1-3) UNRELEASED; urgency=low
+ [ Andres Salomon ]
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
* Run dh_install w/ --list-missing.
+ [ Julien Cristau ]
+ * Add watch file.
+
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:59:25 -0400
xbitmaps (1.0.1-2) unstable; urgency=low
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..2fa068a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/data/ xbitmaps-(.*)\.tar\.gz
commit 193b9cc84f98af912e15fe7dc8bd16537b6a5f46
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 22:10:25 2009 -0700
xbitmaps 1.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 5327bb1..2385477 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
+AC_INIT(xbitmaps, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 67ff90dc164d24bcc5efd7ae0eabdc674e7d7bda
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 22:07:50 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 0716aed..5327bb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,13 @@ AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=x
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-
AM_CONFIG_HEADER(config.h)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([
Makefile
commit 1af293c2c0a1c058313a77074e62633c429d6b72
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 22:04:01 2009 -0700
Move black6 & box6 bitmaps from xmh module
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Makefile.am b/Makefile.am
index 4c2f01a..bfd436d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ dist_bitmap_DATA = \
1x1 \
2x2 \
black \
+ black6 \
boxes \
+ box6 \
calculator \
cntr_ptr \
cntr_ptrmsk \
diff --git a/black6 b/black6
new file mode 100644
index 0000000..4e5384e
--- /dev/null
+++ b/black6
@@ -0,0 +1,4 @@
+#define black6_width 6
+#define black6_height 6
+static char black6_bits[] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
diff --git a/box6 b/box6
new file mode 100644
index 0000000..83ac4a7
--- /dev/null
+++ b/box6
@@ -0,0 +1,4 @@
+#define box6_width 6
+#define box6_height 6
+static char box6_bits[] = {
+ 0x3f, 0x21, 0x21, 0x21, 0x21, 0x3f};
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
Reply to: