x11proto-dmx: Changes to 'debian-unstable'
.gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
Makefile.am | 11 ++++---
README | 40 ++++++++++++++++++++++++++++
configure.ac | 22 +++++++++++----
debian/changelog | 9 +++---
debian/control | 3 --
6 files changed, 139 insertions(+), 24 deletions(-)
New commits:
commit 52c0da8e855dc876a21a9af6235f02acd2854749
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Nov 15 13:36:40 2011 -0800
import version 1:2.3.1-1; 1:2.3-3 was never uploaded
diff --git a/debian/changelog b/debian/changelog
index f27347a..d0fb437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-x11proto-dmx (1:2.3-3) unstable; urgency=low
+x11proto-dmx (1:2.3.1-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
- [ Steve Langasek ]
- * Mark x11proto-dmx-dev Multi-Arch: foreign
+ [ Cyril Brulebois ]
+ * New upstream release.
+ * Add myself to Uploaders.
- -- Steve Langasek <vorlon@debian.org> Tue, 15 Nov 2011 11:18:24 -0800
+ -- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 16:50:04 +0100
x11proto-dmx (1:2.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 81ba31c..49f4ee3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-dmx
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
@@ -13,7 +13,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dmx.git
Package: x11proto-dmx-dev
Architecture: all
-Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libdmx-dev (<< 1:1.0.99.1)
Description: X11 Distributed Multihead X extension wire protocol
commit aade7161f63fd7f5a673e8432abd998fe1d9c7a2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 5 17:26:54 2011 -0800
dmxproto 2.3.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 3d74833..af05b01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([DMXProto], [2.3],
+AC_INIT([DMXProto], [2.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([Makefile.am])
commit d6131b3d0cf6b30fd059fe1a1a17d4be24d00e9b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 28 18:26:35 2010 -0800
Remove accidentally added config.h header creation
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 2260553..3d74833 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ([2.60])
AC_INIT([DMXProto], [2.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 710bb6773a0eeb3dfccc92ef0b414c97ee553103
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 28 17:59:39 2010 -0800
Add links to DMX website & protocol spec to README
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/README b/README
index 3b93b48..d549e99 100644
--- a/README
+++ b/README
@@ -5,6 +5,15 @@ X server that controls multiple back-end X servers making up a large display.
Extension name: DMX
+More information about the DMX software can be found on the original project
+website at:
+ http://dmx.sourceforge.net/
+
+The protocol specification is currently maintained in the xserver git
+repository at hw/dmx/doc/DMXSpec.txt and can be viewed online at:
+
+ http://cgit.freedesktop.org/xorg/xserver/tree/hw/dmx/doc/DMXSpec.txt
+
All questions regarding this software should be directed at the
Xorg mailing list:
commit 9e9b74b7b6ba9427fdae736093263f87e098ae59
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 28 17:53:22 2010 -0800
config: Replace obsolete usage of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index e4442dd..2260553 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,5 +18,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-AC_OUTPUT([Makefile
- dmxproto.pc])
+AC_CONFIG_FILES([Makefile
+ dmxproto.pc])
+AC_OUTPUT
commit 7df615d96ea2204b3922bf0600a55cbe661b3d69
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 28 17:51:15 2010 -0800
config: Add missing AC_CONFIG_SRCDIR
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c25791e..e4442dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,14 @@
+dnl
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([DMXProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DMXProto], [2.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 2cef0867dcf92eb3cb08868fca23371785c19bad
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:25:52 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 0dc39ed..c25791e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([DMXProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit a60e6edd191a52287a65cfa1c04915578a1c998c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:00:30 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 7511e5b..6883b29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ dmx_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmxproto.pc
-EXTRA_DIST = dmxproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 1d12dbdebd0fbf97dba8a77de0c9678b6439203e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 22 19:24:47 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index fcb8495..7511e5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,8 @@ pkgconfig_DATA = dmxproto.pc
EXTRA_DIST = dmxproto.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
INSTALL:
commit 5932e06e39c7dad609e31d822670913ba352afc8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 16 11:13:29 2009 -0500
README: file created or updated #24206
Contains a set of URLs to freedesktop.org.
diff --git a/README b/README
new file mode 100644
index 0000000..3b93b48
--- /dev/null
+++ b/README
@@ -0,0 +1,31 @@
+ Distributed Multihead X (DMX) Extension
+
+This extension defines a protocol for clients to access a front-end proxy
+X server that controls multiple back-end X servers making up a large display.
+
+Extension name: DMX
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/proto/dmxproto
+
+ http://cgit.freedesktop.org/xorg/proto/dmxproto
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
+
commit be2d639aa3c509b90cdf78860a0180daead17fac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 19:45:26 2009 -0500
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index 14b07fb..fcb8495 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,6 @@ pkgconfig_DATA = dmxproto.pc
EXTRA_DIST = dmxproto.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
.PHONY: ChangeLog INSTALL
INSTALL:
commit 304e9178168e33dbf6d5441824ac4c721521136a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 18:31:28 2009 -0500
Makefile.am: INSTALL file is missing or incorrect #24206
The standard GNU file on building/installing tarball is copied
using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
Add INSTALL target
diff --git a/Makefile.am b/Makefile.am
index 69db128..14b07fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,12 @@ EXTRA_DIST = dmxproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit cd7722d7265e6e8f90f4c0e8b6aa7aa39ebfa785
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 18:11:36 2009 -0500
configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index 9de169d..0dc39ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,9 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# 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])])
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
-
XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
commit efbe0f2a6b4b1231b887f983bfb38f573ae2bf8c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 13:55:24 2009 -0500
configure.ac: AM_MAINTAINER_MODE missing #24238
This turns off maintainer mode build rules in tarballs.
Works in conjunction with autogen.sh --enable-maintainer-mode
diff --git a/configure.ac b/configure.ac
index ab28ba3..9de169d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
AC_PREREQ([2.57])
AC_INIT([DMXProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
# 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])])
commit f7309b32556fd85353c8740fcaa14b57a667ec38
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 14 18:26:46 2009 -0500
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 69581fd..71417e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,78 @@
-Makefile
-Makefile.in
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
+config.sub
configure
+configure.scan
+depcomp
+.deps/
+INSTALL
install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-dmxproto.pc
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-dmxproto-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for dmxproto
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
Reply to: