xorg: Changes to 'ubuntu'
debian/changelog | 20 ++++++++++++++++++--
debian/control | 11 ++++++++++-
debian/x11-common.links | 1 -
debian/xsfbs/xsfbs.mk | 47 +++++++++++++++--------------------------------
4 files changed, 43 insertions(+), 36 deletions(-)
New commits:
commit 3fb90639124336b71a82adfa6a73ea83799990c9
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Jan 23 11:54:26 2009 +0200
Don't install the symlink to rgb.txt
diff --git a/debian/changelog b/debian/changelog
index 08b244d..6035df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xorg (1:7.4~5ubuntu11) UNRELEASED; urgency=low
* Merge with Debian experimental.
* debian/control: xserver-xorg doesn't need to depend on mdetect
anymore.
+ * x11-common.links: Don't install the symlink to rgb.txt (LP: #300935)
-- Bryce Harrington <bryce@ubuntu.com> Thu, 22 Jan 2009 17:00:31 -0800
diff --git a/debian/x11-common.links b/debian/x11-common.links
index 28d644e..58a5c0c 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -1,5 +1,4 @@
usr/bin usr/bin/X11
-etc/X11/rgb.txt usr/share/X11/rgb.txt
usr/bin usr/X11R6/bin
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/xserver-xorg-core.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xkeyboard-config.py
commit a66c562c423e37015674f210e912e99a6e4cb42f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 21 22:41:53 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c1d692f..3ebfa1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4~5) UNRELEASED; urgency=low
+xorg (1:7.4~5) experimental; urgency=low
[ Loic Minier ]
* Also upgrade Driver i810 or via lines which have trailing comments.
@@ -13,7 +13,7 @@ xorg (1:7.4~5) UNRELEASED; urgency=low
* xserver-xorg Depends on xkb-data >= 1.4.
* xserver-xorg Depends on xserver-xorg-core 1.6 rc1.
- -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 21 Jan 2009 22:41:41 +0100
xorg (1:7.4~4) experimental; urgency=low
commit 32478bcb287fc44284e3cf1417f11622dec5d240
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 21 22:41:31 2009 +0100
xserver-xorg Depends on xserver-xorg-core 1.6 rc1.
diff --git a/debian/changelog b/debian/changelog
index 45b64e5..c1d692f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg (1:7.4~5) UNRELEASED; urgency=low
s390).
* Update input (4) and video (5) ABIs for xserver 1.6.
* xserver-xorg Depends on xkb-data >= 1.4.
+ * xserver-xorg Depends on xserver-xorg-core 1.6 rc1.
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
diff --git a/debian/control b/debian/control
index 73e5c7d..6744b56 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Architecture: any
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-common (<< 1:7.3+11)
Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends:
- xserver-xorg-core (>= 2:1.5),
+ xserver-xorg-core (>= 2:1.5.99.901),
xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
xserver-xorg-video-all | xserver-xorg-video-5,
xserver-xorg-input-all | xserver-xorg-input-4,
commit 5ab88585469e8b30b19553f3214db516e0cbd221
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 21 22:37:54 2009 +0100
xserver-xorg Depends on xkb-data >= 1.4.
diff --git a/debian/changelog b/debian/changelog
index 38d37b6..45b64e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xorg (1:7.4~5) UNRELEASED; urgency=low
* xserver-xorg Depends on xserver-xorg-input-evdev on Linux (except for
s390).
* Update input (4) and video (5) ABIs for xserver 1.6.
+ * xserver-xorg Depends on xkb-data >= 1.4.
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
diff --git a/debian/control b/debian/control
index c9b81c3..73e5c7d 100644
--- a/debian/control
+++ b/debian/control
@@ -89,7 +89,7 @@ Depends:
hal,
${shlibs:Depends},
${misc:Depends},
- xkb-data | xkb-data-legacy,
+ xkb-data (>= 1.4),
x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
commit 37a4ce642a24e88796b99025bc5a0e1b76588209
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 21 22:35:54 2009 +0100
Update input (4) and video (5) ABIs for xserver 1.6.
diff --git a/debian/changelog b/debian/changelog
index 18d018e..38d37b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg (1:7.4~5) UNRELEASED; urgency=low
* xserver-xorg Depends on hal.
* xserver-xorg Depends on xserver-xorg-input-evdev on Linux (except for
s390).
+ * Update input (4) and video (5) ABIs for xserver 1.6.
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
diff --git a/debian/control b/debian/control
index e340af6..c9b81c3 100644
--- a/debian/control
+++ b/debian/control
@@ -84,8 +84,8 @@ Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends:
xserver-xorg-core (>= 2:1.5),
xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
- xserver-xorg-video-all | xserver-xorg-video-4,
- xserver-xorg-input-all | xserver-xorg-input-2.1,
+ xserver-xorg-video-all | xserver-xorg-video-5,
+ xserver-xorg-input-all | xserver-xorg-input-4,
hal,
${shlibs:Depends},
${misc:Depends},
commit d334e9f63bc94601adcc7bcff523f062913da344
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 26 19:45:58 2008 +0100
xserver-xorg Depends on xserver-xorg-input-evdev on Linux (except for s390).
diff --git a/debian/changelog b/debian/changelog
index 7666d76..18d018e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg (1:7.4~5) UNRELEASED; urgency=low
[ Julien Cristau ]
* xserver-xorg Depends on hal.
+ * xserver-xorg Depends on xserver-xorg-input-evdev on Linux (except for
+ s390).
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
diff --git a/debian/control b/debian/control
index d451698..e340af6 100644
--- a/debian/control
+++ b/debian/control
@@ -83,6 +83,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-commo
Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends:
xserver-xorg-core (>= 2:1.5),
+ xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
xserver-xorg-video-all | xserver-xorg-video-4,
xserver-xorg-input-all | xserver-xorg-input-2.1,
hal,
commit 39443c583f5fc16c475a48138808224441104eec
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 19 19:27:52 2008 +0100
xserver-xorg Depends on hal.
diff --git a/debian/changelog b/debian/changelog
index 8fb1cd7..7666d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xorg (1:7.4~5) UNRELEASED; urgency=low
+ [ Loic Minier ]
* Also upgrade Driver i810 or via lines which have trailing comments.
* Shut up rmdir errors with 2>/dev/null in all maintainer scripts when
trying to remove dirs; this might confuse debconf.
+ [ Julien Cristau ]
+ * xserver-xorg Depends on hal.
+
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
xorg (1:7.4~4) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 9b14e37..d451698 100644
--- a/debian/control
+++ b/debian/control
@@ -85,6 +85,7 @@ Depends:
xserver-xorg-core (>= 2:1.5),
xserver-xorg-video-all | xserver-xorg-video-4,
xserver-xorg-input-all | xserver-xorg-input-2.1,
+ hal,
${shlibs:Depends},
${misc:Depends},
xkb-data | xkb-data-legacy,
commit 7f940975117b8e876d4dcda9d7daeb824bdf8406
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 19 19:26:43 2008 +0100
Wrap Depends for xserver-xorg
diff --git a/debian/control b/debian/control
index 7a60dc2..9b14e37 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,14 @@ Package: xserver-xorg
Architecture: any
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-common (<< 1:7.3+11)
Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
-Depends: xserver-xorg-core (>= 2:1.5), xserver-xorg-video-all | xserver-xorg-video-4, xserver-xorg-input-all | xserver-xorg-input-2.1, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
+Depends:
+ xserver-xorg-core (>= 2:1.5),
+ xserver-xorg-video-all | xserver-xorg-video-4,
+ xserver-xorg-input-all | xserver-xorg-input-2.1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ xkb-data | xkb-data-legacy,
+ x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
# Set up parameters for the upstream build environment.
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/patches ]; then \
- mkdir $(STAMP_DIR)/patches; \
- ln -s $(STAMP_DIR)/patches .pc; \
- echo 2 >$(STAMP_DIR)/patches/.version; \
- fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ -e debian/patches ] && [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
- if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+ if $(QUILT) applied >/dev/null 2>/dev/null; then \
if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
@@ -192,7 +182,7 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -rf .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
Reply to: