x11proto-fixes: Changes to 'debian-experimental'
ChangeLog | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 8 ++++---
debian/control | 2 -
debian/rules | 1
debian/xsfbs/xsfbs.mk | 17 +-------------
debian/xsfbs/xsfbs.sh | 4 ---
6 files changed, 67 insertions(+), 22 deletions(-)
New commits:
commit 722bfd73f089be2d895a61c806f41920d4346693
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 26 13:47:51 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index d1b4643..64f2a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
+x11proto-fixes (1:4.1.1-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release (closes: #556003).
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
- -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 20 Nov 2009 15:11:48 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 13:47:49 +0100
x11proto-fixes (1:4.1-1) experimental; urgency=low
commit 6e3d7541c1581d09c9945a585094b7fae765d0cf
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Nov 21 13:52:47 2009 +0200
Bump the build-dep on xutils-dev (>= 1:7.5~1).
diff --git a/debian/changelog b/debian/changelog
index 31e1d0f..d1b4643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
* New upstream release (closes: #556003).
+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 20 Nov 2009 15:11:48 +0200
diff --git a/debian/control b/debian/control
index b060752..8d04d56 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
commit 511e57918725539ec4fabf2fb01b8bd1db4011e7
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 21 12:41:18 2009 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index 530a06e..31e1d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release (closes: #556003).
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 20 Nov 2009 15:11:48 +0200
commit cbd617fdd79823c87fb028192f467bac53c90c14
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 21 12:04:00 2009 +0100
Remove config.* in debian/rules clean
diff --git a/debian/rules b/debian/rules
index 57299e7..8de961c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@ clean:
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
rm -f aclocal.m4 configure install-sh missing mkinstalldirs
+ rm -f config.guess config.sub
find -name Makefile.in -delete
dh_clean
commit 3f60b51ff291a06b2bafd3402d088b7a51bfa577
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Nov 20 17:06:32 2009 +0200
Update the ChangeLog.
diff --git a/ChangeLog b/ChangeLog
index 9725eea..7474b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+commit 88cd481b5349fe4962ac609c8711a17d4323e42a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 12:13:58 2009 +1000
+
+ fixesproto 4.1.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d76dd3834a9443ed2237fc26d6eff1cc429606b5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 12:16:30 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9fe9e1abb2ff3c839a6049fea39adf6d753c09c3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 12:13:11 2009 +1000
+
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 39d4e91171de13d4b7079d4609e7930e32948d99
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 5 19:21:42 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Also correct INSTALL to list the right extension name
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 50921252322e05fea4f0f85c8ae8735b6df11860
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 31 08:53:51 2009 +1000
+
+ Document behaviour of CursorNotifies with XI2 servers.
+
+ CursorNotifies are only sent for the ClientPointer to avoid confusion in the
+ client.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit beebe5339ee97b36c3d5b2a5c2b2f140d03f2003
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 31 08:21:14 2009 +1000
+
+ Hide/ShowCursor works on all master pointers in XI2.
+
+ Servers supporting XI2 will hide all cursors when a client requests
+ HideCursor. This is arguably closest to the original intent of the request -
+ to not display a cursor above the given window.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 9a3f2e436481face8e79c80bffdfb3e00b48eeab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 23 08:44:54 2009 -0400
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
Reply to: