Makefile.in | 9 +++--
aclocal.m4 | 29 ++++++++++++++++
configure | 42 +++++++++++++++++++++++
debian/changelog | 8 +++-
debian/patches/02_am_maintainer_mode.diff | 13 +++++++
debian/patches/series | 1
debian/watch | 2 +
debian/xfonts-encodings.install | 53 ------------------------------
large/Makefile.in | 9 +++--
9 files changed, 105 insertions(+), 61 deletions(-)
New commits:
commit 9a256c5b9923b7e167d45091245dff182a67b429
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 31 14:05:36 2007 +0200
Fix debian/xfonts-encodings.install
Don't list every file individually, but just
'usr/share/fonts/X11/encodings',
which matches everything.
diff --git a/debian/changelog b/debian/changelog
index fc9d32b..c6b1f0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xfonts-encodings (1:1.0.2-1) unstable; urgency=low
* New upstream release.
* Add watch file.
* Use AM_MAINTAINER_MODE (closes: #424114).
+ * Don't list all files in debian/xfonts-encodings.install, since we install
+ everything in usr/share/fonts/X11/encodings.
- -- Julien Cristau <[EMAIL PROTECTED]> Thu, 31 May 2007 13:54:13 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 31 May 2007 14:03:17 +0200
xfonts-encodings (1:1.0.0-6) unstable; urgency=low
diff --git a/debian/xfonts-encodings.install b/debian/xfonts-encodings.install
index e07e105..91d502a 100644
--- a/debian/xfonts-encodings.install
+++ b/debian/xfonts-encodings.install
@@ -1,53 +1,2 @@
-usr/share/fonts/X11/encodings/large/big5.eten-0.enc.gz
-usr/share/fonts/X11/encodings/large/big5hkscs-0.enc.gz
-usr/share/fonts/X11/encodings/large/cns11643-1.enc.gz
-usr/share/fonts/X11/encodings/large/cns11643-2.enc.gz
-usr/share/fonts/X11/encodings/large/cns11643-3.enc.gz
-usr/share/fonts/X11/encodings/large/gb18030-0.enc.gz
-usr/share/fonts/X11/encodings/large/gb18030.2000-0.enc.gz
-usr/share/fonts/X11/encodings/large/gb18030.2000-1.enc.gz
-usr/share/fonts/X11/encodings/large/gb2312.1980-0.enc.gz
-usr/share/fonts/X11/encodings/large/gbk-0.enc.gz
-usr/share/fonts/X11/encodings/large/jisx0201.1976-0.enc.gz
-usr/share/fonts/X11/encodings/large/jisx0208.1990-0.enc.gz
-usr/share/fonts/X11/encodings/large/jisx0212.1990-0.enc.gz
-usr/share/fonts/X11/encodings/large/ksc5601.1987-0.enc.gz
-usr/share/fonts/X11/encodings/large/ksc5601.1992-3.enc.gz
-usr/share/fonts/X11/encodings/large/sun.unicode.india-0.enc.gz
-usr/share/fonts/X11/encodings/large/encodings.dir
-usr/share/fonts/X11/encodings/adobe-dingbats.enc.gz
-usr/share/fonts/X11/encodings/adobe-standard.enc.gz
-usr/share/fonts/X11/encodings/adobe-symbol.enc.gz
-usr/share/fonts/X11/encodings/ansi-1251.enc.gz
-usr/share/fonts/X11/encodings/armscii-8.enc.gz
-usr/share/fonts/X11/encodings/ascii-0.enc.gz
-usr/share/fonts/X11/encodings/dec-special.enc.gz
-usr/share/fonts/X11/encodings/ibm-cp437.enc.gz
-usr/share/fonts/X11/encodings/ibm-cp850.enc.gz
-usr/share/fonts/X11/encodings/ibm-cp852.enc.gz
-usr/share/fonts/X11/encodings/ibm-cp866.enc.gz
-usr/share/fonts/X11/encodings/iso8859-11.enc.gz
-usr/share/fonts/X11/encodings/iso8859-13.enc.gz
-usr/share/fonts/X11/encodings/iso8859-16.enc.gz
-usr/share/fonts/X11/encodings/iso8859-6.16.enc.gz
-usr/share/fonts/X11/encodings/iso8859-6.8x.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1250.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1251.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1252.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1253.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1254.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1255.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1256.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1257.enc.gz
-usr/share/fonts/X11/encodings/microsoft-cp1258.enc.gz
-usr/share/fonts/X11/encodings/microsoft-win3.1.enc.gz
-usr/share/fonts/X11/encodings/mulearabic-0.enc.gz
-usr/share/fonts/X11/encodings/mulearabic-1.enc.gz
-usr/share/fonts/X11/encodings/mulearabic-2.enc.gz
-usr/share/fonts/X11/encodings/mulelao-1.enc.gz
-usr/share/fonts/X11/encodings/suneu-greek.enc.gz
-usr/share/fonts/X11/encodings/tcvn-0.enc.gz
-usr/share/fonts/X11/encodings/tis620-2.enc.gz
-usr/share/fonts/X11/encodings/viscii1.1-1.enc.gz
-usr/share/fonts/X11/encodings/encodings.dir
+usr/share/fonts/X11/encodings
usr/share/lintian/overrides/xfonts-encodings
commit 03f43bcc610097e4afad1ca97082432d0443aab1
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 31 13:58:22 2007 +0200
Add patch to use AM_MAINTAINER_MODE.
This makes sure that autotools don't get run at build time.
diff --git a/Makefile.in b/Makefile.in
index a4a51c2..8212e25 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,6 +102,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MKFONTSCALE = @MKFONTSCALE@
PACKAGE = @PACKAGE@
@@ -196,7 +199,7 @@ all: all-recursive
.SUFFIXES: .enc .enc.gz
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -223,9 +226,9 @@ Makefile: $(srcdir)/Makefile.in
$(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
uninstall-info-am:
install-encodingsDATA: $(encodings_DATA)
diff --git a/aclocal.m4 b/aclocal.m4
index 77e8743..06d85e9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -327,6 +327,35 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
diff --git a/configure b/configure
index 3c02486..99e6823 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,9 @@ am__leading_dot
AMTAR
am__tar
am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
MKFONTSCALE
GZIP_SMALL_TRUE
GZIP_SMALL_FALSE
@@ -1224,6 +1227,8 @@ if test -n "$ac_init_help"; then
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--disable-gzip-small-encodings
Disable compression of small encoding files
--disable-gzip-large-encodings
@@ -2129,6 +2134,31 @@ am__tar='${AMTAR} chof - "$$tardir"';
am__untar='${AMTAR} xf -'
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific
portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of
Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi
+
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
# mkfontscale
@@ -2446,6 +2476,13 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}";
then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${GZIP_SMALL_TRUE}" && test -z "${GZIP_SMALL_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"GZIP_SMALL\" was never
defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -3022,6 +3059,9 @@ am__leading_dot!$am__leading_dot$ac_delim
AMTAR!$AMTAR$ac_delim
am__tar!$am__tar$ac_delim
am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
MKFONTSCALE!$MKFONTSCALE$ac_delim
GZIP_SMALL_TRUE!$GZIP_SMALL_TRUE$ac_delim
GZIP_SMALL_FALSE!$GZIP_SMALL_FALSE$ac_delim
@@ -3033,7 +3073,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/debian/changelog b/debian/changelog
index 447899b..fc9d32b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xfonts-encodings (1:1.0.2-1) UNRELEASED; urgency=low
+xfonts-encodings (1:1.0.2-1) unstable; urgency=low
* New upstream release.
+ * Add watch file.
+ * Use AM_MAINTAINER_MODE (closes: #424114).
- -- Julien Cristau <[EMAIL PROTECTED]> Thu, 31 May 2007 05:07:51 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 31 May 2007 13:54:13 +0200
xfonts-encodings (1:1.0.0-6) unstable; urgency=low
diff --git a/debian/patches/02_am_maintainer_mode.diff
b/debian/patches/02_am_maintainer_mode.diff
new file mode 100644
index 0000000..b04cfdc
--- /dev/null
+++ b/debian/patches/02_am_maintainer_mode.diff
@@ -0,0 +1,13 @@
+Index: xfonts-encodings/configure.ac
+===================================================================
+--- xfonts-encodings.orig/configure.ac 2007-05-31 13:51:34.000000000 +0200
++++ xfonts-encodings/configure.ac 2007-05-31 13:51:43.000000000 +0200
+@@ -2,6 +2,8 @@
+ AC_INIT([encodings], [1.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+
++AM_MAINTAINER_MODE
++
+ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING],
m4_defn([AC_HELP_STRING]))])
+
+ # mkfontscale
diff --git a/debian/patches/series b/debian/patches/series
index ef9c400..0fce4b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_encodings_dir_absolute_paths.diff
+02_am_maintainer_mode.diff
diff --git a/large/Makefile.in b/large/Makefile.in
index c264172..200eec3 100644
--- a/large/Makefile.in
+++ b/large/Makefile.in
@@ -79,6 +79,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MKFONTSCALE = @MKFONTSCALE@
PACKAGE = @PACKAGE@
@@ -152,7 +155,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .enc .enc.gz
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -177,9 +180,9 @@ Makefile: $(srcdir)/Makefile.in
$(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-encodingsDATA: $(encodings_DATA)
commit 3fa28ac5066b88c07cd3153c3e3e0c8f5f9d8160
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 31 13:55:30 2007 +0200
Add watch file.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..c9656fa
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/font/ encodings-(.*)\.tar\.gz
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
