[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libfontenc][debian-unstable] 17 commits: make FontEncDirectory return a const string

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libfontenc

Commits:

13 changed files:

Changes:

  • Makefile.am
    ... ... @@ -40,3 +40,5 @@ if LINT
    40 40 
     lint:
    41 41 
     	(cd src && $(MAKE) $(MFLAGS) lint)
    42 42 
     endif LINT
    43 
    +
    44 
    +EXTRA_DIST = README.md

  • README → README.md
    1 1 
     libfontenc - font encoding library
    2 
    +----------------------------------
    2 3
    3 4 
     All questions regarding this software should be directed at the
    4 5 
     Xorg mailing list:
    5 6
    6 
    -        http://lists.freedesktop.org/mailman/listinfo/xorg
    7 
    -
    8 
    -Please submit bug reports to the Xorg bugzilla:
    9 
    -
    10 
    -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
    7 
    +  https://lists.x.org/mailman/listinfo/xorg
    11 8
    12 9 
     The master development code repository can be found at:
    13 10
    14 
    -        git://anongit.freedesktop.org/git/xorg/lib/libfontenc
    11 
    +  https://gitlab.freedesktop.org/xorg/lib/libfontenc
    15 12
    16 
    -        http://cgit.freedesktop.org/xorg/lib/libfontenc
    13 
    +Please submit bug reports and requests to merge patches there.
    17 14
    18 15 
     For patch submission instructions, see:
    19 16
    20 
    -	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
    21 
    -
    22 
    -For more information on the git code manager, see:
    23 
    -
    24 
    -        http://wiki.x.org/wiki/GitPage
    17 
    +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
    25 18

  • autogen.sh
    1 1 
     #! /bin/sh
    2 2
    3 
    -srcdir=`dirname $0`
    3 
    +srcdir=`dirname "$0"`
    4 4 
     test -z "$srcdir" && srcdir=.
    5 5
    6 6 
     ORIGDIR=`pwd`
    7 
    -cd $srcdir
    7 
    +cd "$srcdir"
    8 8
    9 9 
     autoreconf -v --install || exit 1
    10 
    -cd $ORIGDIR || exit $?
    10 
    +cd "$ORIGDIR" || exit $?
    11 
    +
    12 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    13 
    +    git config --local format.subjectPrefix "PATCH libfontenc"
    11 14
    12 15 
     if test -z "$NOCONFIGURE"; then
    13 
    -    $srcdir/configure "$@"
    16 
    +    exec "$srcdir"/configure "$@"
    14 17 
     fi

  • configure.ac
    ... ... @@ -21,8 +21,8 @@
    21 21
    22 22 
     # Initialize Autoconf
    23 23 
     AC_PREREQ([2.60])
    24 
    -AC_INIT([libfontenc], [1.1.3],
    25 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libfontenc])
    24 
    +AC_INIT([libfontenc], [1.1.4],
    25 
    +        [https://gitlab.freedesktop.org/xorg/lib/libfontenc/issues], [libfontenc])
    26 26 
     AC_CONFIG_SRCDIR([Makefile.am])
    27 27 
     AC_CONFIG_HEADERS([config.h])
    28 28

  • debian/README.source
    ... ... @@ -19,9 +19,9 @@ Guide To The X Strike Force Packages
    19 19 
     ------------------------------------
    20 20
    21 21 
     The X Strike Force team maintains X packages in git repositories on
    22 
    -git.debian.org in the pkg-xorg subdirectory. Most upstream packages
    22 
    +salsa.debian.org in the xorg-team group. Most upstream packages
    23 23 
     are actually maintained in git repositories as well, so they often
    24 
    -just need to be pulled into git.debian.org in a "upstream-*" branch.
    24 
    +just need to be pulled into salsa.debian.org in a "upstream-*" branch.
    25 25 
     Otherwise, the upstream sources are manually installed in the Debian
    26 26 
     git repository.
    27 27
    ... ... @@ -47,27 +47,3 @@ are involved:
    47 47 
       case, it appears directly in the .diff.gz.
    48 48 
     * Otherwise, the patch is added to debian/patches/ which is managed
    49 49 
       with quilt as documented in /usr/share/doc/quilt/README.source.
    50 
    -
    51 
    -quilt is actually invoked by the Debian X packaging through a larger
    52 
    -set of scripts called XSFBS. XSFBS brings some other X specific
    53 
    -features such as managing dependencies and conflicts due to the video
    54 
    -and input driver ABIs.
    55 
    -XSFBS itself is maintained in a separate repository at
    56 
    -  git://git.debian.org/pkg-xorg/xsfbs.git
    57 
    -and it is pulled inside the other Debian X repositories when needed.
    58 
    -
    59 
    -The XSFBS patching system requires a build dependency on quilt. Also
    60 
    -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
    61 
    -so that the XSFBS patching occurs before the actual build. So the
    62 
    -very first target of the build (likely the one running autoreconf)
    63 
    -should depend on $(STAMP_DIR)/patch. It should also not depend on
    64 
    -anything so that parallel builds are correctly supported (nothing
    65 
    -should probably run while patching is being done). And finally, the
    66 
    -clean target should depend on the xsfclean target so that patches
    67 
    -are unapplied on clean.
    68 
    -
    69 
    -When the upstream sources contain some DFSG-nonfree files, they are
    70 
    -listed in text files in debian/prune/ in the "debian-*" branch of
    71 
    -the Debian repository. XSFBS' scripts then take care of removing
    72 
    -these listed files during the build so as to generate a modified
    73 
    -DFSG-free .orig.tar.gz tarball.

  • debian/changelog
    1 
    +libfontenc (1:1.1.4-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +  * control: Migrate to x11proto-dev.
    5 
    +  * Switch to -dbgsym package.
    6 
    +  * Bump debhelper to 12.
    7 
    +  * Update README.source.
    8 
    +  * control: Bump policy to 4.5.0.
    9 
    +  * Update upstream and VCS urls.
    10 
    +
    11 
    + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 24 Sep 2020 11:50:28 +0300
    12 
    +
    1 13 
     libfontenc (1:1.1.3-1) unstable; urgency=medium
    2 14
    3 15 
       * Remove Cyril from Uploaders.

  • debian/compat deleted
    1 
    -9

  • debian/control
    ... ... @@ -3,20 +3,15 @@ Section: x11
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Build-Depends:
    6 
    - x11proto-core-dev (>= 6.8.99.15+cvs.20050722),
    6 
    + x11proto-dev,
    7 7 
      zlib1g-dev,
    8 8 
      pkg-config,
    9 
    - automake,
    10 
    - libtool,
    11 9 
      xutils-dev (>= 1:7.5~1),
    12 10 
      xfonts-utils (>= 1:7.5+1),
    13 
    -# DEB_HOST_MULTIARCH, dpkg-buildflags --export=configure
    14 
    - dpkg-dev (>= 1.16.1),
    15 
    - debhelper (>= 9),
    16 
    - dh-autoreconf,
    17 
    -Standards-Version: 3.9.3
    18 
    -Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libfontenc
    19 
    -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libfontenc.git
    11 
    + debhelper-compat (= 12),
    12 
    +Standards-Version: 4.5.0
    13 
    +Vcs-Git: https://salsa.debian.org/xorg-team/lib/libfontenc.git
    14 
    +Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libfontenc
    20 15
    21 16 
     Package: libfontenc1
    22 17 
     Section: libs
    ... ... @@ -47,30 +42,6 @@ Depends:
    47 42 
     Description: X11 font encoding library
    48 43 
      This is a udeb, or a microdeb, for the debian-installer.
    49 44
    50 
    -Package: libfontenc1-dbg
    51 
    -Section: debug
    52 
    -Architecture: any
    53 
    -Priority: extra
    54 
    -Multi-Arch: same
    55 
    -Pre-Depends:
    56 
    - ${misc:Pre-Depends},
    57 
    -Depends:
    58 
    - ${shlibs:Depends},
    59 
    - ${misc:Depends},
    60 
    - libfontenc1 (= ${binary:Version}),
    61 
    -Description: X11 font encoding library (debug package)
    62 
    - libfontenc is a library which helps font libraries portably determine
    63 
    - and deal with different encodings of fonts.
    64 
    - .
    65 
    - This package contains the debug versions of the library found in libfontenc1.
    66 
    - Non-developers likely have little use for this package.
    67 
    - .
    68 
    - More information about X.Org can be found at:
    69 
    - <URL:http://www.X.org>
    70 
    - .
    71 
    - This module can be found at
    72 
    - git://anongit.freedesktop.org/git/xorg/lib/libfontenc
    73 
    -
    74 45 
     Package: libfontenc-dev
    75 46 
     Section: libdevel
    76 47 
     Architecture: any

  • debian/rules
    ... ... @@ -11,7 +11,7 @@
    11 11 
     PACKAGE = libfontenc1
    12 12
    13 13 
     %:
    14 
    -	dh $@ --with autoreconf --parallel -Bbuild
    14 
    +	dh $@ -Bbuild
    15 15
    16 16 
     override_dh_auto_configure:
    17 17 
     	dh_auto_configure -- \
    ... ... @@ -19,10 +19,14 @@ override_dh_auto_configure:
    19 19 
     		     --disable-silent-rules
    20 20
    21 21 
     override_dh_install:
    22 
    -	dh_install --sourcedir=debian/tmp --fail-missing -Xlibfontenc.la
    22 
    +	find debian/tmp -name '*.la' -delete
    23 
    +	dh_install --sourcedir=debian/tmp
    24 
    +
    25 
    +override_dh_missing:
    26 
    +	dh_missing --fail-missing
    23 27
    24 28 
     override_dh_strip:
    25 
    -	dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
    29 
    +	dh_strip -p$(PACKAGE) --dbgsym-migration='libfontenc1-dbg (<< 1:1.1.4-1)'
    26 30 
     	dh_strip -N$(PACKAGE)
    27 31
    28 32 
     override_dh_makeshlibs:

  • debian/watch
    1 
    -#git=git://anongit.freedesktop.org/xorg/lib/libfontenc
    1 
    +#git=https://gitlab.freedesktop.org/xorg/lib/libfontenc
    2 2 
     version=3
    3 3 
     opts=pgpsigurlmangle=s/$/.sig/ \
    4 4 
     http://xorg.freedesktop.org/releases/individual/lib/ libfontenc-(.*)\.tar\.gz

  • include/X11/fonts/fontenc.h
    ... ... @@ -109,7 +109,7 @@ char *FontEncName(unsigned, FontMapPtr);
    109 109
    110 110 
     /* Return a pointer to the name of the system encodings directory. */
    111 111 
     /* This string is static and should not be modified. */
    112 
    -char *FontEncDirectory(void);
    112 
    +const char *FontEncDirectory(void);
    113 113
    114 114 
     /* Identify an encoding file.  If fileName doesn't exist, or is not an
    115 115 
        encoding file, return NULL, otherwise returns a NULL-terminated

  • src/encparse.c
    ... ... @@ -827,13 +827,13 @@ parseEncodingFile(FontFilePtr f, int headerOnly)
    827 827 
         return NULL;
    828 828 
     }
    829 829
    830 
    -char *
    830 
    +const char *
    831 831 
     FontEncDirectory(void)
    832 832 
     {
    833 
    -    static char *dir = NULL;
    833 
    +    static const char *dir = NULL;
    834 834
    835 835 
         if (dir == NULL) {
    836 
    -        char *c = getenv("FONT_ENCODINGS_DIRECTORY");
    836 
    +        const char *c = getenv("FONT_ENCODINGS_DIRECTORY");
    837 837
    838 838 
             if (c) {
    839 839 
                 dir = strdup(c);
    ... ... @@ -941,7 +941,7 @@ FontEncReallyLoad(const char *charset, const char *fontFileName)
    941 941 
     {
    942 942 
         FontEncPtr encoding;
    943 943 
         char dir[MAXFONTFILENAMELEN], dirname[MAXFONTFILENAMELEN];
    944 
    -    char *d;
    944 
    +    const char *d;
    945 945
    946 946 
         if (fontFileName) {
    947 947 
             parseFontFileName(fontFileName, dirname, dir);

  • src/fontenc.c
    ... ... @@ -274,14 +274,14 @@ iso8859_7_to_unicode(unsigned isocode, void *client_data)
    274 274 
             isocode == 0xB7 || isocode == 0xBB || isocode == 0xBD)
    275 275 
             return isocode;
    276 276 
         else if (isocode == 0xA1)
    277 
    -        return 0x02BD;
    277 
    +        return 0x2018;
    278 278 
         else if (isocode == 0xA2)
    279 
    -        return 0x02BC;
    279 
    +        return 0x2019;
    280 280 
         else if (isocode == 0xAF)
    281 281 
             return 0x2015;
    282 282 
         else if (isocode == 0xD2)   /* unassigned */
    283 283 
             return 0;
    284 
    -    else if (isocode >= 0xB4)
    284 
    +    else if (isocode >= 0xB4 && isocode <= 0xFE)
    285 285 
             return isocode - 0xA0 + 0x0370;
    286 286 
         else
    287 287 
             return 0;

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: