xorg: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++--
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 24 ++++++++++++------------
4 files changed, 23 insertions(+), 17 deletions(-)
New commits:
commit 4d0132f3a02edac5e64dd84402a450a9052e1da2
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Aug 13 21:33:17 2009 -0400
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5dd22bc..5ebc662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4+4) UNRELEASED; urgency=low
+xorg (1:7.4+4) unstable; urgency=low
[ Timo Aaltonen ]
* debian-x11-keymap.fdi: Check for input.keys from info.capabilities.
@@ -23,7 +23,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
* Bump standards version to 3.8.2. No changes necessary.
* Remove obsolete and misplaced -k flag on a dh_clean
- -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Aug 2009 21:19:12 -0400
xorg (1:7.4+3) unstable; urgency=low
commit 554513e48c54e0cd3a2d5dfcae8b770ccfe7b6bd
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Aug 13 20:29:53 2009 -0400
Remove obsolete and misplaced -k flag on a dh_clean
diff --git a/debian/changelog b/debian/changelog
index f96601d..5dd22bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
* Bump debhelper compat to v7. No changes necessary.
* Rename stamps to take advantage of dh_clean v7 handling them automatically
* Bump standards version to 3.8.2. No changes necessary.
+ * Remove obsolete and misplaced -k flag on a dh_clean
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/rules b/debian/rules
index 0e86a55..5c26be2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ install-stamp: build-stamp
dh_testdir
dh_testroot
umask 022
- dh_clean -k
+ dh_clean
chmod 755 debian/local/debian-setup-keyboard
touch $@
commit 4c8a446780a327eb3c934af4b2539a9f202b0c15
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Aug 13 20:26:05 2009 -0400
Bump standards version to 3.8.2. No changes necessary.
diff --git a/debian/changelog b/debian/changelog
index bc55380..f96601d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
[ David Nusinow ]
* Bump debhelper compat to v7. No changes necessary.
* Rename stamps to take advantage of dh_clean v7 handling them automatically
+ * Bump standards version to 3.8.2. No changes necessary.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/control b/debian/control
index 14e83d9..6f45da2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7)
Package: x11-common
commit 34258a4f516104c9d7ef0f9243ccabbb2126948c
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Aug 13 20:25:39 2009 -0400
Bump debhelper build-dep version
diff --git a/debian/control b/debian/control
index 7c3d3e4..14e83d9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
Standards-Version: 3.8.1
-Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
+Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7)
Package: x11-common
Architecture: all
commit 42f813b14218f5b2800ea5e763291d8cfbdca534
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Aug 13 20:11:06 2009 -0400
Rename stamps to take advantage of dh_clean v7 handling them automatically
diff --git a/debian/changelog b/debian/changelog
index 8571362..bc55380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
[ David Nusinow ]
* Bump debhelper compat to v7. No changes necessary.
+ * Rename stamps to take advantage of dh_clean v7 handling them automatically
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/rules b/debian/rules
index 0ede679..0e86a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ include debian/scripts/vars.$(ARCH)
clean: cleanscripts
dh_testdir
- dh_clean stamp-* debian/local/X debian/po/pothead
+ dh_clean debian/local/X debian/po/pothead
-rm -rf stampdir
-debconf-updatepo
@@ -52,17 +52,17 @@ SCRIPTS=$(shell ls debian/*.config.in debian/*.postinst.in debian/*.postrm.in de
DEFAULT_DCRESOLUTIONS="1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480"
-scripts: stamp-scripts
-stamp-scripts: genscripts validatescripts
+scripts: scripts-stamp
+scripts-stamp: genscripts validatescripts
touch $@
-validatescripts: genscripts stamp-validatescripts
-stamp-validatescripts: debian/local/dexconf
+validatescripts: genscripts validatescripts-stamp
+validatescripts-stamp: debian/local/dexconf
sh debian/scripts/validate-posix-sh $<
touch $@
-build: stamp-build
-stamp-build: stamp-scripts
+build: build-stamp
+build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
@@ -71,8 +71,8 @@ stamp-build: stamp-scripts
build-arch-only: build
build-all:
-install: stamp-install
-stamp-install: stamp-build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
umask 022
@@ -100,7 +100,7 @@ binary-indep: build install
dh_gencontrol
dh_md5sums
dh_builddeb
- touch stamp-$@
+ touch $@-stamp
binary-arch: DH_OPTIONS=-s
binary-arch: build install
@@ -125,7 +125,7 @@ binary-arch: build install
-VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS)
dh_md5sums
dh_builddeb
- touch stamp-$@
+ touch $@-stamp
binary: binary-indep binary-arch
commit 57acd667efb2c2ef0c5ca88c62aee8114cdbc72a
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Aug 13 20:06:38 2009 -0400
Bump debhelper compat to v7. No changes necessary.
diff --git a/debian/changelog b/debian/changelog
index 4823e06..8571362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
Thanks to Pierre-Loup A. Griffais for pointing out the three above items
(closes: #540932).
+ [ David Nusinow ]
+ * Bump debhelper compat to v7. No changes necessary.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
xorg (1:7.4+3) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
Reply to: