Bug#730552: provide xserver-xorg-source package for building 3rd party software (e.g. VNC) reusing XOrg codebase
On Fri, Dec 27, 2013 at 22:25:55 -0500, Yaroslav Halchenko wrote: On Mon, 02 Dec 2013, Yaroslav Halchenko wrote: On Sat, 30 Nov 2013, Julien Cristau wrote: Please provide a patch. Please find initial attempt attached -- review, critique is welcome ... I would still appreciate some feedback or action regarding this issue. Pushed http://anonscm.debian.org/gitweb/?p=pkg-xorg/xserver/xorg-server.git;a=commitdiff;h=03f5cf60f42012a57c23e2b615a0cc545a682112 to our experimental branch. Can you confirm that works for you? Cheers, Julien signature.asc Description: Digital signature
Bug#730552: provide xserver-xorg-source package for building 3rd party software (e.g. VNC) reusing XOrg codebase
On Mon, 02 Dec 2013, Yaroslav Halchenko wrote: On Sat, 30 Nov 2013, Julien Cristau wrote: Please provide a patch. Please find initial attempt attached -- review, critique is welcome ... I would still appreciate some feedback or action regarding this issue. Cheers and Marry Holidays! -- Yaroslav O. Halchenko, Ph.D. http://neuro.debian.net http://www.pymvpa.org http://www.fail2ban.org Senior Research Associate, Psychological and Brain Sciences Dept. Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#730552: provide xserver-xorg-source package for building 3rd party software (e.g. VNC) reusing XOrg codebase
On Sat, 30 Nov 2013, Julien Cristau wrote:
Since better later than never, I have decided to file this wishlist to
discuss
such a possibility. do you see any particular concerns against? would you
prefer a patch or work it our yourself?
Please provide a patch.
Please find initial attempt attached -- review, critique is welcome but
would be even better if some xserver pkg expert would just improve up
it.
I have distributed sources in the -source packge
- as a tarball since they would most probably would need to be patched
anyways, thus would need to be copied, and better --just extracted
- as .xz since it becomes used widely and provides better compression
- I left the distributed tarball unversioned to ease/disambiguate its
use by projects needing xorg sources to build upon
Cheers!
--
Yaroslav O. Halchenko, Ph.D.
http://neuro.debian.net http://www.pymvpa.org http://www.fail2ban.org
Senior Research Associate, Psychological and Brain Sciences Dept.
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419
WWW: http://www.linkedin.com/in/yarik
From f954df631789d8bf7574ddf18a6ec90a70da2e3b Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko deb...@onerussian.com
Date: Sat, 30 Nov 2013 14:55:28 -0500
Subject: [PATCH] Adding xserver-source binary package to provide a tarball
with original (patched, autoreconfed) sources of the xserver (Closes:
#730552)
---
debian/changelog | 7 +++
debian/control| 14 ++
debian/rules | 23 ---
debian/xserver-source.install | 1 +
4 files changed, 42 insertions(+), 3 deletions(-)
create mode 100644 debian/xserver-source.install
diff --git a/debian/changelog b/debian/changelog
index eb503f0..40c7025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.14.3-6) UNRELEASED; urgency=low
+
+ * Adding xserver-source binary package to provide a tarball with
+original (patched) sources of the xserver.
+
+ -- Yaroslav Halchenko deb...@onerussian.com Sat, 30 Nov 2013 14:55:20 -0500
+
xorg-server (2:1.14.3-5) unstable; urgency=low
* Cherry-pick a upstream commit to fix mesa-10 driver loading.
diff --git a/debian/control b/debian/control
index f06251e..6a5c508 100644
--- a/debian/control
+++ b/debian/control
@@ -347,3 +347,17 @@ Recommends:
Replaces: xserver-xorg-core ( 2:1.5.2)
Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
+
+Package: xserver-source
+Architecture: all
+Depends:
+ ${misc:Depends},
+Description: Xorg X server - source files
+ This package provides original Debian (with Debian patches already
+ applied, and autotools files updated) sources for the X.Org ('Xorg')
+ X server shipped in a tarball. This enables other projects re-using
+ X server codebase (e.g. VNC servers) to (re-)use officially
+ Debian-supported version of the X xserver for their builds.
+ .
+ Unless you are building a software product using X server sources,
+ you probably want xserver-xorg and/or xserver-xorg-core instead.
diff --git a/debian/rules b/debian/rules
index 1b1a7b5..e179b81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -184,6 +184,23 @@ $(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN)
autoreconf -vfi
$@
+# Wrapping up all sources for xserver-source package is easiest before
+# anything else was done and should only be done if build/binary-indep
+$(STAMP_DIR)/build-source: $(QUILT_STAMPFN) $(STAMP_DIR)/autoreconf
+ dh_testdir
+ dh_testroot
+ mkdir -p build-source
+ tar \
+--transform 's,^,xorg-server/,' \
+--exclude=stampdir --exclude=debian --exclude=.git* --exclude=.pc \
+--exclude=build-* --exclude=autom4te.cache \
+-cJf build-source/xorg-server.tar.xz *
+ $@
+
+build-source: $(STAMP_DIR)/build-source
+
+# Depend on build-source to be completed before any other action on
+# the source tree could be done
$(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf
dh_testdir
mkdir -p build-$*
@@ -215,7 +232,7 @@ build: $(STAMP_DIR)/build-udeb
build: $(STAMP_DIR)/tests-udeb
endif
build-arch: build
-build-indep: build
+build-indep: build-source build
clean: unpatch abibumpcheck
dh_testdir
@@ -343,7 +360,7 @@ endif
# Build architecture-independent files here
-binary-indep: build install
+binary-indep: build-source build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i --sourcedir=debian/tmp
dh_installdocs -i
@@ -352,4 +369,4 @@ binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch build-source binary install
diff --git a/debian/xserver-source.install b/debian/xserver-source.install
new file mode 100644
index
Bug#730552: provide xserver-xorg-source package for building 3rd party software (e.g. VNC) reusing XOrg codebase
On Tue, Nov 26, 2013 at 09:09:54 -0500, Yaroslav Halchenko wrote: Package: xserver-xorg Version: 1:7.7+3 Severity: wishlist https://alioth.debian.org/projects/pkg-tigervnc team works on packaging TigerVNC for Debian (ITP - #650394). Unfortunately (or for some might be -- fortunately) our initial upload to Debian proper was rejected (in 18 Apr 2013) with the main concern being shipping convenience copies of Xorg to build TigerVNC. And suggestion was made to seek collaboration with Debian X Strike Force so that Debian could provide a 'proper' xserver-xorg-source package providing sources of the XOrg so TigerVNC could be built against them (which should simplify/secure its maintenance in the long term). Since better later than never, I have decided to file this wishlist to discuss such a possibility. do you see any particular concerns against? would you prefer a patch or work it our yourself? Please provide a patch. Cheers, Julien signature.asc Description: Digital signature
Bug#730552: provide xserver-xorg-source package for building 3rd party software (e.g. VNC) reusing XOrg codebase
Package: xserver-xorg Version: 1:7.7+3 Severity: wishlist https://alioth.debian.org/projects/pkg-tigervnc team works on packaging TigerVNC for Debian (ITP - #650394). Unfortunately (or for some might be -- fortunately) our initial upload to Debian proper was rejected (in 18 Apr 2013) with the main concern being shipping convenience copies of Xorg to build TigerVNC. And suggestion was made to seek collaboration with Debian X Strike Force so that Debian could provide a 'proper' xserver-xorg-source package providing sources of the XOrg so TigerVNC could be built against them (which should simplify/secure its maintenance in the long term). Since better later than never, I have decided to file this wishlist to discuss such a possibility. do you see any particular concerns against? would you prefer a patch or work it our yourself? -- System Information: Debian Release: jessie/sid Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.9-1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages xserver-xorg depends on: ii libc6 2.17-93 ii x11-xkb-utils 7.7~1 ii xkb-data 2.5.1-3 pn xserver-xorg-core none ii xserver-xorg-input-evdev [xorg-driver-input] 1:2.7.0-1+b1 ii xserver-xorg-input-void [xorg-driver-input] 1:1.4.0-1+b1 ii xserver-xorg-video-apm [xorg-driver-video]1:1.2.3-3 ii xserver-xorg-video-dummy [xorg-driver-video] 1:0.3.5-2+b1 ii xserver-xorg-video-fbdev [xorg-driver-video] 1:0.4.2-4+b3 ii xserver-xorg-video-intel [xorg-driver-video] 2:2.19.0-6 ii xserver-xorg-video-vesa [xorg-driver-video] 1:2.3.1-1+b1 Versions of packages xserver-xorg recommends: ii libgl1-mesa-dri 9.2.2-1 xserver-xorg suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
