xorg-server: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/rules | 1 +
debian/xserver-xorg-core.install | 1 +
debian/xserver-xorg-core.lintian-overrides | 3 +++
4 files changed, 14 insertions(+)
New commits:
commit c92a0498d770c03214563bfde1585dbf3aec96d0
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 2 12:33:09 2011 +0100
Don't forget to ship xorg.conf.d(5) in xserver-xorg-core.
diff --git a/debian/changelog b/debian/changelog
index 3057a69..3f4465b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.11.1.902-2) UNRELEASED; urgency=low
* Add some lintian overrides:
- xserver-xorg-core: breaks-without-version against virtual packages
is perfectly OK.
+ * Don't forget to ship xorg.conf.d(5) in xserver-xorg-core.
-- Cyril Brulebois <kibi@debian.org> Wed, 02 Nov 2011 11:40:46 +0100
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 4e04724..517db7a 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -4,6 +4,7 @@ main/usr/share/man/man1/Xorg.1 usr/share/man/man1
main/usr/share/man/man4/exa.4 usr/share/man/man4
main/usr/share/man/man4/fbdevhw.4 usr/share/man/man4
main/usr/share/man/man5/xorg.conf.5 usr/share/man/man5
+main/usr/share/man/man5/xorg.conf.d.5 usr/share/man/man5
main/usr/bin/cvt usr/bin
main/usr/bin/gtf usr/bin
main/usr/share/man/man1/cvt.1 usr/share/man/man1
commit ca46867397d3382eb7adc8c6a27bf8c25fcc0bd8
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 2 11:44:54 2011 +0100
Start adding some lintian overrides.
xserver-xorg-core: breaks-without-version against virtual packages is perfectly OK.
diff --git a/debian/changelog b/debian/changelog
index aac683f..3057a69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.11.1.902-2) UNRELEASED; urgency=low
+
+ * Add some lintian overrides:
+ - xserver-xorg-core: breaks-without-version against virtual packages
+ is perfectly OK.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 02 Nov 2011 11:40:46 +0100
+
xorg-server (2:1.11.1.902-1) unstable; urgency=low
* New upstream release candidate (1.11.2 RC2):
diff --git a/debian/rules b/debian/rules
index 9eab8a4..3011a78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -287,6 +287,7 @@ binary-initial:
# stub to build deb files, used by binary-indep and binary-arch
binary-deb:
+ dh_lintian
dh_compress
dh_fixperms
dh_installdeb
diff --git a/debian/xserver-xorg-core.lintian-overrides b/debian/xserver-xorg-core.lintian-overrides
new file mode 100644
index 0000000..635a9b6
--- /dev/null
+++ b/debian/xserver-xorg-core.lintian-overrides
@@ -0,0 +1,3 @@
+# That's OK, they were virtual packages:
+breaks-without-version xserver-xorg-input-7
+breaks-without-version xserver-xorg-video-6
Reply to: