Minor formatting tweak to license header.

2005-07-21  Owen Taylor  <otaylor@redhat.com>

        * modules/indic/indic-ot.c: Minor formatting tweak to license
        header.

        * tests/Makefile.am: Remove references to testiter: it's Cairo
        dependent, so not added on the maintenance branch.

4 files changed, 33 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 22b2971c..2b001b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2005-07-21  Owen Taylor  <otaylor@redhat.com>
+  
+ 	* modules/indic/indic-ot.c: Minor formatting tweak to license
+ 	header.
+	
+	* tests/Makefile.am: Remove references to testiter: it's Cairo
+	dependent, so not added on the maintenance branch.
+
+2005-07-21  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c modules/indic/indic-ot.[ch]:
 	license on these ICU-derived files is X license, not LGPL.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 22b2971c..2b001b31 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,4 +1,12 @@
 2005-07-21  Owen Taylor  <otaylor@redhat.com>
+  
+ 	* modules/indic/indic-ot.c: Minor formatting tweak to license
+ 	header.
+	
+	* tests/Makefile.am: Remove references to testiter: it's Cairo
+	dependent, so not added on the maintenance branch.
+
+2005-07-21  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c modules/indic/indic-ot.[ch]:
 	license on these ICU-derived files is X license, not LGPL.
diff --git a/modules/indic/indic-ot.c b/modules/indic/indic-ot.c
index 2493db91..a687ad35 100644
--- a/modules/indic/indic-ot.c
+++ b/modules/indic/indic-ot.c
@@ -13,20 +13,23 @@
  * to do so, provided that the above copyright notice(s) and this
  * permission notice appear in all copies of the Software and that
  * both the above copyright notice(s) and this permission notice
- * appear in supporting documentation. THE SOFTWARE IS PROVIDED "AS
- * IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO
- * EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
- * BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
- * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
- * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE. Except as contained in this notice,
- * the name of a copyright holder shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this
- * Software without prior written authorization of the copyright
- * holder.
+ * appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR
+ * ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written
+ * authorization of the copyright holder.
  */
 
 #include "indic-ot.h"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58175d28..467061ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,18 +34,12 @@ noinst_PROGRAMS = gen-all-unicode dump-boundaries
 
 check_PROGRAMS = testboundaries testcolor testscript
 
-if HAVE_CAIRO
-check_PROGRAMS += testiter
-endif
-
 gen_all_unicode_SOURCES = gen-all-unicode.c
 
 testboundaries_SOURCES = testboundaries.c
 
 testcolor_SOURCES = testcolor.c
 
-testiter_SOURCES = testiter.c
-
 testscript_SOURCES = testscript.c
 
 
@@ -57,8 +51,6 @@ testboundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
 
 testcolor_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
 
-testiter_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la ../pango/libpangocairo-$(PANGO_API_VERSION).la 
-
 testscript_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
 
 dump_boundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la