xorg-server: Changes to 'debian-experimental'
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 14 ++++++++++++++
debian/rules | 18 ++++++++++++++----
debian/xorg-server-source.install | 1 +
5 files changed, 42 insertions(+), 5 deletions(-)
New commits:
commit 03f5cf60f42012a57c23e2b615a0cc545a682112
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue Jan 7 00:58:30 2014 +0100
Add xorg-server-source binary package
Provides a tarball with original (patched, autoreconfed) sources of the
xserver for use by vnc implementations (closes: #730552)
diff --git a/debian/changelog b/debian/changelog
index 665527a..14a9f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* Bump debhelper compat level to 7.
+ [ Yaroslav Halchenko ]
+ * Adding xorg-server-source binary package to provide a tarball with
+ original (patched, autoreconfed) sources of the xserver (Closes:
+ #730552)
+
-- Julien Cristau <jcristau@debian.org> Tue, 07 Jan 2014 00:51:53 +0100
xorg-server (2:1.15.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 94a88f7..aaad746 100644
--- a/debian/control
+++ b/debian/control
@@ -341,3 +341,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: xorg-server-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 c81c554..bf5f14b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,6 +192,16 @@ $(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN)
autoreconf -vfi
>$@
+$(STAMP_DIR)/build-source: $(STAMP_DIR)/autoreconf
+ mkdir -p build-source
+ tar \
+ --owner=0 --group=0 \
+ --transform 's,^,xorg-server/,' \
+ --exclude=stampdir --exclude=debian \
+ --exclude=build-* --exclude=autom4te.cache \
+ -cf - * | xz > build-source/xorg-server.tar.xz
+ >$@
+
$(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf
dh_testdir
mkdir -p build-$*
@@ -224,7 +234,7 @@ build: $(STAMP_DIR)/build-udeb
build: $(STAMP_DIR)/tests-udeb
endif
build-arch: build
-build-indep: build
+build-indep: $(STAMP_DIR)/build-source build
clean: unpatch
dh_testdir
@@ -357,7 +367,7 @@ endif
# Build architecture-independent files here
-binary-indep: build install
+binary-indep: build-indep install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i
dh_installdocs -i
diff --git a/debian/xorg-server-source.install b/debian/xorg-server-source.install
new file mode 100644
index 0000000..712189c
--- /dev/null
+++ b/debian/xorg-server-source.install
@@ -0,0 +1 @@
+build-source/xorg-server.tar.* usr/src
commit cccd71746577278f6dc66572425b1728e4c1d4b2
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 7 00:55:37 2014 +0100
Stop using dh_install --sourcedir=debian/tmp
No longer necessary in v7
diff --git a/debian/rules b/debian/rules
index 89c54aa..c81c554 100755
--- a/debian/rules
+++ b/debian/rules
@@ -325,7 +325,7 @@ binary-arch: build install
dh_installdocs -s
dh_installchangelogs -s
- dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp --list-missing
+ dh_install $(DH_INSTALL_OPTIONS) -s --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# Extract only the major ABI version:
abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
@@ -359,7 +359,7 @@ endif
# Build architecture-independent files here
binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
- dh_install -i --sourcedir=debian/tmp
+ dh_install -i
dh_installdocs -i
dh_installchangelogs -i ChangeLog
commit a8d100ba5a22ef64a7ed5b7c1a7d85390310486e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 7 00:52:20 2014 +0100
Bump debhelper compat level to 7.
diff --git a/debian/changelog b/debian/changelog
index 089309f..665527a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
+
+ * Bump debhelper compat level to 7.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 07 Jan 2014 00:51:53 +0100
+
xorg-server (2:1.15.0-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
Reply to: