ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ Makefile.am | 1 + configure.ac | 12 ++++++------ debian/changelog | 8 ++++++++ debian/control | 2 +- debian/rules | 1 + xf86dga.h | 13 +++++++++++++ 7 files changed, 68 insertions(+), 7 deletions(-)
New commits: commit a136e63090e19f11a938b00677abecf86c3df2d2 Author: Julien Cristau <[email protected]> Date: Thu Nov 26 16:06:49 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 376b6fc..1e89c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -x11proto-xf86dga (2.1-1) UNRELEASED; urgency=low +x11proto-xf86dga (2.1-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump the build-dep on xutils-dev (>= 1:7.5~1). - -- Timo Aaltonen <[email protected]> Sat, 21 Nov 2009 11:20:21 +0200 + -- Julien Cristau <[email protected]> Thu, 26 Nov 2009 16:06:44 +0100 x11proto-xf86dga (2.0.99.1-1) experimental; urgency=low commit 4beb3fc9813fc9ac799c0e2e26c995a8879d29a0 Author: Timo Aaltonen <[email protected]> Date: Sat Nov 21 14:10:55 2009 +0200 Bump the build-dep on xutils-dev (>= 1:7.5~1). diff --git a/debian/changelog b/debian/changelog index 4a4d97f..376b6fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11proto-xf86dga (2.1-1) UNRELEASED; urgency=low * New upstream release. + * Bump the build-dep on xutils-dev (>= 1:7.5~1). -- Timo Aaltonen <[email protected]> Sat, 21 Nov 2009 11:20:21 +0200 diff --git a/debian/control b/debian/control index 5cc6010..cda05c9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Andres Salomon <dilin...@debian. Build-Depends: debhelper (>= 5.0.0), automake, - xutils-dev (>= 1:7.4+4) + xutils-dev (>= 1:7.5~1) Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xf86dga Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xf86dga.git commit 6942316d8d68b15bb1152463eba25ec424bdac0f Author: Julien Cristau <[email protected]> Date: Sat Nov 21 12:04:02 2009 +0100 Remove config.* in debian/rules clean diff --git a/debian/rules b/debian/rules index 574c0bc..502acd8 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 1792fdc8f1c3a4775b6fe241dfd35ae0e46b3470 Author: Timo Aaltonen <[email protected]> Date: Sat Nov 21 11:20:59 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 8fdc8d3..21f6777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +commit 743fb528f6ef9d29edcb841fc0effbbf9a4837c4 +Author: Peter Hutterer <[email protected]> +Date: Thu Oct 1 19:51:43 2009 +1000 + + xf86dgaproto 2.1 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 647fbb2493d16248d37fbd864ae48a4f18c01644 +Author: Peter Hutterer <[email protected]> +Date: Thu Oct 1 19:48:07 2009 +1000 + + Require macros 1.3 for XORG_DEFAULT_OPTIONS + + Signed-off-by: Peter Hutterer <[email protected]> + +commit db4cb300dec74c9198a4f04aafd20042fe2d1fd9 +Author: Carl Worth <[email protected]> +Date: Wed Sep 16 17:03:30 2009 -0700 + + Change xf86dga.h to only conditionally include server's header file. + + The recent re-addition of the xf86dga.h file introduced an + incompatibility with a recent, but unreleased version of libXxf86dga + which also wanted to install a file of the same name. Instead, we + allow the proto package to own this file, and include the library's + version (now to be named Xxf86dga.h) unless we're building an old + server (indicated by _XF86DGA_SERVER_). + +commit 047a1ebbbcea3ad78a06f0fa8450fa8ba38be43d +Author: Carl Worth <[email protected]> +Date: Wed Sep 16 15:40:02 2009 -0700 + + Add back xf86dga.h (simply including the newly named xf86dgaconst.h) + + This maintains compatibility so that previous X servers, (such as + xserver 1.6 can still be built). + commit f3cfa9e3aa654305a702d97014f726ae5d900a46 Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 10:54:30 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 4742d09..4a4d97f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-xf86dga (2.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen <[email protected]> Sat, 21 Nov 2009 11:20:21 +0200 + x11proto-xf86dga (2.0.99.1-1) experimental; urgency=low * Bump debhelper compat level to 5. commit 743fb528f6ef9d29edcb841fc0effbbf9a4837c4 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 19:51:43 2009 +1000 xf86dgaproto 2.1 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 908fa12..eb75046 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86DGAProto], [2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_DEFAULT_OPTIONS commit 647fbb2493d16248d37fbd864ae48a4f18c01644 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 19:48:07 2009 +1000 Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 8c81de9..908fa12 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) + +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile xf86dgaproto.pc]) commit db4cb300dec74c9198a4f04aafd20042fe2d1fd9 Author: Carl Worth <[email protected]> Date: Wed Sep 16 17:03:30 2009 -0700 Change xf86dga.h to only conditionally include server's header file. The recent re-addition of the xf86dga.h file introduced an incompatibility with a recent, but unreleased version of libXxf86dga which also wanted to install a file of the same name. Instead, we allow the proto package to own this file, and include the library's version (now to be named Xxf86dga.h) unless we're building an old server (indicated by _XF86DGA_SERVER_). diff --git a/configure.ac b/configure.ac index d517c3a..8c81de9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86DGAProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG diff --git a/xf86dga.h b/xf86dga.h index 6d39268..7b5d635 100644 --- a/xf86dga.h +++ b/xf86dga.h @@ -1,3 +1,13 @@ +#ifdef _XF86DGA_SERVER_ + #warning "xf86dga.h is obsolete and may be removed in the future." #warning "include <X11/extensions/xf86dgaconst.h> instead." #include <X11/extensions/xf86dgaconst.h> + +#else + +#warning "xf86dga.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/Xxf86dga.h> instead." +#include <X11/extensions/Xxf86dga.h> + +#endif commit 047a1ebbbcea3ad78a06f0fa8450fa8ba38be43d Author: Carl Worth <[email protected]> Date: Wed Sep 16 15:40:02 2009 -0700 Add back xf86dga.h (simply including the newly named xf86dgaconst.h) This maintains compatibility so that previous X servers, (such as xserver 1.6 can still be built). diff --git a/Makefile.am b/Makefile.am index abae9b4..babced4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ xf86dgadir = $(includedir)/X11/extensions xf86dga_HEADERS = \ + xf86dga.h \ xf86dga1const.h \ xf86dga1str.h \ xf86dga1proto.h \ diff --git a/xf86dga.h b/xf86dga.h new file mode 100644 index 0000000..6d39268 --- /dev/null +++ b/xf86dga.h @@ -0,0 +1,3 @@ +#warning "xf86dga.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/xf86dgaconst.h> instead." +#include <X11/extensions/xf86dgaconst.h> -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
