~ubuntu-branches/ubuntu/oneiric/poppler/oneiric-security

« back to all changes in this revision

Viewing changes to poppler/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-08-13 10:58:05 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20100813105805-v6ybtufexxiska06
Tags: 0.14.2.is.0.14.1-0ubuntu1
* Revert previous upstream update. It bumped SONAME, but the packaging
  wasn't updated along with it, so we now have a broken libpoppler6. Provide
  a fixed one with this reversion until we can do the transition properly.
* debian/control: Update Breaks/Provides: to account for xpdf-utils now
  being a transitional package. Change forward ported from Debian's
  0.12.4-1.1 package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
549
549
        $(PTHREAD_LIBS)                         \
550
550
        $(win32_libs)
551
551
 
552
 
libpoppler_la_LDFLAGS = -version-info 7:0:0 @create_shared_lib@ @auto_import_flags@
 
552
libpoppler_la_LDFLAGS = -version-info 6:0:0 @create_shared_lib@
553
553
@ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler
554
554
@ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \
555
555
@ENABLE_XPDF_HEADERS_TRUE@      $(splash_headers)       \