hw/xprint/doc/Makefile.am | 5
hw/xprint/doc/Xprt.book |binary
hw/xprint/doc/Xprt.mif |42787 +++++++++++++++++++++++++++++++++++++++++++++
hw/xprint/doc/Xprt.ps |12838 +++++++++++++
hw/xprint/doc/XprtIX.doc |binary
hw/xprint/doc/XprtTOC.doc |binary
hw/xprint/doc/Xprt_cov.mif | 3054 +++
7 files changed, 58683 insertions(+), 1 deletion(-)
New commits:
commit 15d8633a07712cd7ecc44d2f2dc5989e38ba39ec
Author: Drew Parsons <dpars...@debian.org>
Date: Wed Oct 14 22:15:07 2009 +1100
Adapt debian scripts from xorg-xserver
Includes changes to build process (autoreconf is run during build) and
updated build-dependencies.
Add debian/README.source because it's nice and informative.
Remove debian/watch since there is no fixed xprint release upstream.
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+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
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
diff --git a/debian/control b/debian/control
index 988947c..066c4ed 100644
--- a/debian/control
+++ b/debian/control
@@ -2,39 +2,83 @@ Source: xprint
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau
<jcris...@debian.org>, Drew Parsons <dpars...@debian.org>, Brice Goglin
<bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Steve Langasek
<vor...@debian.org>, Julien Cristau <jcris...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>
# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
# server, and common dependencies for the DIX.
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
# x11proto-print-dev and libfreetype6-dev are for Xprint
# everything on is for the DMX and Xnest servers.
-Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
- x11proto-bigreqs-dev, x11proto-composite-dev (>= 1:0.4), x11proto-core-dev
(>= 7.0.9),
- x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
- x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>=
1.2),
- x11proto-record-dev, x11proto-render-dev (>= 2:0.9.3), x11proto-resource-dev,
- x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev,
- x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1),
- x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev,
- x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1),
- x11proto-input-dev (>= 1.4.2),
- libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev,
- libxkbfile-dev (>= 1:0.99.1-1), libpixman-1-dev (>= 0.9.4-2),
- x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386],
- x11proto-print-dev, libfreetype6-dev, xfonts-utils,
- mesa-swx11-source (>> 7.0.1~rc2-1),
- x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev (>= 6.5.1),
- libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1),
- libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1),
- libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1),
- libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1),
- libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1),
- libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1),
- libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386], libhal-dev
[!hurd-i386]
-Build-Conflicts: xlibs-static-dev
-Standards-Version: 3.8.3
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
+Build-Depends:
+ debhelper (>= 4.0.0),
+ quilt,
+ lsb-release,
+ pkg-config,
+ bison,
+ flex,
+ automake,
+ libtool,
+ xutils-dev,
+ x11proto-print-dev,
+ x11proto-bigreqs-dev,
+ x11proto-composite-dev (>= 1:0.4),
+ x11proto-core-dev (>= 7.0.13),
+ x11proto-damage-dev (>= 1.1),
+ x11proto-evie-dev,
+ x11proto-fixes-dev (>= 4.0),
+ x11proto-kb-dev (>= 1.0.3),
+ x11proto-xinerama-dev,
+ x11proto-randr-dev (>= 1.2.99.3),
+ x11proto-record-dev,
+ x11proto-render-dev (>= 2:0.9.3),
+ x11proto-resource-dev,
+ x11proto-scrnsaver-dev,
+ x11proto-trap-dev,
+ x11proto-video-dev,
+ x11proto-xcmisc-dev,
+ x11proto-xext-dev (>= 7.0.3),
+ x11proto-xf86bigfont-dev,
+ x11proto-xf86dga-dev,
+ x11proto-xf86vidmode-dev,
+ xtrans-dev (>= 1.2.2),
+ libxau-dev (>= 1:0.99.1),
+ x11proto-input-dev (>= 1.5),
+ x11proto-dri2-dev (>= 2.1),
+ libxdmcp-dev (>= 1:0.99.1),
+ libxfont-dev,
+ libfontenc-dev,
+ libxkbfile-dev (>= 1:0.99.1),
+ libpixman-1-dev (>= 0.13.2),
+ libpciaccess-dev,
+ libgcrypt-dev,
+ libdbus-1-dev [!hurd-i386],
+ libhal-dev [!hurd-i386],
+ libselinux1-dev (>= 2.0.80) [alpha amd64 arm armeb armel avr32 hppa i386 ia64
lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libaudit-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k
mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ x11proto-xf86dri-dev,
+ libdrm-dev (>= 2.4.3) [!hurd-i386],
+ x11proto-gl-dev (>= 1.4.9),
+ mesa-common-dev (>= 7.5),
+ libgl1-mesa-dev (>= 7.5),
+ libxmuu-dev (>= 1:0.99.1),
+ libxext-dev (>= 1:0.99.1),
+ libx11-dev (>= 1:0.99.2),
+ libxrender-dev (>= 1:0.9.0),
+ libxi-dev (>= 1:0.99.1),
+ x11proto-dmx-dev,
+ libdmx-dev (>= 1:1.0.1),
+ libxpm-dev (>= 1:3.5.3),
+ libxaw7-dev (>= 1:0.99.1),
+ libxt-dev (>= 1:0.99.1),
+ libxmu-dev (>= 1:0.99.1),
+ libxtst-dev (>= 1:0.99.1),
+ libxres-dev (>= 1:0.99.1),
+ libxfixes-dev (>= 1:3.0.0),
+ libxv-dev,
+ libxinerama-dev,
+ libssl-dev
+Standards-Version: 3.8.2
+Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xprint
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xprint.git
Package: xprint
Architecture: any
diff --git a/debian/rules b/debian/rules
index 126757e..371141c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,17 @@
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
-CPPFLAGS += -DPRE_RELEASE=0
+
+#CPPFLAGS += -DPRE_RELEASE=0
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -30,11 +32,21 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-#ifeq ($(DEB_HOST_ARCH_OS), linux)
-# build_xfbdev = --enable-xfbdev
-#else
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ build_xfbdev = --enable-xfbdev
+ selinux = --enable-xselinux
+else
build_xfbdev = --disable-xfbdev
-#endif
+ selinux = --disable-xselinux
+endif
+
+ifeq ($(DEB_HOST_ARCH), hurd-i386)
+ dri = --disable-dri --disable-dri2
+ config_hal = --disable-config-hal
+else
+ dri = --enable-dri --enable-dri2
+ config_hal = --enable-config-hal
+endif
INSTALL=/usr/bin/install
@@ -42,42 +54,89 @@ VENDOR = $(shell lsb_release -i -s)
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
-confflags += --disable-static \
- --with-mesa-source=/usr/share/mesa-source \
-
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
\
- --with-serverconfig-path=/etc/X11/xserver \
- --with-rgb-path=/etc/X11/rgb \
- --enable-xtrap \
- --enable-vfb \
- --disable-xsdl \
- --disable-xfake \
- $(build_xfbdev) \
- --disable-lbx \
- --enable-freetype \
- --disable-xorgconfig \
- --disable-xorgcfg \
+confflags += \
+ --disable-static \
+ --without-dtrace \
+ --disable-werror \
+ --disable-debug \
+ --with-int10=x86emu \
+ --with-os-vendor="$(VENDOR)" \
+ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(BUILDER))" \
+
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins"
\
+ --enable-builtin-fonts \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
+ --disable-builddocs \
+ --disable-install-libxf86config \
+ --disable-null-root-cursor \
+ --enable-aiglx \
+ --enable-glx-tls \
+ --enable-registry \
+ --enable-composite \
+ --enable-mitshm \
+ --enable-xres \
+ --enable-record \
+ --enable-xv \
+ --enable-xvmc \
+ --enable-dga \
+ --enable-screensaver \
+ --enable-xdmcp \
+ --enable-xdm-auth-1 \
+ --enable-glx \
+ $(dri) \
+ --enable-xinerama \
+ --enable-xf86vidmode \
+ --enable-xace \
+ $(selinux) \
+ --disable-xcsecurity \
+ --disable-xcalibrate \
+ --disable-tslib \
+ --disable-multibuffer \
+ --enable-dbe \
+ --disable-xf86bigfont \
+ --enable-dpms \
+ --disable-config-dbus \
+ $(config_hal) \
--enable-xfree86-utils \
- --with-os-name="$(shell uname)" \
- --with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \
- --with-int10=x86emu \
- --disable-type1 \
- --disable-glx
+ --disable-xorg \
+ --disable-dmx \
+ --disable-xvfb \
+ --disable-xnest \
+ --disable-xquartz \
+ --disable-xwin \
+ --disable-kdrive \
+ --disable-xephyr \
+ --disable-xsdl \
+ --disable-xfake \
+ $(build_xfbdev) \
+ --enable-xprint \
+ --disable-install-setuid
-build: patch build-stamp
-build-stamp:
+
+configure: $(STAMP_DIR)/patch
dh_testdir
-
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)/GL
+ autoreconf -vfi
+
+obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+ dh_testdir
+ mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --sysconfdir=/etc \
- --localstatedir=/var $(confflags) CFLAGS="$(CFLAGS)" \
- CPPFLAGS="$(CPPFLAGS)"
+ ../configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ $(confflags) \
+ CFLAGS="$(CFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)"
+
+
+build: build-stamp
+build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+ dh_testdir
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
- touch build-stamp
+ >$@
clean: xsfclean
dh_testdir
@@ -95,8 +154,10 @@ clean: xsfclean
# more generated files
rm -f include/dix-config.h include/do-not-use-config.h \
include/xorg-config.h include/xorg-server.h
- # needed for git snapshots
- chmod +x configure
+ rm -f $$(find -name Makefile.in)
+ rm -f compile config.guess config.sub configure depcomp install-sh
+ rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap
+ rm -f include/do-not-use-config.h.in
dh_clean
@@ -111,13 +172,6 @@ install: build
# oh, yuck.
find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \
xargs rm -f
-
- install -m 755 debian/local/xvfb-run debian/tmp/usr/bin
- install debian/local/xvfb-run.1 debian/tmp/usr/share/man/man1
-
-# # something funny going on with Xprinters, will have to sort it out
upstream
-# mv debian/tmp/usr/lib/X11/xserver/C/print/Xprinters.ghostscript
debian/tmp/usr/lib/X11/xserver/C/print/Xprinters
-
# stub to start building deb files, used by binary-indep and binary-arch
binary-initial:
@@ -137,42 +191,19 @@ binary-deb:
# Build architecture-dependent files here.
binary-arch: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-initial
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-initial
- dh_installdocs -a
- dh_installchangelogs -a ChangeLog
- dh_install -a --sourcedir=debian/tmp --list-missing
-Xusr/share/man/man1/Xprt -Xusr/lib/X11/xserver
-Xetc/X11/Xsession.d/92xprint-xpserverlist
- $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
- $(INSTALL) -m644 $(CURDIR)/debian/videoabiver \
-
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver
- $(INSTALL) -m644 $(CURDIR)/debian/inputabiver \
-
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/inputabiver
- $(INSTALL) -m644 $(CURDIR)/debian/serverminver \
-
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver
- $(INSTALL) -m 755 -d
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
- $(INSTALL) -m 755 debian/xserver-xorg-core.bug.script
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
- dh_installdebconf -a
- dh_installman -a
-ifeq ($(BUILD_XPRINT), true)
+ dh_installdocs -s
+ dh_installchangelogs -s ChangeLog
+ dh_install -s --sourcedir=debian/tmp --list-missing
-Xusr/share/man/man1/Xprt -Xusr/lib/X11/xserver
-Xetc/X11/Xsession.d/92xprint-xpserverlist
+ dh_installdebconf -s
+ dh_installman -s
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-overrides
$(CURDIR)/debian/xprint/usr/share/lintian/overrides/xprint
# xprint docs are linked to xprint-common
rm -rf debian/xprint/usr/share/doc/xprint
-endif
-
- dh_link -a
- dh_strip -a --exclude=usr/lib/xorg/modules \
- --dbg-package=xserver-xorg-core
- for i in $$(find debian/xserver-xorg-core/usr/lib/xorg/modules -name
"lib*.so"); do \
- mkdir -p $$(dirname
debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/}) &&
\
- objcopy --only-keep-debug $$i
debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/} && \
- objcopy
--add-gnu-debuglink=debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/}
$$i; \
- done
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so" | \
- xargs --no-run-if-empty \
- strip --strip-debug --remove-section=.note --remove-section=.comment
-endif
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-deb
+ dh_link -s
+ dh_strip -s
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-deb
# Build architecture-independent files here (xprint-common)
@@ -180,7 +211,6 @@ binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i --sourcedir=debian/tmp --list-missing -Xusr/share/man
-Xusr/include/xorg -Xusr/share/aclocal -Xusr/lib/xorg/modules
-Xusr/lib/pkgconfig/xorg-server.pc -Xusr/bin -XSecurityPolicy -Xvar/lib/xkb
-Xusr/lib/X11/Cards -Xusr/lib/X11/Options
-ifeq ($(BUILD_XPRINT), true)
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-common-overrides
$(CURDIR)/debian/xprint-common/usr/share/lintian/overrides/xprint-common
# split Xprint config files so font files do not land in /etc
# (for xprint-common only)
@@ -191,7 +221,6 @@ ifeq ($(BUILD_XPRINT), true)
# dh_install cannot rename files, sigh
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-common.default
$(CURDIR)/debian/xprint-common/etc/default/xprint
dh_installinit -p xprint-common --name=xprint
-endif
dh_installdocs -i
dh_installchangelogs -i ChangeLog
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 249555d..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/xserver/
xorg-server-(.*)\.tar\.gz
commit 52501cafb3895a0c029c8bc8cacf4f1ac2c5ab20
Author: Drew Parsons <dpars...@debian.org>
Date: Wed Oct 14 21:49:41 2009 +1100
Remove debian/prune
It only contained non-free, referring to hw/xfree86/doc/README.DRI
which is no longer in xprint.
diff --git a/debian/prune/non-free b/debian/prune/non-free
deleted file mode 100644
index 7bcc911..0000000
--- a/debian/prune/non-free
+++ /dev/null
@@ -1 +0,0 @@
-hw/xfree86/doc/README.DRI
commit 722e6024fb68f1874b563a276f3969397afb721a
Author: Drew Parsons <dpars...@debian.org>
Date: Wed Oct 14 21:44:57 2009 +1100
xprint (2:1.5.0-1): the Requiem release
Can you hear the chanting of the last rites?
diff --git a/debian/changelog b/debian/changelog
index cd1ae8c..d8abbf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xprint (2:1.5~git20080513-1) UNRELEASED; urgency=low
+xprint (2:1.5.0-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Pass -DPRE_RELEASE=0 in CPPFLAGS, so we don't print the pre-release
warning in the Xorg log.
[ Drew Parsons ]
+ * The Requiem release. Xprint R.I.P.
* Pull from new upstream xprint repo (master branch).
- disables dbus from xprint. dbus had been causing Xprt's
Dispatch() loop to spin at 95% cpu. Closes: #472180.
@@ -25,7 +26,7 @@ xprint (2:1.5~git20080513-1) UNRELEASED; urgency=low
* State in the xprint package description that Xprint is deprecated
and will be removed from the next Debian release.
- -- Drew Parsons <dpars...@debian.org> Sun, 06 Sep 2009 15:25:30 +1000
+ -- Drew Parsons <dpars...@debian.org> Wed, 14 Oct 2009 21:26:10 +1100
xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low
commit ff7d941fd05f0301085f381a5eafc4e4070c21e6
Author: Drew Parsons <dpars...@debian.org>
Date: Wed Oct 14 21:24:54 2009 +1100
Delete debian/patches/09_debian_xserver_rtff.diff
It's not used anyway, and built-in fonts are now included.
diff --git a/debian/patches/09_debian_xserver_rtff.diff
b/debian/patches/09_debian_xserver_rtff.diff
deleted file mode 100644
index e4c7e10..0000000
--- a/debian/patches/09_debian_xserver_rtff.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-$Id: 910_debian_Xserver_RTFF.diff 486 2005-08-03 04:51:11Z dnusinow $
-
-Give the user a far stronger clue as to what to do when their font
configuration
-is horribly screwed up; this patch by Branden Robinson.
-
-Index: dix/main.c
-===================================================================
---- dix/main.c.orig 2006-11-13 19:59:22.000000000 +0100
-+++ dix/main.c 2006-11-26 01:55:13.000000000 +0100
-@@ -407,10 +407,42 @@
- defaultFontPath);
- }
- if (!SetDefaultFont(defaultTextFont))
-+#ifdef DEBIAN
-+ FatalError("could not open default font '%s';\n"
-+"the X server's font paths might be misconfigured, remote font server(s)\n"
-+"may be unreachable, and/or local fonts may not be installed or are not\n"
-+"configured correctly.\n"
-+"\n"
-+"People inexperienced with the X Window System should have the\n"
-+"\"xorg\" package installed.\n"
-+"# apt-get install xorg\n"
-+"\n"
-+"Other useful commands to run include:\n"
-+"$ dpkg --status x11-common\n"
-+"$ dpkg --status xfonts-base\n"
-+"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont);
-+#else
- FatalError("could not open default font '%s'", defaultTextFont);
-+#endif
- if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0)))
-+#ifdef DEBIAN
-+ FatalError("could not open default cursor font '%s';\n"
-+"the X server's font paths might be misconfigured, remote font server(s)\n"
-+"may be unreachable, and/or local fonts may not be installed or are not\n"
-+"configured correctly.\n"
-+"\n"
-+"People inexperienced with the X Window System should have the\n"
-+"\"xorg\" package installed.\n"
-+"# apt-get install xorg\n"
-+"\n"
-+"Other useful commands to run include:\n"
-+"$ dpkg --status x11-common\n"
-+"$ dpkg --status xfonts-base\n"
-+"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont);
-+#else
- FatalError("could not open default cursor font '%s'",
- defaultCursorFont);
-+#endif
- #ifdef DPMSExtension
- /* check all screens, looking for DPMS Capabilities */
- DPMSCapableFlag = DPMSSupported();
commit be00fd81bd0d39ff26c09f5d5839689dcae5f4b5
Author: Drew Parsons <dpars...@debian.org>
Date: Wed Oct 14 21:02:22 2009 +1100
xprint package description: Xprint is deprecated
Notify that xprint will be removed from the next Debian release.
Also standards version 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 639a827..cd1ae8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,11 @@ xprint (2:1.5~git20080513-1) UNRELEASED; urgency=low
to Xprint).
* Oh yes, like the Night of the Zombies, xprint is Back!
Closes: #448970.
+ * Standards version 3.8.3.
+ * State in the xprint package description that Xprint is deprecated
+ and will be removed from the next Debian release.
- -- Drew Parsons <dpars...@debian.org> Sat, 17 May 2008 23:14:11 +1000
+ -- Drew Parsons <dpars...@debian.org> Sun, 06 Sep 2009 15:25:30 +1000
xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2b74750..988947c 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config,
bison, flex,
libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1),
libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386], libhal-dev
[!hurd-i386]
Build-Conflicts: xlibs-static-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -51,6 +51,11 @@ Description: X11 print system (binary)
for printing from Mozilla, including non-Latin characters and MathML.
TrueType fonts are supported.
.
+ Please note that Xprint is now deprecated and will be removed from the
+ next Debian release. Those looking for the Xprint WYSIWYP functionality
+ ("what you see is what you print") should consider switching to the Cairo
+ library.
+ .
Xprint uses ttf2pt1 internally for some font support.
.
More information about X.Org can be found at:
commit 6b52a81f5799338cb2b4a19d1c7ff1ac2074aeb8
Author: Drew Parsons <dpars...@debian.org>
Date: Sun May 18 01:39:15 2008 +1000
Disable GLX support temporarily
until Debian packages mesa git master.
Needed to define __GLcoreModule, for instance.
diff --git a/debian/rules b/debian/rules
index 7e7572f..126757e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,8 @@ confflags += --disable-static \
--with-os-name="$(shell uname)" \
--with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \
--with-int10=x86emu \
- --disable-type1
+ --disable-type1 \
+ --disable-glx
build: patch build-stamp
build-stamp:
commit c78e34b2cb30f3b0bcbcadedd3d35b8843fa956e
Author: Drew Parsons <dpars...@debian.org>
Date: Sat May 17 23:24:58 2008 +1000
Remove deprecrated debian patches
21,46,93 have been incorporated upstream,
13 is not relevant to Xprint.
diff --git a/debian/changelog b/debian/changelog
index c472aec..639a827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,20 @@ xprint (2:1.5~git20080513-1) UNRELEASED; urgency=low
- disables dbus from xprint. dbus had been causing Xprt's
Dispatch() loop to spin at 95% cpu. Closes: #472180.
- configured to build with libs, allowing patch
- 94_xprint_XSERVER_LIBS to be removed.
+ 94_xprint_XSERVER_LIBS to be removed.
+ - incorporates patches:
+ 21_glx_align_fixes.patch
+ 46_reduce_wakeups_from_smart_scheduler.patch
+ 93_xprint_fonts_fix
+ 94_xprint_XSERVER_LIBS
+ - removes other ddxs, deprecating many others of the debian patches.
* Adjust debian/control and rules to only build xprint.
+ * Drop 13_debian_add_xkbpath_env_variable.diff (xkb is not relevant
+ to Xprint).
* Oh yes, like the Night of the Zombies, xprint is Back!
Closes: #448970.
- -- Drew Parsons <dpars...@debian.org> Wed, 14 May 2008 01:28:56 +1000
+ -- Drew Parsons <dpars...@debian.org> Sat, 17 May 2008 23:14:11 +1000
xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low
diff --git a/debian/patches/13_debian_add_xkbpath_env_variable.diff
b/debian/patches/13_debian_add_xkbpath_env_variable.diff
deleted file mode 100644
index 0692f46..0000000
--- a/debian/patches/13_debian_add_xkbpath_env_variable.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- xorg-server.orig/xkb/xkbInit.c
-+++ xorg-server/xkb/xkbInit.c
-@@ -835,6 +835,14 @@
- extern unsigned char XkbDfltAccessXOptions;
-
- int
-+xkbInitGlobals()
-+{
-+ char * xkbpath= getenv("XKBPATH");
-+ if (xkbpath!=NULL)
-+ XkbBaseDirectory= xkbpath;
-+}
-+
-+int
- XkbProcessArguments(int argc,char *argv[],int i)
- {
- if (strcmp(argv[i],"-kb")==0) {
---- xorg-server.orig/os/utils.c
-+++ xorg-server/os/utils.c
-@@ -684,6 +684,7 @@
- */
- void InitGlobals(void)
- {
-+ xkbInitGlobals();
- ddxInitGlobals();
- }
-
diff --git a/debian/patches/21_glx_align_fixes.patch
b/debian/patches/21_glx_align_fixes.patch
deleted file mode 100644
index e597094..0000000
--- a/debian/patches/21_glx_align_fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- xorg-server.orig/GL/glx/Makefile.am
-+++ xorg-server/GL/glx/Makefile.am
-@@ -14,7 +14,8 @@
- -...@mesa_source@/src/mesa/glapi \
- -...@mesa_source@/src/mesa/main \
- -DXFree86Server \
-- @GLX_DEFINES@
-+ @GLX_DEFINES@ \
-+ @GLX_ARCH_DEFINES@
-
- # none yet
- #sdk_HEADERS =
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -287,6 +287,7 @@
- case $host_os in
- *netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha
IO]) ;;
- esac
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
- ;;
- arm*)
- ARM_VIDEO=yes
-@@ -317,6 +318,7 @@
- xorg_loader_sparcmuldiv="yes"
- SPARC64_VIDEO=yes
- BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- ;;
- x86_64*|amd64*)
- use_x86_asm="yes"
-@@ -332,8 +334,16 @@
- SYS_LIBS=-lamd64
- ;;
- esac
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
-+ ;;
-+ ia64*)
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
-+ ;;
-+ s390*)
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- ;;
- esac
-+AC_SUBST(GLX_ARCH_DEFINES)
-
- dnl BSD *_video.c selection
- AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
---- xorg-server.orig/hw/dmx/glxProxy/Makefile.am
-+++ xorg-server/hw/dmx/glxProxy/Makefile.am
-@@ -32,6 +32,7 @@
- unpack.h
-
- AM_CFLAGS = \
-+ @GLX_ARCH_DEFINES@ \
- $(DIX_CFLAGS) \
- -I$(top_srcdir)/hw/dmx \
- -I$(top_srcdir)/include \
diff --git a/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
b/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
deleted file mode 100644
index fa3e4a8..0000000
--- a/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-commit 2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7
-Author: Arjan van de Ven <ar...@linux.intel.com>
-Date: Sun Oct 28 09:37:52 2007 +0100
-
- reduce wakeups from smart scheduler
-
- The smart scheduler itimer currently always fires after each request
- (which in turn causes the CPU to wake out of idle, burning precious
- power). Rather than doing this, just stop the timer before going into
- the select() portion of the WaitFor loop. It's a cheap system call, and
- it will only get called if there's no more commands batched up from the
- active fd.
-
- This change also allows some of the functions to be simplified;
- setitimer() will only fail if it's passed invalid data, and we don't do
- that... so make it void and remove all the conditional code that deals
- with failure.
-
- The change also allows us to remove a few variables that were used for
- housekeeping between the signal handler and the main loop.
-
- Signed-off-by: Keith Packard <kei...@koto.keithp.com>
-
-commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
-Author: Keith Packard <kei...@koto.keithp.com>
-Date: Wed Nov 7 16:33:10 2007 -0800
-
- Don't frob timers unless SmartSchedule is running
-
---- xorg-server.orig/include/dixstruct.h
-+++ xorg-server/include/dixstruct.h
-@@ -150,11 +150,9 @@
- extern long SmartScheduleInterval;
- extern long SmartScheduleSlice;
- extern long SmartScheduleMaxSlice;
--extern unsigned long SmartScheduleIdleCount;
- extern Bool SmartScheduleDisable;
--extern Bool SmartScheduleIdle;
--extern Bool SmartScheduleTimerStopped;
--extern Bool SmartScheduleStartTimer(void);
-+extern void SmartScheduleStartTimer(void);
-+extern void SmartScheduleStopTimer(void);
- #define SMART_MAX_PRIORITY (20)
- #define SMART_MIN_PRIORITY (-20)
-
---- xorg-server.orig/os/WaitFor.c
-+++ xorg-server/os/WaitFor.c
-@@ -217,7 +217,8 @@
- XFD_COPYSET(&AllSockets, &LastSelectMask);
- #ifdef SMART_SCHEDULE
- }
-- SmartScheduleIdle = TRUE;
-+ SmartScheduleStopTimer ();
-+
- #endif
- BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
- if (NewOutputPending)
-@@ -237,13 +238,7 @@
- selecterr = GetErrno();
- WakeupHandler(i, (pointer)&LastSelectMask);
- #ifdef SMART_SCHEDULE
-- if (i >= 0)
-- {
-- SmartScheduleIdle = FALSE;
-- SmartScheduleIdleCount = 0;
-- if (SmartScheduleTimerStopped)
-- (void) SmartScheduleStartTimer ();
-- }
-+ SmartScheduleStartTimer ();
- #endif
- if (i <= 0) /* An error or timeout occurred */
- {
---- xorg-server.orig/os/utils.c
-+++ xorg-server/os/utils.c
-@@ -1513,10 +1513,6 @@
-
- #ifdef SMART_SCHEDULE
-
--unsigned long SmartScheduleIdleCount;
--Bool SmartScheduleIdle;
--Bool SmartScheduleTimerStopped;
--
- #ifdef SIGVTALRM
- #define SMART_SCHEDULE_POSSIBLE
- #endif
-@@ -1526,49 +1522,43 @@
- #define SMART_SCHEDULE_TIMER ITIMER_REAL
- #endif
-
--static void
-+void
- SmartScheduleStopTimer (void)
- {
- #ifdef SMART_SCHEDULE_POSSIBLE
- struct itimerval timer;
-
-+ if (SmartScheduleDisable)
-+ return;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = 0;
- timer.it_value.tv_sec = 0;
- timer.it_value.tv_usec = 0;
- (void) setitimer (ITIMER_REAL, &timer, 0);
-- SmartScheduleTimerStopped = TRUE;
- #endif
- }
-
--Bool
-+void
- SmartScheduleStartTimer (void)
- {
- #ifdef SMART_SCHEDULE_POSSIBLE
- struct itimerval timer;
-
-- SmartScheduleTimerStopped = FALSE;
-+ if (SmartScheduleDisable)
-+ return;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
- timer.it_value.tv_sec = 0;
- timer.it_value.tv_usec = SmartScheduleInterval * 1000;
-- return setitimer (ITIMER_REAL, &timer, 0) >= 0;
-+ setitimer (ITIMER_REAL, &timer, 0);
- #endif
-- return FALSE;
- }
-
- #ifdef SMART_SCHEDULE_POSSIBLE
- static void
- SmartScheduleTimer (int sig)
- {
-- int olderrno = errno;
--
- SmartScheduleTime += SmartScheduleInterval;
-- if (SmartScheduleIdle)
-- {
-- SmartScheduleStopTimer ();
-- }
-- errno = olderrno;
- }
- #endif
-
-@@ -1592,14 +1582,6 @@
- perror ("sigaction for smart scheduler");
- return FALSE;
- }
-- /* Set up the virtual timer */
-- if (!SmartScheduleStartTimer ())
-- {
-- perror ("scheduling timer");
-- return FALSE;
-- }
-- /* stop the timer and wait for WaitForSomething to start it */
-- SmartScheduleStopTimer ();
- return TRUE;
- #else
- return FALSE;
diff --git a/debian/patches/93_xprint_fonts_fix
b/debian/patches/93_xprint_fonts_fix
deleted file mode 100644
index 78060c5..0000000
--- a/debian/patches/93_xprint_fonts_fix
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xorg-server-old/hw/xprint/ps/psout_ft.c
xorg-server/hw/xprint/ps/psout_ft.c
---- xorg-server-old/hw/xprint/ps/psout_ft.c 2006-04-02 10:09:43.000000000
+1000
-+++ xorg-server/hw/xprint/ps/psout_ft.c 2006-04-14 22:22:42.000000000
+1000
-@@ -280,6 +280,8 @@
- else
- {
- sprintf(buf, "%s", baseFontName);
-+ xfree(self->FontName);
-+ self->FontName = NULL;
- }
-
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
