[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] graphite2 packaging repository branch, master, updated. graphite2_0.9.4-1-1-g81e5da9



The following commit has been merged in the master branch:
commit 81e5da9f3e95637517ee5348cc5bc9ae4f463c4d
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Jul 10 00:08:56 2011 +0200

    commit graphite2 0.9.4.dfsg-1

diff --git a/changelog b/changelog
index fad1411..0d1bb70 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,16 @@
+graphite2 (0.9.4.dfsg-1) experimental; urgency=low
+
+  * remove perl/pport.h and tests/fonts/* from .orig
+
+  * debian/changelog: update 
+  * debian/control: build-depend on ttf-sil-padauk, ttf-sil-scheherazade
+  * debian/rules: symlink to Debian's versions pf Padauk and Scheherazade,
+    though....
+  * debian/patches/disable_font_tests.diff: disable them (fail)
+  * debian/rules, debian/control: disable perl build
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 09 Jul 2011 16:50:25 +0000
+
 graphite2 (0.9.4-1) experimental; urgency=low
 
   * Initial release (closes: #617718)
diff --git a/control b/control
index 222a20e..02b2f00 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: libs
 Maintainer: Debian LibreOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>, Daniel Glassey <wdg@debian.org>
-Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev, asciidoc, dblatex, libxml2-utils, doxygen, docbook-xsl, libmodule-build-perl
+Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev, asciidoc, dblatex, libxml2-utils, doxygen, docbook-xsl, libmodule-build-perl, ttf-sil-padauk, ttf-sil-scheherazade
 Standards-Version: 3.9.1
 
 Package: libgraphite2-2.0.0
@@ -103,26 +103,26 @@ Description: Documentation for libgraphite2
  .
  PDF and HTML documentation for libgraphite2
 
-Package: libtext-graphite2-perl
-Section: perl
-Architecture: any
-Depends: ${shlibs:Depends}, perl, ${perl:Depends}, ${misc:Depends}
-Description: Perl Interface to SIL's Graphite2 rendering engine
- Graphite is a system that can be used to create and use "smart fonts" capable
- of displaying writing systems with various complex behaviors, such as:
- contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
- stacking diacritics and complex positioning.
- .
- This library was designed and developed by the NRSI (Non-Roman Script
- Initiative) within SIL International (www.sil.org) to act as a complement to
- other smart font rendering technologies with limited practical local
- extensability. Its purpose is to help meet the needs of a very large number
- of "minority language" communities for local extensibility of complex script
- behaviors.
- .
- The behavior of the rendering engine for a given writing system is specified
- through extra tables added to a TrueType font.  These tables are generated by
- compiling a GDL (Graphite Description Language) source file into a font using
- grcompiler.
- .
- This package contains the Text::Graphite2 module.
+#Package: libtext-graphite2-perl
+#Section: perl
+#Architecture: any
+#Depends: ${shlibs:Depends}, perl, ${perl:Depends}, ${misc:Depends}
+#Description: Perl Interface to SIL's Graphite2 rendering engine
+# Graphite is a system that can be used to create and use "smart fonts" capable
+# of displaying writing systems with various complex behaviors, such as:
+# contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+# stacking diacritics and complex positioning.
+# .
+# This library was designed and developed by the NRSI (Non-Roman Script
+# Initiative) within SIL International (www.sil.org) to act as a complement to
+# other smart font rendering technologies with limited practical local
+# extensability. Its purpose is to help meet the needs of a very large number
+# of "minority language" communities for local extensibility of complex script
+# behaviors.
+# .
+# The behavior of the rendering engine for a given writing system is specified
+# through extra tables added to a TrueType font.  These tables are generated by
+# compiling a GDL (Graphite Description Language) source file into a font using
+# grcompiler.
+# .
+# This package contains the Text::Graphite2 module.
diff --git a/copyright b/copyright
index 2ab1cac..f29e704 100644
--- a/copyright
+++ b/copyright
@@ -76,3 +76,39 @@ License: LGPL-2+
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+Files: tests/comparerenderer/icule/*
+Copyright: Copyright (c) 1995-2006 International Business Machines Corporation and others
+License: other
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, and/or sell copies of the Software, and to permit persons
+   to whom the Software is furnished 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.
+
+Files: gr2fonttest/gr2FontTest.cpp
+Copyright: Copyright (C) 2005 www.thanlwinsoft.org
+License: LGPL | other
+
+Files: tests/comparerenderer/GrUtfTextSrc.*
+Copyright: Copyright (C) 2004 Keith Stribley
+License: MPL-1.1 | GPL-2 | LGPL-2.1
+
diff --git a/patches/series b/patches/series
index 10d55fe..a5ef42e 100644
--- a/patches/series
+++ b/patches/series
@@ -1 +1,3 @@
 include-and-libraries.diff
+disable_font_tests.diff
+debian-changes-0.9.4-2
diff --git a/rules b/rules
index f0dd372..ba0c796 100755
--- a/rules
+++ b/rules
@@ -10,34 +10,39 @@ override_dh_auto_build:
 	dh_auto_build
 	echo "Building docs"
 	dh_auto_build -- docs
-	echo "Building perl module"
-	cd perl && \
-		perl Build.PL prefix=/usr && \
-		./Build
+#	echo "Building perl module"
+#	cd perl && \
+#		perl Build.PL prefix=/usr && \
+#		./Build
 
 override_dh_auto_install:
 	dh_auto_install
 	rm -rf debian/tmp/usr/bin
-	cd perl && \
-		./Build install destdir=$(CURDIR)/debian/libtext-graphite2-perl
-	# hack
-	cd $(CURDIR)/debian/libtext-graphite2-perl/usr && \
-		mkdir share && mv man share
-	cd $(CURDIR)/debian/libtext-graphite2-perl/usr/lib && \
-		mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.*
-	find debian/libtext-graphite2-perl -type f -name .packlist | xargs rm -f
+#	cd perl && \
+#		./Build install destdir=$(CURDIR)/debian/libtext-graphite2-perl
+#	# hack
+#	cd $(CURDIR)/debian/libtext-graphite2-perl/usr && \
+#		mkdir share && mv man share
+#	cd $(CURDIR)/debian/libtext-graphite2-perl/usr/lib && \
+#		mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.*
+#	find debian/libtext-graphite2-perl -type f -name .packlist | xargs rm -f
 
 override_dh_auto_test:
+	cd tests/fonts && \
+		ln -sf /usr/share/fonts/truetype/ttf-sil-padauk/Padauk.ttf; \
+		ln -sf /usr/share/fonts/truetype/ttf-sil-scheherazade/ScheherazadeRegOT.ttf Scheherazadegr.ttf
 	dh_auto_test
-ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	cd perl && \
-		LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test
-endif
+#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+#	cd perl && \
+#		LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test
+#endif
 
 override_dh_auto_clean:
-	if [ -e perl/Build ]; then cd perl && \
-		./Build clean; fi
-	rm -rf perl/Build perl/_build
+#	if [ -e perl/Build ]; then cd perl && \
+#		./Build clean; fi
+#	rm -rf perl/Build perl/_build
+	rm -f tests/fonts/Padauk.ttf
+	rm -f tests/fonts/Scheherazadegr.ttf
 	dh_auto_clean
 
 override_dh_auto_configure:
@@ -45,4 +50,4 @@ override_dh_auto_configure:
 
 override_dh_gencontrol:
 	dh_gencontrol -Nlibtext-graphite2-perl -O--builddirectory=build
-	dh_gencontrol -plibtext-graphite2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog  | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2`
+#	dh_gencontrol -plibtext-graphite2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog  | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2`

-- 
graphite2 packaging repository


Reply to: