[maemo-commits] [maemo-commits] r11742 - in projects/haf/trunk/pango1.0: debian debian/patches debian/scripts upstream/tarballs

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue May 22 08:29:34 EEST 2007 
Author: fherrera
Date: 2007-05-22 08:29:30 +0300 (Tue, 22 May 2007)
New Revision: 11742

Added:
   projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.16.4.tar.gz
Removed:
   projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.14.10.tar.gz
Modified:
   projects/haf/trunk/pango1.0/debian/changelog
   projects/haf/trunk/pango1.0/debian/patches/break.patch
   projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch
   projects/haf/trunk/pango1.0/debian/scripts/vars
   projects/haf/trunk/pango1.0/debian/shlibs.local
Log:
pango1.0 (1.16.4-1osso1) unstable; urgency=low

  * new upstream release

 -- Fernando Herrera <fernando.herrera-de-las-heras at nokia.com>  Fri, 22 May 2007 08:13:02 +0200




Modified: projects/haf/trunk/pango1.0/debian/changelog
===================================================================
--- projects/haf/trunk/pango1.0/debian/changelog	2007-05-21 17:29:18 UTC (rev 11741)
+++ projects/haf/trunk/pango1.0/debian/changelog	2007-05-22 05:29:30 UTC (rev 11742)
@@ -1,3 +1,9 @@
+pango1.0 (1.16.4-1osso1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Fernando Herrera <fernando.herrera-de-las-heras at nokia.com>  Fri, 22 May 2007 08:13:02 +0200
+
 pango1.0 (1.14.10-1osso4.2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET

Modified: projects/haf/trunk/pango1.0/debian/patches/break.patch
===================================================================
--- projects/haf/trunk/pango1.0/debian/patches/break.patch	2007-05-21 17:29:18 UTC (rev 11741)
+++ projects/haf/trunk/pango1.0/debian/patches/break.patch	2007-05-22 05:29:30 UTC (rev 11742)
@@ -1,11 +1,11 @@
---- pango-orig/pango/break.c	2005-01-04 21:20:15.000000000 +0200
-+++ pango-1.8.1/pango/break.c	2006-07-26 16:27:48.000000000 +0300
-@@ -789,8 +789,6 @@
-               switch (break_op)
-                 {
-                 case BREAK_PROHIBITED:
--                  /* can't break here */                  
--                  attrs[i].is_char_break = FALSE;
-                   break;
+--- pango-orig/pango/break.c	2007-02-27 15:01:33.000000000 +0200
++++ pango-1.16.4/pango/break.c	2007-02-27 15:01:42.000000000 +0200
+@@ -902,8 +902,6 @@
+ 	      switch (break_op)
+ 		{
+ 		case BREAK_PROHIBITED:
+-		  /* can't break here */
+-		  attrs[i].is_char_break = FALSE;
+ 		  break;
  
-                 case BREAK_IF_SPACES:
+ 		case BREAK_IF_SPACES:

Modified: projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch
===================================================================
--- projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch	2007-05-21 17:29:18 UTC (rev 11741)
+++ projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch	2007-05-22 05:29:30 UTC (rev 11742)
@@ -1,7 +1,6 @@
-diff -ruN pango-1.6.0-orig/pango/glyphstring.c pango-1.6.0/pango/glyphstring.c
---- pango-1.6.0-orig/pango/glyphstring.c	2003-07-24 22:04:47.000000000 +0300
-+++ pango-1.6.0/pango/glyphstring.c	2005-03-24 17:20:01.465336707 +0200
-@@ -39,6 +39,7 @@
+--- pango-orig/pango/glyphstring.c	2007-01-23 01:41:43.000000000 +0200
++++ pango-1.16.4/pango/glyphstring.c	2007-02-27 15:10:54.000000000 +0200
+@@ -42,6 +42,7 @@
    string->space = 0;
    string->glyphs = NULL;
    string->log_clusters = NULL;
@@ -9,7 +8,7 @@
  
    return string;
  }
-@@ -55,6 +56,8 @@
+@@ -58,6 +59,8 @@
  {
    g_return_if_fail (new_len >= 0);
  
@@ -18,12 +17,12 @@
    while (new_len > string->space)
      {
        if (string->space == 0)
-@@ -252,8 +255,18 @@
+@@ -262,8 +265,18 @@
  			    PangoRectangle   *ink_rect,
  			    PangoRectangle   *logical_rect)
  {
 -  pango_glyph_string_extents_range (glyphs, 0, glyphs->num_glyphs,
--                                    font, ink_rect, logical_rect);
+-				    font, ink_rect, logical_rect);
 +	if (!glyphs->has_cache)
 +	{
 +		pango_glyph_string_extents_range (glyphs, 0, glyphs->num_glyphs, font, &glyphs->ink_rect, &glyphs->logical_rect);
@@ -39,9 +38,9 @@
  }
  
  /**
-diff -ruN pango-1.6.0-orig/pango/pango-glyph.h pango-1.6.0/pango/pango-glyph.h
---- pango-1.6.0-orig/pango/pango-glyph.h	2002-11-08 21:00:52.000000000 +0200
-+++ pango-1.6.0/pango/pango-glyph.h	2005-03-24 17:15:30.012688332 +0200
+diff -ruN pango-orig/pango/pango-glyph.h pango-1.16.0/pango/pango-glyph.h
+--- pango-orig/pango/pango-glyph.h	2002-11-08 21:00:52.000000000 +0200
++++ pango-1.16.4/pango/pango-glyph.h	2005-03-24 17:15:30.012688332 +0200
 @@ -77,6 +77,10 @@
  
    /*< private >*/

Modified: projects/haf/trunk/pango1.0/debian/scripts/vars
===================================================================
--- projects/haf/trunk/pango1.0/debian/scripts/vars	2007-05-21 17:29:18 UTC (rev 11741)
+++ projects/haf/trunk/pango1.0/debian/scripts/vars	2007-05-22 05:29:30 UTC (rev 11742)
@@ -8,7 +8,7 @@
 SOURCE_DIR=build-tree
 # For a single pkg, this is the directory that is embedded in the tarball.
 # For multiple pkgs, this is null.
-TAR_DIR=pango-1.14.10
+TAR_DIR=pango-1.16.4
 # Where to place all the stamp files.  This directory can be removed, and
 # all the targets will then be rerun.
 STAMP_DIR=debian/stampdir

Modified: projects/haf/trunk/pango1.0/debian/shlibs.local
===================================================================
--- projects/haf/trunk/pango1.0/debian/shlibs.local	2007-05-21 17:29:18 UTC (rev 11741)
+++ projects/haf/trunk/pango1.0/debian/shlibs.local	2007-05-22 05:29:30 UTC (rev 11742)
@@ -1,4 +1,15 @@
-libpango-1.0 0 libpango1.0-0 (>= 1.14.10)
-libpangox-1.0 0 libpango1.0-0 (>= 1.14.10)
-libpangoft2-1.0 0 libpango1.0-0 (>= 1.14.10)
-libpangoxft-1.0 0 libpango1.0-0 (>= 1.14.10)
+libpango-1.0 0 libpango1.0-0 (>= 1.16.4)
+libpangox-1.0 0 libpango1.0-0 (>= 1.16.4)
+libpangoft2-1.0 0 libpango1.0-0 (>= 1.16.4)
+libpangoxft-1.0 0 libpango1.0-0 (>= 1.16.4)
+libpangocairo-1.0 0 libpango1.0-0 (>= 1.16.4)
+pango-arabic fc libpango1.0-0 (>= 1.16.4)
+pango-arabic lang libpango1.0-0 (>= 1.16.4)
+pango-hangul fc libpango1.0-0 (>= 1.16.4)
+pango-hebrew fc libpango1.0-0 (>= 1.16.4)
+pango-indic fc libpango1.0-0 (>= 1.16.4)
+pango-indic lang libpango1.0-0 (>= 1.16.4)
+pango-khmer fc libpango1.0-0 (>= 1.16.4)
+pango-syriac fc libpango1.0-0 (>= 1.16.4)
+pango-thai fc libpango1.0-0 (>= 1.16.4)
+pango-tibetan fc libpango1.0-0 (>= 1.16.4)

Deleted: projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.14.10.tar.gz
===================================================================
(Binary files differ)

Added: projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.16.4.tar.gz
===================================================================
(Binary files differ)


Property changes on: projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.16.4.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
More information about the maemo-commits mailing list