← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libxfont/trusty-proposed

~ubuntu-branches/ubuntu/trusty/libxfont/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/xsfbs/xsfbs.sh

Committer: Bazaar Package Importer
Author(s): Stefan Potyra
Date: 2009-05-09 12:11:53 UTC
mfrom: (1.1.10 upstream) (10.1.2 squeeze)
Revision ID: james.westby@ubuntu.com-20090509121153-nwte290k1e9gew62

Tags: 1:1.4.0-1ubuntu1

* Rebase to unstable, remaining change:
  + debian/rules: unset LDFLAGS to not be hit by -Bsymbolic-functions,
    as libxfont contains weak symbols which are meant to be overriden
    (cf. LP #226156).

files added:
README

debian/xsfbs/repack.sh

src/fontfile/bunzip2.c

files removed:
include/X11/fonts/fontmod.h

mkinstalldirs

src/Speedo

src/Speedo/Makefile.am

src/Speedo/Makefile.in

src/Speedo/adobe-iso.h

src/Speedo/bics-iso.h

src/Speedo/bics-unicode.c

src/Speedo/bics-unicode.h

src/Speedo/do_char.c

src/Speedo/do_trns.c

src/Speedo/keys.h

src/Speedo/out_bl2d.c

src/Speedo/out_blk.c

src/Speedo/out_outl.c

src/Speedo/out_scrn.c

src/Speedo/out_util.c

src/Speedo/reset.c

src/Speedo/set_spcs.c

src/Speedo/set_trns.c

src/Speedo/spdo_prv.h

src/Speedo/speedo.h

src/Speedo/spencode.c

src/Speedo/sperr.c

src/Speedo/spfile.c

src/Speedo/spfont.c

src/Speedo/spfuncs.c

src/Speedo/spglyph.c

src/Speedo/spinfo.c

src/Speedo/spint.h

src/Speedo/useropt.h

src/Type1

src/Type1/Makefile.am

src/Type1/Makefile.in

src/Type1/arith.c

src/Type1/arith.h

src/Type1/blues.h

src/Type1/cluts.h

src/Type1/curves.c

src/Type1/curves.h

src/Type1/digit.h

src/Type1/fontfcn.c

src/Type1/fontfcn.h

src/Type1/fonts.h

src/Type1/hdigit.h

src/Type1/hints.c

src/Type1/hints.h

src/Type1/lines.c

src/Type1/lines.h

src/Type1/objects.c

src/Type1/objects.h

src/Type1/paths.c

src/Type1/paths.h

src/Type1/pictures.h

src/Type1/regions.c

src/Type1/regions.h

src/Type1/scanfont.c

src/Type1/spaces.c

src/Type1/spaces.h

src/Type1/strokes.h

src/Type1/t1funcs.c

src/Type1/t1hdigit.h

src/Type1/t1imager.h

src/Type1/t1info.c

src/Type1/t1intf.h

src/Type1/t1io.c

src/Type1/t1malloc.c

src/Type1/t1snap.c

src/Type1/t1stdio.h

src/Type1/t1unicode.c

src/Type1/t1unicode.h

src/Type1/token.c

src/Type1/token.h

src/Type1/tokst.h

src/Type1/trig.h

src/Type1/type1.c

src/Type1/util.c

src/Type1/util.h

src/fontcache

src/fontcache/Makefile.am

src/fontcache/Makefile.in

src/fontcache/fcqueue.h

src/fontcache/fontcache.c

src/fontcache/fontcache.h

src/fontfile/ffcheck.c

src/fontfile/printerfont.c

src/stubs/fontmod.c

src/stubs/xpstubs.c

files modified:
COPYING

ChangeLog

Makefile.am

Makefile.in

aclocal.m4

autogen.sh *

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/copyright

debian/rules

debian/xsfbs/xsfbs.sh

include/X11/fonts/bitmap.h

include/X11/fonts/bufio.h

include/X11/fonts/fntfilst.h

include/X11/fonts/fontconf.h.in

include/X11/fonts/fontmisc.h

include/X11/fonts/pcf.h

ltmain.sh *

src/FreeType/Makefile.am

src/FreeType/Makefile.in

src/FreeType/ft.h

src/FreeType/ftenc.c

src/FreeType/ftfuncs.c

src/FreeType/fttools.c

src/FreeType/xttcap.c

src/FreeType/xttcap.h

src/Makefile.am

src/Makefile.in

src/bitmap/Makefile.am

src/bitmap/Makefile.in

src/bitmap/bdfread.c

src/bitmap/bdfutils.c

src/bitmap/bitmapfunc.c

src/bitmap/bitmaputil.c

src/bitmap/bitscale.c

src/bitmap/pcfread.c

src/bitmap/pcfwrite.c

src/bitmap/snfread.c

src/builtins/Makefile.am

src/builtins/Makefile.in

src/builtins/dir.c

src/builtins/file.c

src/builtins/render.c

src/fc/Makefile.am

src/fc/Makefile.in

src/fc/fsconvert.c

src/fc/fserve.c

src/fc/fsio.c

src/fc/fslibos.h

src/fontfile/Makefile.am

src/fontfile/Makefile.in

src/fontfile/bitsource.c

src/fontfile/bufio.c

src/fontfile/catalogue.c

src/fontfile/decompress.c

src/fontfile/dirfile.c *

src/fontfile/fileio.c

src/fontfile/filewr.c

src/fontfile/fontdir.c

src/fontfile/fontfile.c

src/fontfile/fontscale.c

src/fontfile/gunzip.c

src/fontfile/register.c

src/fontfile/renderers.c

src/stubs/Makefile.am

src/stubs/Makefile.in

src/util/Makefile.am

src/util/Makefile.in

src/util/atom.c

src/util/fontnames.c

src/util/fontutil.c

src/util/fontxlfd.c

src/util/miscutil.c

src/util/patcache.c

src/util/private.c

src/util/utilbitmap.c

Show diffs side-by-side

added added

removed removed

debian/xsfbs/xsfbs.sh

719

719

fi

720

720

}

721

721

722

register_x_lib_dir_with_ld_so () {

723

# syntax: register_x_lib_dir_with_ld_so

724

#

725

# Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared

726

# libraries.

727

#

728

# Call this function from the postinst script of a package that places a

729

# shared library in /usr/X11R6/lib, before invoking ldconfig.

730

731

local dir ldsoconf

732

733

dir="/usr/X11R6/lib"

734

ldsoconf="/etc/ld.so.conf"

735

736

# is the line not already present?

737

if ! fgrep -qsx "$dir" "$ldsoconf"; then

738

observe "adding $dir directory to $ldsoconf"

739

echo "$dir" >> "$ldsoconf"

740

fi

741

}

742

743

deregister_x_lib_dir_with_ld_so () {

744

# syntax: deregister_x_lib_dir_with_ld_so

745

#

746

# Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared

747

# libraries, if and only if no shared libaries remain there.

748

#

749

# Call this function from the postrm script of a package that places a shared

750

# library in /usr/X11R6/lib, in the event "$1" is "remove", and before

751

# invoking ldconfig.

752

753

local dir ldsoconf fgrep_status cmp_status

754

755

dir="/usr/X11R6/lib"

756

ldsoconf="/etc/ld.so.conf"

757

758

# is the line present?

759

if fgrep -qsx "$dir" "$ldsoconf"; then

760

# are there any shared objects in the directory?

761

if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then

762

# glob expansion produced nothing, so no shared libraries are present

763

observe "removing $dir directory from $ldsoconf"

764

# rewrite the file (very carefully)

765

set +e

766

fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"

767

fgrep_status=$?

768

set -e

769

case $fgrep_status in

770

0|1) ;; # we don't actually care if any lines matched or not

771

*) die "error reading \"$ldsoconf\"; fgrep exited with status" \

772

"$fgrep_status" ;;

773

esac

774

set +e

775

cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"

776

cmp_status=$?

777

set -e

778

case $cmp_status in

779

0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical

780

1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ

781

*) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \

782

"cmp exited with status $cmp_status" ;;

783

esac

784

fi

785

fi

786

}

787

788

722

make_symlink_sane () {

789

723

# syntax: make_symlink_sane symlink target

790

724

#

Older »