Merge lp:~bregma/frame/packaging-reqs into lp:frame

[Stephen M. Webb]

Some changes required to get this project uploaded into Ubuntu.

(1) Standardized the COPYING file for GPL-3.

(2) Added a man page for the utouch-frame-test-mtdev tool.

(3) Added a missing license header to frame-impl.h.

[Chase Douglas (chasedouglas)]

looks good to me.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-02-03 16:16:36 +0000
@@ -0,0 +1,17 @@
+**.la
+**.lo
+**.pdf
+**/Makefile
+*.deps
+*.libs
+*Makefile.in
+aclocal.m4
+autom4te.cache
+config-aux
+config.*
+configure
+libtool
+stamp-*
+tools/utouch-frame-test-mtdev
+tools/utouch-frame-test-mtdev.1
+utouch-frame.pc

=== modified file 'COPYING'
--- COPYING	2010-12-30 19:23:24 +0000
+++ COPYING	2011-02-03 16:16:36 +0000
@@ -1,9 +1,12 @@
-utouch-frame - Touch Frame Library (GPLv3 license)
-
-    Copyright (C) 2010 Canonical Ltd.
-    Copyright (C) 2010 Henrik Rydberg <[e-mail]>
-
-                            Preamble
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ 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 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
+		       TERMS AND CONDITIONS
 
   0. Definitions.
 
@@ -74,7 +77,7 @@
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
-
+ 
   "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
@@ -507,7 +510,7 @@
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
-
+  
   If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
@@ -616,9 +619,9 @@
 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
@@ -670,3 +673,4 @@
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

=== modified file 'configure.ac'
--- configure.ac	2010-12-30 19:23:24 +0000
+++ configure.ac	2011-02-03 16:16:36 +0000
@@ -25,6 +25,11 @@
 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

=== modified file 'src/frame-impl.h'
--- src/frame-impl.h	2010-12-30 19:23:24 +0000
+++ src/frame-impl.h	2011-02-03 16:16:36 +0000
@@ -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
 

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2010-12-30 19:23:24 +0000
+++ tools/Makefile.am	2011-02-03 16:16:36 +0000
@@ -5,3 +5,14 @@
 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
+

=== added file 'tools/utouch-frame-test-mtdev.txt'
--- tools/utouch-frame-test-mtdev.txt	1970-01-01 00:00:00 +0000
+++ tools/utouch-frame-test-mtdev.txt	2011-02-03 16:16:36 +0000
@@ -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 <[e-mail]>