Last commit made on 2014-07-15
Get this branch:
git clone -b ubuntu/trusty-proposed https://git.launchpad.net/ubuntu/+source/pango1.0
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

de2e385... by Steve Langasek on 2014-07-02

Import patches-unapplied version 1.36.3-1ubuntu1.1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 3789dc4977103392d09d5b809fb26254f90ff0df

New changelog entries:
  * Move the versioned conflicts with plymouth from the libpango-1.0-0
    package to the libpango1.0-0 package which actually contained the files
    in precise. LP: #1335017.

3789dc4... by Iain Lane on 2014-03-20

Import patches-unapplied version 1.36.3-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 988b7f12f857c222521ece098789c6ecf5e36b18

New changelog entries:
  * Merge with Debian, remaining change:
    - Add a versioned conflicts on old versions of plymouth whose initramfs
      hook tries to find pango modules. The Debian version of this change
      uses Breaks which is insufficient, and doesn't match the version of
      the plymouth package that supports the new path in Ubuntu.

988b7f1... by Iain Lane on 2014-03-20

Import patches-unapplied version 1.36.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f88567cf835bb50eaff22783bdda7c4b529c6a84

New changelog entries:
  * Add xauth test-dep, needed for xvfb-run
  * New upstream release
    - Fix builddir != srdir builds
      + Drop 0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch,
        which was a cherry-pick of this fix.
    - Avoid a crash when FT_Face is NULL
    - Update pango_color_parse docs

f88567c... by Iain Lane on 2014-02-24

Import patches-unapplied version 1.36.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 853d5e29cd83182981b920c4f8fbd6b2fb4fee51

