.gitignore | 14 ++++++++++++++
Makefile.am | 13 ++++++++++++-
configure.ac | 6 +++++-
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 2 +-
7 files changed, 45 insertions(+), 6 deletions(-)
New commits:
commit 058d3ecbc2c6064cba1bf5449fae61f083c36022
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 8 16:50:32 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9670f27..45d6f59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
+x11proto-dri2 (2.0-1) unstable; urgency=low
* New upstream release.
* Add build-dep on xutils-dev >= 1:7.4+4.
@@ -6,7 +6,7 @@ x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.1.
* Bump dh compat to 5 to make lintian happy.
- -- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:41:48 +0200
+ -- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:50:28 +0200
x11proto-dri2 (1.99.3-1) unstable; urgency=low
commit cd891967de6c983acf8efc39cc29fd0bba1196e6
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 8 16:50:25 2009 +0200
Bump dh compat to 5 to make lintian happy.
diff --git a/debian/changelog b/debian/changelog
index 4117870..9670f27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
* Add build-dep on xutils-dev >= 1:7.4+4.
* Install the upstream changelog.
* Bump Standards-Version to 3.8.1.
+ * Bump dh compat to 5 to make lintian happy.
-- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:41:48 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
commit c19cb5e52c33b8563c4e01e777f6f3dd61a032e5
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 8 16:49:09 2009 +0200
Bump Standards-Version to 3.8.1.
diff --git a/debian/changelog b/debian/changelog
index fbd3079..4117870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
* New upstream release.
* Add build-dep on xutils-dev >= 1:7.4+4.
* Install the upstream changelog.
+ * Bump Standards-Version to 3.8.1.
-- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:41:48 +0200
diff --git a/debian/control b/debian/control
index 774aa78..c47227c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Julien Cristau <jcris...@debian.org>
Build-Depends: debhelper, autoconf, automake, xutils-dev (>= 1:7.4+4)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dri2.git
commit bef7a23f1b4ff0beef94220bd4213c9c4efb17db
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 8 16:48:01 2009 +0200
Add and install the upstream changelog.
diff --git a/debian/changelog b/debian/changelog
index 7c777dc..fbd3079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
* New upstream release.
* Add build-dep on xutils-dev >= 1:7.4+4.
+ * Install the upstream changelog.
-- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:41:48 +0200
diff --git a/debian/rules b/debian/rules
index cdf007a..b52372a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ binary-indep: build install
dh_installdocs dri2proto.txt
dh_installman
dh_install --sourcedir=debian/tmp --list-missing
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
commit 2f7bd0f35c6f89a8c400c6e30def0044638f0863
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 8 16:45:21 2009 +0200
Add build-dep on xutils-dev >= 1:7.4+4.
diff --git a/debian/changelog b/debian/changelog
index 7acdb45..7c777dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add build-dep on xutils-dev >= 1:7.4+4.
-- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:41:48 +0200
diff --git a/debian/control b/debian/control
index d557bea..774aa78 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Julien Cristau <jcris...@debian.org>
-Build-Depends: debhelper, autoconf, automake
+Build-Depends: debhelper, autoconf, automake, xutils-dev (>= 1:7.4+4)
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dri2.git
commit 811515c3e253691b0c1bcb3ad8844d5a9b54a91f
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 8 16:42:46 2009 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index e999b93..7acdb45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-dri2 (2.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 08 Jun 2009 16:41:48 +0200
+
x11proto-dri2 (1.99.3-1) unstable; urgency=low
[ Timo Aaltonen ]
commit a223ab5e6a215d86e4bf072369b331506f689f83
Author: Kristian Høgsberg <k...@redhat.com>
Date: Mon Apr 20 14:08:19 2009 -0400
Bump to 2.0 and release
diff --git a/configure.ac b/configure.ac
index 2986a26..234426c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [1.99.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit f46b6ca29b2da54cf6e6db57d464bea9476594c6
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jan 9 06:07:59 2009 +0100
Distribute the protocol documentation
diff --git a/Makefile.am b/Makefile.am
index 1d72a35..d26a4a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ dri2_HEADERS = dri2proto.h dri2tokens.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dri2proto.pc
-EXTRA_DIST = dri2proto.pc.in
+EXTRA_DIST = dri2proto.pc.in dri2proto.txt
EXTRA_DIST += ChangeLog
commit ac787752bf67f8f1ea8167191e5fb9d7fbbe7c7f
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12c40fc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+Makefile
+Makefile.in
+aclocal.m4
+dri2proto.pc
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+*~
+dri2proto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 64f26a5..1d72a35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,15 @@ dri2_HEADERS = dri2proto.h dri2tokens.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dri2proto.pc
-EXTRA_DIST = autogen.sh dri2proto.pc.in
+EXTRA_DIST = dri2proto.pc.in
+
+EXTRA_DIST += ChangeLog
+
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index e68ec63..2986a26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([DRI2Proto], [1.99.3],
[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
AC_OUTPUT([Makefile
dri2proto.pc])
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
