.cvsignore | 19
.gitignore | 20
ChangeLog | 260
Makefile.in | 649 -
README | 20
aclocal.m4 | 7808 --------------
config.guess | 1411 --
config.h.in | 57
config.sub | 1500 --
configure |21602 ---------------------------------------
configure.ac | 2
debian/README.source | 73
debian/changelog | 60
debian/control | 29
debian/copyright | 7
debian/rules | 24
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 198
debian/xsfbs/xsfbs.sh | 533
depcomp | 530
install-sh | 323
ltmain.sh | 6863 ------------
man/Makefile.am | 1
man/Makefile.in | 415
man/suncg14.man | 6
missing | 360
src/Makefile.in | 501
src/cg14_driver.c | 8
29 files changed, 650 insertions(+), 42811 deletions(-)
New commits:
commit f884480daa7c5686c6b2172ac541566740bdcb0d
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 22:28:50 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 0a0b65c..fa4b7fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-suncg14 (1:1.1.1-4) UNRELEASED; urgency=low
+xserver-xorg-video-suncg14 (1:1.1.1-4) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
* Add myself to Uploaders.
- -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 22:28:32 +0200
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 22:28:49 +0200
xserver-xorg-video-suncg14 (1:1.1.1-3) unstable; urgency=low
commit facc5cb325169c8f92084dd4fe4c9e346cc06b8e
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 22:28:46 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index d28d759..0a0b65c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-suncg14 (1:1.1.1-4) UNRELEASED; urgency=low
* Build against Xserver 1.9.1 rc1.
+ * Add myself to Uploaders.
-- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 22:28:32 +0200
diff --git a/debian/control b/debian/control
index 659ffcc..a92a9d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-suncg14
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Jurij Smakov <ju...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Jurij Smakov
<ju...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5),
automake,
commit 382d349154e0e324077745afff5f2be7f32b263e
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 22:28:35 2010 +0200
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index 78e7b1c..d28d759 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-suncg14 (1:1.1.1-4) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 22:28:32 +0200
+
xserver-xorg-video-suncg14 (1:1.1.1-3) unstable; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
diff --git a/debian/control b/debian/control
index 52da733..659ffcc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libtool,
xutils-dev,
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-render-dev,
commit 1671a5475bee02af3a402ad0f8913809c10bea9e
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jun 4 15:36:10 2010 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 9ad99f5..78e7b1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-suncg14 (1:1.1.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-suncg14 (1:1.1.1-3) unstable; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
* Update xsfbs, use new ${xviddriver:Depends} substvar.
- -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:17 +0000
+ -- Julien Cristau <jcris...@debian.org> Fri, 04 Jun 2010 15:30:02 +0200
xserver-xorg-video-suncg14 (1:1.1.1-2) unstable; urgency=low
commit 33bf7e30f718332428842dc7a32c50be190ac645
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jun 4 15:29:25 2010 +0200
Update xsfbs, use new ${xviddriver:Depends} substvar.
diff --git a/debian/changelog b/debian/changelog
index 4fe0948..9ad99f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-suncg14 (1:1.1.1-3) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * Update xsfbs, use new ${xviddriver:Depends} substvar.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:17 +0000
diff --git a/debian/control b/debian/control
index 9d1f5ee..52da733 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libtool,
xutils-dev,
pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-render-dev,
@@ -20,7 +20,7 @@ XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunc
Package: xserver-xorg-video-suncg14
Architecture: sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-suncg14
Conflicts: xserver-xorg-driver-suncg14
commit 5b2cdac2d8ae41442efdffe4114b078dd673fb3f
Author: Mikhail Gusarov <dotted...@debian.org>
Date: Fri May 7 18:58:59 2010 +0700
Remove duplicate xorg.fd.o URL and confusing mailing list URL from
debian/control
diff --git a/debian/control b/debian/control
index b5d1b47..9d1f5ee 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,5 @@ Description: X.Org X server -- Sun CG14 display driver
.
More information about X.Org can be found at:
<URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xf86-video-suncg14 driver module.
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <k...@debian.org>
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep
2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >>
debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*"
branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
commit bae9f884d5ecebe9265bbbee000c007702b19605
Author: Julien Cristau <jul...@radis.liafa.jussieu.fr>
Date: Sat Jan 23 01:46:28 2010 +0100
Remove myself from Uploaders
diff --git a/debian/changelog b/debian/changelog
index 8ee9b9c..4fe0948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-suncg14 (1:1.1.1-3) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ * Remove myself from Uploaders
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:17 +0000
diff --git a/debian/control b/debian/control
index b522894..b5d1b47 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-suncg14
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Jurij Smakov
<ju...@debian.org>, Julien Cristau <jcris...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Jurij Smakov <ju...@debian.org>
Build-Depends:
debhelper (>= 5),
automake,
commit 6c8a0b33c34d6ef78d1012835d70bb8dc92324b8
Author: Julien Cristau <jul...@radis.liafa.jussieu.fr>
Date: Sat Jan 16 16:48:40 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index f8fc00a..8ee9b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-suncg14 (1:1.1.1-3) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:17 +0000
+
xserver-xorg-video-suncg14 (1:1.1.1-2) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 28f53ef..c4dd2b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
build-stamp:
dh_testdir
autoreconf -vfi
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -54,7 +54,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing
rm -f $$(find -name Makefile.in)
@@ -67,7 +67,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install serverabi
commit 2d9adf1a3e1294fc4fd209e250e637a1ebe18c82
Author: Julien Cristau <jcris...@smetana.debian.org>
Date: Fri Jan 15 16:29:15 2010 +0000
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5d79e73..f8fc00a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-suncg14 (1:1.1.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-suncg14 (1:1.1.1-2) unstable; urgency=low
+ [ Timo Aaltonen ]
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:11 +0200
+ -- Julien Cristau <jcris...@debian.org> Fri, 15 Jan 2010 16:24:08 +0000
xserver-xorg-video-suncg14 (1:1.1.1-1) unstable; urgency=low
commit c3fe3c54c1e66467f12377b40349d8a28fcb9c63
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Dec 5 02:09:30 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 9521d1f..5d79e73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-suncg14 (1:1.1.1-2) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 02 Dec 2009 10:22:11 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:11 +0200
xserver-xorg-video-suncg14 (1:1.1.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e41c2e9..b522894 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libtool,
xutils-dev,
pkg-config,
- xserver-xorg-dev (>= 2:1.2.99.902),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-render-dev,
commit d850d2553a0d47dea0bfcae8d087a7a5e146339f
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Wed Dec 2 10:23:56 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 2ab9e65..9521d1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-suncg14 (1:1.1.1-2) UNRELEASED; urgency=low
+
+ * Bump Standards-Version to 3.8.3.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 02 Dec 2009 10:22:11 +0200
+
xserver-xorg-video-suncg14 (1:1.1.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 6e1372c..e41c2e9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
x11proto-fonts-dev
-Standards-Version: 3.7.2.0
+Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-suncg14
XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-suncg14.git
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- problem=
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- problem=yes
- warn "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink")"
- fi
- elif [ -e "$symlink" ]; then
- problem=yes
- warn "$symlink is not a symbolic link"
- else
- problem=yes
- warn "$symlink symbolic link does not exist"
- fi
- if [ -n "$problem" ]; then
- analyze_path "$symlink" "$(readlink "$symlink")"
- find_culprits "$symlink"
- die "bad symbolic links on system"
- fi
- shift
- done
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless
$r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcris...@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjv9e-00061s...@alioth.debian.org
