Changes required for uploading into Ubuntu

Signed-off-by: Stephen M. Webb <stephen.webb@canonical.com>w
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

5 files changed, 68 insertions, 7 deletions

diff --git a/COPYING b/COPYING
index cf2bee5..24afbe2 100644
--- a/COPYING
+++ b/COPYING
@@ -1,9 +1,12 @@
-utouch-frame - Touch Frame Library (GPLv3 license)
 
-    Copyright (C) 2010 Canonical Ltd.
-    Copyright (C) 2010 Henrik Rydberg <rydberg@bitmath.org>
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-                            Preamble
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
 
   The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
@@ -66,7 +69,7 @@ patents cannot be used to render the program non-free.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
+                       TERMS AND CONDITIONS
 
   0. Definitions.
 
@@ -616,9 +619,9 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
diff --git a/configure.ac b/configure.ac
index 0ff758f..980a044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,11 @@ AC_PROG_INSTALL
 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
 PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0])
 
+AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x])
+AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$ASCIIDOC" != "x"])
+AS_IF([test "x$ASCIIDOC" = "x"],
+      [AC_MSG_WARN([asciidoc not installed, man pages will not be created])])
+
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  test/Makefile
diff --git a/src/frame-impl.h b/src/frame-impl.h
index c31f7da..63cbc7c 100644
--- a/src/frame-impl.h
+++ b/src/frame-impl.h
@@ -1,3 +1,24 @@
+/*****************************************************************************
+ *
+ * utouch-frame - Touch Frame Library
+ *
+ * Copyright (C) 2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ****************************************************************************/
+
 #ifndef _FRAME_IMPL_H
 #define _FRAME_IMPL_H
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6b50897..91e99ce 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,3 +5,13 @@ INCLUDES=-I$(top_srcdir)/include/
 utouch_frame_test_mtdev_SOURCES = utouch-frame-test-mtdev.c
 utouch_frame_test_mtdev_LDFLAGS = -L$(top_builddir)/src/.libs/ \
         -lutouch-frame -lutouch-evemu -lmtdev -lm
+
+if HAVE_DOCTOOLS
+dist_man_MANS = utouch-frame-test-mtdev.1
+
+%.1: %.txt
+        $(ASCIIDOC) -f manpage $<
+
+CLEANFILES = $(dist_man_MANS)
+
+endif
diff --git a/tools/utouch-frame-test-mtdev.txt b/tools/utouch-frame-test-mtdev.txt
new file mode 100644
index 0000000..c7bafe4
--- /dev/null
+++ b/tools/utouch-frame-test-mtdev.txt
@@ -0,0 +1,22 @@
+UTOUCH-FRAME-TEST-MTDEV(1)
+==========================
+
+NAME
+----
+
+  utouch-frame-test-mtdev - describe a device and report frame events
+
+SYNOPSIS
+--------
+
+  utouch-frame-test-mtdev device
+
+DESCRIPTION
+-----------
+
+A test tool used to analyse the capabilities and act as a test driver for the
+uTouch touch frame library.
+
+AUTHOR
+------
+utouch-frame-test-mtdev was written by Henrik Rydberg <rydberg@euromail.se>