From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated.
 74c80ab12d86cb537a6ccf7d573feec71535677c
Date: Wed, 19 Sep 2012 21:07:06 +0200
Message-ID: <20120919190735.EB51920099@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3219680490213272982=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3219680490213272982==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  74c80ab12d86cb537a6ccf7d573feec71535677c (commit)
       via  3e1532929ecdda146c6a3e3e1dc76298b136098b (commit)
      from  58adb7e153b82f6b033038cfe236870c753b2140 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 74c80ab12d86cb537a6ccf7d573feec71535677c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Sep 19 19:54:23 2012 +0200

    pango: Update to 1.31.0.
   =20
    Now requires harfbuzz to build and on runtime.
   =20
    Fixes #10229.

commit 3e1532929ecdda146c6a3e3e1dc76298b136098b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Sep 19 19:53:28 2012 +0200

    harfbuzz: New package.
   =20
    harfbuzz is a build dependency of pango > 1.31.
   =20
    Reference #10229.

-----------------------------------------------------------------------

Summary of changes:
 libX11/libX11.nm =3D> harfbuzz/harfbuzz.nm |   25 +++++++++++++------------
 pango/pango.nm                           |   10 +++++-----
 2 files changed, 18 insertions(+), 17 deletions(-)
 copy libX11/libX11.nm =3D> harfbuzz/harfbuzz.nm (64%)

Difference in files:
diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm
new file mode 100644
index 0000000..7ab7e1e
--- /dev/null
+++ b/harfbuzz/harfbuzz.nm
@@ -0,0 +1,44 @@
+############################################################################=
###
+# IPFire.org    - An Open Source Firewall Solution                          =
  #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>               =
    #
+############################################################################=
###
+
+name       =3D harfbuzz
+version    =3D 0.9.4
+release    =3D 1
+
+groups     =3D System/Libraries
+url        =3D http://freedesktop.org/wiki/Software/HarfBuzz
+license    =3D MIT
+summary    =3D A text shaping library.
+
+description
+	HarfBuzz is an implementation of the OpenType Layout engine.
+end
+
+source_dl  =3D http://www.freedesktop.org/software/harfbuzz/release/
+sources    =3D %{thisapp}.tar.bz2
+
+build
+	requires
+		cairo-devel
+		freetype-devel
+		glib2-devel
+	end
+
+	test
+		make check
+	end
+end
+
+packages
+	package %{name}
+
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/pango/pango.nm b/pango/pango.nm
index ba16ffb..be1409d 100644
--- a/pango/pango.nm
+++ b/pango/pango.nm
@@ -4,9 +4,9 @@
 ############################################################################=
###
=20
 name       =3D pango
-major	   =3D 1.29
-version    =3D %{major}.5
-release    =3D 2
+major	   =3D 1.31
+version    =3D %{major}.0
+release    =3D 1
=20
 groups     =3D System/Libraries
 url        =3D http://www.pango.org/
@@ -14,7 +14,7 @@ license    =3D LGPLv2+
 summary    =3D System for layout and rendering of internationalized text.
=20
 description
-	Pango is a library for laying out and rendering of text, with an \
+	Pango is a library for laying out and rendering of text, with an
 	emphasis on internationalization.
 end
=20
@@ -29,6 +29,7 @@ build
 		gcc-c++
 		glib2-devel
 		glibc-devel
+		harfbuzz-devel
 		libXft-devel
 		perl
 		pkg-config
@@ -40,7 +41,6 @@ end
=20
 packages
 	package %{name}
-	end
=20
 	package %{name}-devel
 		template DEVEL


hooks/post-receive
--
IPFire 3.x development tree

--===============3219680490213272982==--