xserver-xorg-video-glint: Changes to 'debian-unstable'
debian/changelog | 13 +++++++++----
debian/control | 4 ++--
debian/patches/02_implicit_declarations.diff | 25 +++++++++++++++++++++++++
debian/patches/series | 1 +
debian/xsfbs/xsfbs.mk | 27 ++++++++++++++++++---------
5 files changed, 55 insertions(+), 15 deletions(-)
New commits:
commit 38919adff7a7aaa47d9cbb825c729d6477ffd463
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 17 23:09:32 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 5216953..3bfefc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
+xserver-xorg-video-glint (1:1.1.1-6) unstable; urgency=low
[ Julien Cristau ]
* Add 01_glint_man.diff to replace non-ascii character in glint(4) with the
@@ -7,6 +7,7 @@ xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
#includes.
* Add myself to Uploaders and remove Branden with his permission.
* Update Standards-Version to 3.7.2 (no changes).
+ * Upload to unstable.
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-glint.
@@ -22,7 +23,7 @@ xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Julien Cristau <jcristau@debian.org> Tue, 17 Jul 2007 23:07:19 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 17 Jul 2007 23:09:03 +0200
xserver-xorg-video-glint (1:1.1.1-5) experimental; urgency=low
commit 390cb05f444bf53838da254f4598732d3a117872
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 17 23:00:47 2007 +0200
Update Uploaders and Standards-Version.
Add myself, remove Branden with his permission; also bump
Standards-Version to 3.7.2.
diff --git a/debian/changelog b/debian/changelog
index 222b96c..5216953 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
equivalent groff escape sequence.
* Add 02_implicit_declarations.diff to fix gcc warnings caused by missing
#includes.
+ * Add myself to Uploaders and remove Branden with his permission.
+ * Update Standards-Version to 3.7.2 (no changes).
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-glint.
diff --git a/debian/control b/debian/control
index c0369d5..cef335e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: xserver-xorg-video-glint
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>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git
commit 54994fb93dc4eea79d3ae31882e6d6494d7297d1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 17 22:55:35 2007 +0200
Fix gcc warnings caused by missing include files.
Add patch 02_implicit_declarations.diff.
diff --git a/debian/changelog b/debian/changelog
index 7898953..222b96c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
[ Julien Cristau ]
- * Add patch to replace non-ascii character in glint(4) with the equivalent
- groff escape sequence.
+ * Add 01_glint_man.diff to replace non-ascii character in glint(4) with the
+ equivalent groff escape sequence.
+ * Add 02_implicit_declarations.diff to fix gcc warnings caused by missing
+ #includes.
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-glint.
@@ -18,7 +20,7 @@ xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 27 Apr 2007 19:27:58 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 17 Jul 2007 23:07:19 +0200
xserver-xorg-video-glint (1:1.1.1-5) experimental; urgency=low
diff --git a/debian/patches/02_implicit_declarations.diff b/debian/patches/02_implicit_declarations.diff
new file mode 100644
index 0000000..8263202
--- /dev/null
+++ b/debian/patches/02_implicit_declarations.diff
@@ -0,0 +1,25 @@
+Index: xserver-xorg-video-glint/src/pm2_video.c
+===================================================================
+--- xserver-xorg-video-glint.orig/src/pm2_video.c 2007-07-17 22:45:34.000000000 +0200
++++ xserver-xorg-video-glint/src/pm2_video.c 2007-07-17 22:46:52.000000000 +0200
+@@ -41,6 +41,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <sys/ioctl.h>
++#include <unistd.h>
+
+ #undef MIN
+ #undef ABS
+Index: xserver-xorg-video-glint/src/glint_driver.c
+===================================================================
+--- xserver-xorg-video-glint.orig/src/glint_driver.c 2007-07-17 22:47:55.000000000 +0200
++++ xserver-xorg-video-glint/src/glint_driver.c 2007-07-17 22:48:23.000000000 +0200
+@@ -49,6 +49,7 @@
+ #include "xf86int10.h"
+ #include "dixstruct.h"
+ #include "vbe.h"
++#include "cfb8_32.h"
+
+ #include "compiler.h"
+ #include "mipointer.h"
diff --git a/debian/patches/series b/debian/patches/series
index 96dbfc5..5589192 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_glint_man.diff
+02_implicit_declarations.diff
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# 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/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
Reply to: