.gitignore | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++----- ChangeLog | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 11 +++++-- configure.ac | 10 ++++--- debian/changelog | 5 ++- debian/control | 4 +- 6 files changed, 164 insertions(+), 17 deletions(-)
New commits: commit 60cc3abbcf26a05a54c999357ff958c35010af14 Author: Julien Cristau <[email protected]> Date: Tue Nov 16 17:04:55 2010 +0100 Bump xfonts-utils build-dep for font-util 1.2.0. diff --git a/debian/changelog b/debian/changelog index b5f9534..cc28167 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xfonts-scalable (1:1.0.3-1) UNRELEASED; urgency=low good reason. Thanks, Colin Watson! * New upstream release. * Bump xutils-dev build-dep for XORG_INSTALL macro. + * Bump xfonts-utils build-dep for font-util 1.2.0. -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:48:00 +0000 diff --git a/debian/control b/debian/control index df30969..2a31401 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]> Build-Depends: debhelper (>= 5.0.31), - xfonts-utils (>= 1:7.5), + xfonts-utils (>= 1:7.6~), automake, autoconf, xutils-dev (>= 1:7.5+1), commit d5639d85daef2f336d2afd4ba1dad193168fbcf7 Author: Julien Cristau <[email protected]> Date: Tue Nov 16 17:04:34 2010 +0100 Bump xutils-dev build-dep for XORG_INSTALL macro. diff --git a/debian/changelog b/debian/changelog index e8265cb..b5f9534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xfonts-scalable (1:1.0.3-1) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * New upstream release. + * Bump xutils-dev build-dep for XORG_INSTALL macro. -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:48:00 +0000 diff --git a/debian/control b/debian/control index 063974b..df30969 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: xfonts-utils (>= 1:7.5), automake, autoconf, - xutils-dev (>= 1:7.5~), + xutils-dev (>= 1:7.5+1), Standards-Version: 3.8.3 Package: xfonts-scalable commit cfe6d4605291369836797307b0b0666761f6513d Author: Julien Cristau <[email protected]> Date: Tue Nov 16 17:03:46 2010 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 97f16f8..838daaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,77 @@ +commit ed229e2119276054bb8bf6a85447952cfeb5eae3 +Author: Rémi Cardona <[email protected]> +Date: Mon Nov 15 21:53:38 2010 +0100 + + font-bitstream-type1 1.0.3 + +commit 1fc8db6b6cb07c2fc08364fdb20aafed76842879 +Author: Gaetan Nadon <[email protected]> +Date: Fri Oct 15 20:09:55 2010 -0400 + + config: Use the shorthand --disable-all-encodings option in font-util v1.2 + + This option is useful to disable all possible font encodings at once, + without fine-graining the calling ebuilds for a list of encodings + supported by each font package. + + The option is parsed before all other encoding options, so it basically + sets defaults for all of them. Afterwards, any encoding can be + re-enabled back using '--enable-<encoding>' (much like + '--disable-all-encodings --enable-iso8859-2'). + + Reviewed-by: Rémi Cardona <[email protected]> + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 64666ca4d2c90e953525471cc844911b0d346325 +Author: Alan Coopersmith <[email protected]> +Date: Mon Oct 4 23:58:03 2010 -0700 + + font-bitstream-type1 1.0.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6638132a0b682156a334273b740088cc2be7f8a4 +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 23 14:23:51 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 0c3e88a00033d75bab8bd8453fb99348dfc07fc6 +Author: Gaetan Nadon <[email protected]> +Date: Sun Oct 18 20:49:07 2009 -0400 + + Makefile.am: add INSTALL target and clean ChangeLog DIST targets + + Add INSTALL target to generate file with INSTALL_CMD #24206 + ChangeLog is not required in EXTRA_DIST #24432 + ChangeLog is not required in MAINTAINERCLEANFILES #24432 + +commit eccb024d1e692cf70e075c5a55cd0b4a8607b34f +Author: Gaetan Nadon <[email protected]> +Date: Sun Oct 18 20:34:34 2009 -0400 + + INSTALL, NEWS, README COPYING or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + COPYING may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 5faa0bdff6a0318a034f7f846dd2b2464ad24b07 +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 23 13:38:51 2009 -0500 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit 442d80e6990cfb4d0c4cbc8673bc62d63cc35458 Author: Alan Coopersmith <[email protected]> Date: Sat Oct 10 17:33:43 2009 -0700 diff --git a/debian/changelog b/debian/changelog index 60be6a5..e8265cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -xfonts-scalable (1:1.0.1-2) UNRELEASED; urgency=low +xfonts-scalable (1:1.0.3-1) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * New upstream release. -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:48:00 +0000 commit ed229e2119276054bb8bf6a85447952cfeb5eae3 Author: Rémi Cardona <[email protected]> Date: Mon Nov 15 21:53:38 2010 +0100 font-bitstream-type1 1.0.3 diff --git a/configure.ac b/configure.ac index e64903b..ed7d144 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([font-bitstream-type1], [1.0.2], +AC_INIT([font-bitstream-type1], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [font-bitstream-type1]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit 1fc8db6b6cb07c2fc08364fdb20aafed76842879 Author: Gaetan Nadon <[email protected]> Date: Fri Oct 15 20:09:55 2010 -0400 config: Use the shorthand --disable-all-encodings option in font-util v1.2 This option is useful to disable all possible font encodings at once, without fine-graining the calling ebuilds for a list of encodings supported by each font package. The option is parsed before all other encoding options, so it basically sets defaults for all of them. Afterwards, any encoding can be re-enabled back using '--enable-<encoding>' (much like '--disable-all-encodings --enable-iso8859-2'). Reviewed-by: Rémi Cardona <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 11fbf51..e64903b 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ XORG_DEFAULT_OPTIONS AC_PROG_INSTALL -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 or later m4_ifndef([XORG_FONT_MACROS_VERSION], - [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.1) + [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.2) XORG_FONTDIR([Type1]) XORG_FONT_SCALED_UTILS commit 64666ca4d2c90e953525471cc844911b0d346325 Author: Alan Coopersmith <[email protected]> Date: Mon Oct 4 23:58:03 2010 -0700 font-bitstream-type1 1.0.2 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 0c40b78..11fbf51 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bitstream-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-type1) +AC_INIT([font-bitstream-type1], [1.0.2], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [font-bitstream-type1]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 6638132a0b682156a334273b740088cc2be7f8a4 Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 14:23:51 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 2e84c57..ceba94b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,8 @@ font_DATA = $(FONT_FILES) EXTRA_DIST = $(FONT_FILES) Copyright +MAINTAINERCLEANFILES = ChangeLog INSTALL + install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) commit 0c3e88a00033d75bab8bd8453fb99348dfc07fc6 Author: Gaetan Nadon <[email protected]> Date: Sun Oct 18 20:49:07 2009 -0400 Makefile.am: add INSTALL target and clean ChangeLog DIST targets Add INSTALL target to generate file with INSTALL_CMD #24206 ChangeLog is not required in EXTRA_DIST #24432 ChangeLog is not required in MAINTAINERCLEANFILES #24432 diff --git a/Makefile.am b/Makefile.am index fd903fe..2e84c57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,12 +52,13 @@ install-data-hook: distuninstallcheck: @: -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL commit eccb024d1e692cf70e075c5a55cd0b4a8607b34f Author: Gaetan Nadon <[email protected]> Date: Sun Oct 18 20:34:34 2009 -0400 INSTALL, NEWS, README COPYING or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated COPYING may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 commit 5faa0bdff6a0318a034f7f846dd2b2464ad24b07 Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 13:38:51 2009 -0500 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/.gitignore b/.gitignore index 7f1c40e..031076c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,78 @@ -Makefile -Makefile.in +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno +config.sub configure +configure.scan +depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -font-bitstream-type1-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for bitstream-type1 +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
