debian/changelog | 9 ++++++--
debian/control | 1
debian/copyright | 2 -
debian/patches/01_keep_xorg_css.diff | 37 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 4 +--
6 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit f26b41e1ef2786118becb0e9919f0122e738f9fe
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 04:18:45 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 0591a71..13c85f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-core (7.0.20-1) UNRELEASED; urgency=low
+x11proto-core (7.0.20-1) unstable; urgency=low
[ Julien Cristau ]
* Merge changes from the experimental branch (7.0.17-1 upload).
@@ -13,7 +13,7 @@ x11proto-core (7.0.20-1) UNRELEASED; urgency=low
* Add 01_keep_xorg_css.diff temporarily.
* Add patching in debian/rules, and quilt build-dep accordingly.
- -- Robert Hooker <sarv...@ubuntu.com> Fri, 07 Jan 2011 11:14:03 -0500
+ -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 04:18:40 +0100
x11proto-core (7.0.19-1) unstable; urgency=low
commit d1f409d540fcd82b5d4091be4160a1e31c34ace7
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 04:09:16 2011 +0100
Add patching in debian/rules, and quilt build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index 7cfb96b..0591a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-core (7.0.20-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright from upstream's COPYING.
* Add 01_keep_xorg_css.diff temporarily.
+ * Add patching in debian/rules, and quilt build-dep accordingly.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 07 Jan 2011 11:14:03 -0500
diff --git a/debian/control b/debian/control
index c04bbd8..b645445 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
automake,
xutils-dev (>= 1:7.5+4),
pkg-config,
+ quilt,
# specs:
xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.9.0
diff --git a/debian/rules b/debian/rules
index da5fff6..7a73f9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-configure:
+configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
@@ -47,7 +47,7 @@ build-stamp: configure
cd build && $(MAKE)
>$@
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
commit 2fb694ed68d73f47326c4b7a2cb4ba5ceffd84af
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 04:08:01 2011 +0100
Add 01_keep_xorg_css.diff temporarily.
diff --git a/debian/changelog b/debian/changelog
index e660d30..7cfb96b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11proto-core (7.0.20-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright from upstream's COPYING.
+ * Add 01_keep_xorg_css.diff temporarily.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 07 Jan 2011 11:14:03 -0500
diff --git a/debian/patches/01_keep_xorg_css.diff
b/debian/patches/01_keep_xorg_css.diff
new file mode 100644
index 0000000..dac82f5
--- /dev/null
+++ b/debian/patches/01_keep_xorg_css.diff
@@ -0,0 +1,37 @@
+From 936fecff1bc872504aea7f948ea5855b23461cfe Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois <k...@debian.org>
+Date: Fri, 14 Jan 2011 04:02:50 +0100
+Subject: [PATCH] Revert "config: HTML file generation: use the installed copy
of xorg.css"
+
+Let's just keep a local copy of xorg.css on the short term. There's
+going to be a plan for the long run.
+
+This partially reverts commit d441b9b0230b57159fa8522b80f18a0b87f5aac5
+(there's no specs/.gitignore in the released tarball).
+---
+ specs/Makefile.am | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/specs/Makefile.am b/specs/Makefile.am
+index c0b1642..0a09d3a 100644
+--- a/specs/Makefile.am
++++ b/specs/Makefile.am
+@@ -44,10 +44,11 @@ doc_DATA += $(doc_sources:.xml=.txt)
+ endif
+
+ if HAVE_STYLESHEETS
+-XMLTO_FLAGS = \
+- -m $(XSL_STYLESHEET) \
+- --stringparam img.src.path=$(abs_builddir)/ \
+- --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
++XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
++
++doc_DATA += xorg.css
++xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
++ $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+ endif
+
+ CLEANFILES = $(doc_DATA)
+--
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..71188ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_keep_xorg_css.diff
commit b9d812fe2919d96f8a30e45291d8da99e47973d7
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Jan 9 03:50:59 2011 +0100
Update debian/copyright from upstream's COPYING.
diff --git a/debian/changelog b/debian/changelog
index 4a3c874..e660d30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ x11proto-core (7.0.20-1) UNRELEASED; urgency=low
- 5d3428d... Add XF86XK_TouchpadOn/Off
- Various spec updates.
+ [ Cyril Brulebois ]
+ * Update debian/copyright from upstream's COPYING.
+
-- Robert Hooker <sarv...@ubuntu.com> Fri, 07 Jan 2011 11:14:03 -0500
x11proto-core (7.0.19-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index d6ee14f..1a2f42c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ http://xorg.freedesktop.org/releases/individual/proto/
Debianised by Daniel Stone <daniel.st...@ubuntu.com>.
-Copyright © 1991 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pdaiw-0003ir...@alioth.debian.org