New changelog entries:
  * Copyright cleanups (thanks Thorsten Alteholz)
    + harfbuzz isn't shipped here any more; remove mention of it
    + mini-fribidi is LGPL-2.1+
    + test/GraphemeBreakTest.txt is under the "Unicode License" (see package
  [ Emilio Pozuelo Monfort ]
  * debian/rules:
    + Set VERBOSE so we get more information about test failures.
    + Enable parallel builds.
  [ Iain Lane ]
  * New upstream release 1.36.2
   + Fix a possible strtol(NULL)
   + Fix --with-included-modules
   + Fix a FPE in pango_layout_iter_get_char_extents
   + Use 96 dpi for CoreText by default
   + Handle scaling absolute font sizes
  * Bump gtk-doc build-depend to 1.15 per configure.
  * debian/patches/0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch:
    Add new patch to fix make check causing FTBFS. (Closes: #727174)
  * Add an installed test package and a DEP-8 test to run them.
  * Clean up build and install dirs. Thanks, Steve Langasek.

853d5e2... by Michael Biebl on 2013-10-21

Import patches-unapplied version 1.36.0-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 73f4926d40c926d496f578a203adbf01d31daa2e

New changelog entries:
  [ Michael Biebl ]
  * Use Breaks instead of Conflicts since that is recommended nowadays for
    moving files between packages.
  * Use the official field for udebs: Package-Type.
  [ Andreas Henriksson ]
  * New upstream release.
  * Update debian/libpango-1.0-0.symbols with one added symbol.
  [ Michael Biebl ]
  * Refresh patches.
  * Bump minimum required version of libcairo2-dev to >= 1.12.10 and
    libfontconfig1-dev to >= 2.10.91 to get the thread-safe version.

73f4926... by Michael Biebl on 2013-05-21

Import patches-unapplied version 1.32.5-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 87f5bb05d9b70a0589385ad36e86c882ec033097

New changelog entries:
  * Upload to unstable.
  * Drop explicit Build-Depends on gir1.2-glib-2.0 and gir1.2-freedesktop.
  * Bump Standards-Version to 3.9.4. No further changes.

87f5bb0... by Emilio Pozuelo Monfort <email address hidden> on 2013-04-09

Import patches-unapplied version 1.32.5-4 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 1e4a873014d6752f4703ef29a2d4604be52f499f

New changelog entries:
  * debian/control.in:
    + Make libpango1.0-0 arch:any and M-A:same to fix the upgrade
      path when libpango1.0-0:$arch has been installed.
      Closes: #704795, #704850.
    + Since libpango1.0-0 is arch:any now, tighten its dependencies
      on the new library packages.
    + Make libpango1.0-0 depend on libpangox-1.0-0 to keep backwards
      compatibility with packages that link to libpangox-1.0.so.0
      and depend on libpango1.0-0.

1e4a873... by Emilio Pozuelo Monfort <email address hidden> on 2013-03-29

Import patches-unapplied version 1.32.5-3 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 319a8dfd060a42790c8d9d4decf0530bb30d1e4c

New changelog entries:
  * debian/control.in:
    + Add missing breaks/replaces.
  * debian/libpango1.0-0.install.opt,
    - We don't have an optimized flavor anymore.
  * debian/rules:
    - Pass -V without a version to dh_makeshlibs. We have symbol files
      for fine-grained versioning, and for shlibs this avoids problems
      if the version is not updated.
  * debian/control.in,
    - Split libpango in several packages, one per shared library. Keep
      libpango1.0-0 as a transitional package that depends on all the
      other packages to keep backwards compatibility. libpango1.0-0 will
      also grow a dependency on libpangox-1.0-0 once that package lands
      in the archive, as libpangox-1.0.so was previously shipped in
      libpango1.0-0 but is not shipped as part of pango1.0 anymore.
  * debian/libpango-1.0-0.install.in,
    - Make the pango modules be included in the shared libraries.

319a8df... by Emilio Pozuelo Monfort <email address hidden> on 2013-02-23

Import patches-unapplied version 1.32.5-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: ec08ffc7f1fddbc8dfd236f67f2101cc37f236f3

New changelog entries:
  [ Andreas Henriksson ]
  * New upstream release.
    - bump glib build-dependency to >= 2.33.12 according to configure.ac
    - add build-dependency on libharfbuzz-dev (>= 0.9.9-1)
  * Drop patches from upstream, now part of release:
    - 00git_memory_leak.patch
    - 00git_missing_prototype.patch
    - 00git_thai_zero_width_spaces.patch
  * Update patches to apply:
    - 10_scan-module-files-in-dirs.patch
    - 11_module-files-append-module-files-d.patch
    - 12_module-files-append-compat-module-files-d.patch
  * Add patch to fix build error during configure:
    - 13_configure-thai-modules.patch
  * Add patch to fix build during linking of module basic-fc:
    - 14_makefile_modules_ft2_link_harfbuzz.patch
  * debian/rules: bump MODVER to 1.8.0
  * Update libpango1.0-0.symbols
    - some new additions
    - libpangox-1.0.so.0 (pango_x_* symbols) removed
  [ Martin Pitt ]
  * debian/control.in: Fix misplaced XS-Testsuite header.
  [ Emilio Pozuelo Monfort ]
  * New upstream release.
    + debian/control.in:
      - Update build dependencies.
    + debian/libpango1.0-0.symbols:
      - Update for new symbols.
  * debian/control.in:
    - libpango1.0-dev needs to depend on libharfbuzz-dev.
  * debian/patches/12_module-files-append-compat-module-files-d.patch:
    - Removed, we no longer need to provide compatibility for ia32-libs.
  * debian/patches/11_module-files-append-module-files-d.patch:
    - Updated from Ubuntu, thanks Iain Lane and Rico Tzschichholz.

ec08ffc... by Martin Pitt on 2012-11-12

Import patches-unapplied version 1.30.1-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 2aee9b1c52d6112b218501650773c927ce8069c8

New changelog entries:
  * New upstream bug fix release.
  * debian/libpango1.0-0.symbols: Add new symbol from this release.
  * Grab a few fixes from upstream (via Ubuntu package, thanks Robert Ancell):
    - 00git_missing_prototype.patch: Add missing method prototype.
    - 00git_memory_leak.patch: Fix memory leak (LP: #837145)
    - 00git_thai_zero_width_spaces.patch: correctly handle zero width spaces
      in Thai (LP: #986008)
  * Add debian/tests: Simple compile/link/run autopkg test. Thanks to Rafał
    Cieślak! (LP: #1073637)
  * debian/control.in: Set Vcs-* to experimental branch.