Ubuntu dpkg 1.14.5ubuntu5
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.7
Date: Thu, 16 Aug 2007 15:41:58 +0100
Source: dpkg
Binary: dpkg dselect dpkg-dev
Architecture: source
Version: 1.14.5ubuntu5
Distribution: gutsy
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Ian Jackson <iwj@ubuntu.com>
Description:
dpkg - package maintenance system for Debian
dpkg-dev - package building tools for Debian
dselect - user tool to manage Debian packages
Changes:
dpkg (1.14.5ubuntu5) gutsy; urgency=low
.
* Rerun automake and autoconf so that it can be built if
those are not installed.
Files:
26c56ee3854c079388813463b14819d8 955 admin required dpkg_1.14.5ubuntu5.dsc
c7d5345324f7d0d7cdf4eb05cdbb330f 5732386 admin required dpkg_1.14.5ubuntu5.tar.gz
Original-Maintainer: Dpkg Developers <team@dpkg.org>
diff -pruN 1.14.5ubuntu4/configure 1.14.5ubuntu5/configure
--- 1.14.5ubuntu4/configure 2007-07-04 15:26:27.000000000 +0100
+++ 1.14.5ubuntu5/configure 2007-08-16 15:43:18.000000000 +0100
@@ -747,6 +747,9 @@ INTLLIBS
LIBINTL
LTLIBINTL
POSUB
+LEX
+LEX_OUTPUT_ROOT
+LEXLIB
WITH_DSELECT_TRUE
WITH_DSELECT_FALSE
WITH_START_STOP_DAEMON_TRUE
@@ -12070,6 +12073,211 @@ _ACEOF
+for ac_prog in flex lex
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LEX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LEX"; then
+ ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_LEX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+ { echo "$as_me:$LINENO: result: $LEX" >&5
+echo "${ECHO_T}$LEX" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+
+if test "x$LEX" != "x:"; then
+ cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { yyless (input () != 0); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+ return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ (ac_try="$LEX conftest.l"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$LEX conftest.l") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ echo "$as_me:$LINENO: checking lex output file root" >&5
+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
+if test "${ac_cv_prog_lex_root+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if test -f lex.yy.c; then
+ ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+ ac_cv_prog_lex_root=lexyy
+else
+ { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+ { echo "$as_me:$LINENO: checking lex library" >&5
+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
+if test "${ac_cv_lib_lex+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ ac_save_LIBS=$LIBS
+ ac_cv_lib_lex='none needed'
+ for ac_lib in '' -lfl -ll; do
+ LIBS="$ac_lib $ac_save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_lex=$ac_lib
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ test "$ac_cv_lib_lex" != 'none needed' && break
+ done
+ LIBS=$ac_save_LIBS
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
+ test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
+
+
+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent. Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_prog_lex_yytext_pointer=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define YYTEXT_POINTER 1
+_ACEOF
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+
# Allow compilation without dselect
# Check whether --with-dselect was given.
@@ -18601,6 +18809,9 @@ INTLLIBS!$INTLLIBS$ac_delim
LIBINTL!$LIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
+LEX!$LEX$ac_delim
+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
+LEXLIB!$LEXLIB$ac_delim
WITH_DSELECT_TRUE!$WITH_DSELECT_TRUE$ac_delim
WITH_DSELECT_FALSE!$WITH_DSELECT_FALSE$ac_delim
WITH_START_STOP_DAEMON_TRUE!$WITH_START_STOP_DAEMON_TRUE$ac_delim
@@ -18622,7 +18833,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` = 53; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -pruN 1.14.5ubuntu4/debian/changelog 1.14.5ubuntu5/debian/changelog
--- 1.14.5ubuntu4/debian/changelog 2007-08-16 00:44:05.000000000 +0100
+++ 1.14.5ubuntu5/debian/changelog 2007-08-16 15:42:05.000000000 +0100
@@ -1,3 +1,10 @@
+dpkg (1.14.5ubuntu5) gutsy; urgency=low
+
+ * Rerun automake and autoconf so that it can be built if
+ those are not installed.
+
+ -- Ian Jackson <iwj@ubuntu.com> Thu, 16 Aug 2007 15:41:58 +0100
+
dpkg (1.14.5ubuntu4) gutsy; urgency=low
* Implementation of `triggers' feature.
diff -pruN 1.14.5ubuntu4/dpkg-deb/Makefile.in 1.14.5ubuntu5/dpkg-deb/Makefile.in
--- 1.14.5ubuntu4/dpkg-deb/Makefile.in 2007-07-04 15:26:33.000000000 +0100
+++ 1.14.5ubuntu5/dpkg-deb/Makefile.in 2007-08-16 15:43:14.000000000 +0100
@@ -141,6 +141,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/dpkg-split/Makefile.in 1.14.5ubuntu5/dpkg-split/Makefile.in
--- 1.14.5ubuntu4/dpkg-split/Makefile.in 2007-07-04 15:26:33.000000000 +0100
+++ 1.14.5ubuntu5/dpkg-split/Makefile.in 2007-08-16 15:43:14.000000000 +0100
@@ -142,6 +142,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/dselect/Makefile.in 1.14.5ubuntu5/dselect/Makefile.in
--- 1.14.5ubuntu4/dselect/Makefile.in 2007-07-04 15:26:29.000000000 +0100
+++ 1.14.5ubuntu5/dselect/Makefile.in 2007-08-16 15:43:14.000000000 +0100
@@ -157,6 +157,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/dselect/methods/Makefile.in 1.14.5ubuntu5/dselect/methods/Makefile.in
--- 1.14.5ubuntu4/dselect/methods/Makefile.in 2007-07-04 15:26:29.000000000 +0100
+++ 1.14.5ubuntu5/dselect/methods/Makefile.in 2007-08-16 15:43:14.000000000 +0100
@@ -135,6 +135,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/getopt/Makefile.in 1.14.5ubuntu5/getopt/Makefile.in
--- 1.14.5ubuntu4/getopt/Makefile.in 2007-07-04 15:26:33.000000000 +0100
+++ 1.14.5ubuntu5/getopt/Makefile.in 2007-08-16 15:43:15.000000000 +0100
@@ -138,6 +138,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/lib/Makefile.in 1.14.5ubuntu5/lib/Makefile.in
--- 1.14.5ubuntu4/lib/Makefile.in 2007-07-04 15:26:32.000000000 +0100
+++ 1.14.5ubuntu5/lib/Makefile.in 2007-08-16 15:43:15.000000000 +0100
@@ -76,7 +76,8 @@ am_libdpkg_a_OBJECTS = compat.$(OBJEXT)
md5.$(OBJEXT) mlib.$(OBJEXT) myopt.$(OBJEXT) \
nfmalloc.$(OBJEXT) parse.$(OBJEXT) parsehelp.$(OBJEXT) \
showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \
- utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT)
+ triglib.$(OBJEXT) trigdeferred.$(OBJEXT) utils.$(OBJEXT) \
+ varbuf.$(OBJEXT) vercmp.$(OBJEXT)
libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -143,6 +144,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
@@ -268,6 +272,8 @@ libdpkg_a_SOURCES = \
showcright.c \
showpkg.c \
tarfn.c tarfn.h \
+ triglib.c \
+ trigdeferred.c \
utils.c \
varbuf.c \
vercmp.c
@@ -336,6 +342,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showcright.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showpkg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tarfn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigdeferred.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triglib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/varbuf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vercmp.Po@am__quote@
@@ -518,6 +526,9 @@ uninstall-am: uninstall-info-am
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-info-am
+
+trigdeferred.c: trigdeferred.l
+ $(LEX) $^
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -pruN 1.14.5ubuntu4/Makefile.in 1.14.5ubuntu5/Makefile.in
--- 1.14.5ubuntu4/Makefile.in 2007-07-04 15:26:28.000000000 +0100
+++ 1.14.5ubuntu5/Makefile.in 2007-08-16 15:43:16.000000000 +0100
@@ -158,6 +158,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/man/Makefile.in 1.14.5ubuntu5/man/Makefile.in
--- 1.14.5ubuntu4/man/Makefile.in 2007-07-04 15:26:34.000000000 +0100
+++ 1.14.5ubuntu5/man/Makefile.in 2007-08-16 15:43:15.000000000 +0100
@@ -128,6 +128,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/origins/Makefile.in 1.14.5ubuntu5/origins/Makefile.in
--- 1.14.5ubuntu4/origins/Makefile.in 2007-07-04 15:26:33.000000000 +0100
+++ 1.14.5ubuntu5/origins/Makefile.in 2007-08-16 15:43:15.000000000 +0100
@@ -131,6 +131,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/scripts/Makefile.in 1.14.5ubuntu5/scripts/Makefile.in
--- 1.14.5ubuntu4/scripts/Makefile.in 2007-07-04 15:26:28.000000000 +0100
+++ 1.14.5ubuntu5/scripts/Makefile.in 2007-08-16 15:43:15.000000000 +0100
@@ -139,6 +139,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
diff -pruN 1.14.5ubuntu4/src/Makefile.in 1.14.5ubuntu5/src/Makefile.in
--- 1.14.5ubuntu4/src/Makefile.in 2007-07-04 15:26:35.000000000 +0100
+++ 1.14.5ubuntu5/src/Makefile.in 2007-08-16 15:43:16.000000000 +0100
@@ -37,7 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = dpkg$(EXEEXT) dpkg-query$(EXEEXT)
+bin_PROGRAMS = dpkg$(EXEEXT) dpkg-query$(EXEEXT) dpkg-trigger$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -73,7 +73,8 @@ am_dpkg_OBJECTS = archives.$(OBJEXT) cle
configure.$(OBJEXT) depcon.$(OBJEXT) enquiry.$(OBJEXT) \
errors.$(OBJEXT) filesdb.$(OBJEXT) help.$(OBJEXT) \
main.$(OBJEXT) packages.$(OBJEXT) processarc.$(OBJEXT) \
- remove.$(OBJEXT) select.$(OBJEXT) update.$(OBJEXT)
+ remove.$(OBJEXT) select.$(OBJEXT) trigproc.$(OBJEXT) \
+ update.$(OBJEXT)
dpkg_OBJECTS = $(am_dpkg_OBJECTS)
am__DEPENDENCIES_1 =
dpkg_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \
@@ -83,6 +84,9 @@ am_dpkg_query_OBJECTS = errors.$(OBJEXT)
query.$(OBJEXT)
dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
+am_dpkg_trigger_OBJECTS = trigcmd.$(OBJEXT)
+dpkg_trigger_OBJECTS = $(am_dpkg_trigger_OBJECTS)
+dpkg_trigger_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -90,8 +94,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(dpkg_SOURCES) $(dpkg_query_SOURCES)
-DIST_SOURCES = $(dpkg_SOURCES) $(dpkg_query_SOURCES)
+SOURCES = $(dpkg_SOURCES) $(dpkg_query_SOURCES) \
+ $(dpkg_trigger_SOURCES)
+DIST_SOURCES = $(dpkg_SOURCES) $(dpkg_query_SOURCES) \
+ $(dpkg_trigger_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -148,6 +154,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
@@ -263,6 +272,7 @@ dpkg_SOURCES = \
processarc.c \
remove.c \
select.c \
+ trigproc.c \
update.c
dpkg_LDADD = \
@@ -274,6 +284,10 @@ dpkg_query_SOURCES = \
query.c
dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a
+dpkg_trigger_SOURCES = \
+ trigcmd.c
+
+dpkg_trigger_LDADD = $(LIBINTL) ../lib/libdpkg.a
all: all-am
.SUFFIXES:
@@ -336,6 +350,9 @@ dpkg$(EXEEXT): $(dpkg_OBJECTS) $(dpkg_DE
dpkg-query$(EXEEXT): $(dpkg_query_OBJECTS) $(dpkg_query_DEPENDENCIES)
@rm -f dpkg-query$(EXEEXT)
$(LINK) $(dpkg_query_LDFLAGS) $(dpkg_query_OBJECTS) $(dpkg_query_LDADD) $(LIBS)
+dpkg-trigger$(EXEEXT): $(dpkg_trigger_OBJECTS) $(dpkg_trigger_DEPENDENCIES)
+ @rm -f dpkg-trigger$(EXEEXT)
+ $(LINK) $(dpkg_trigger_LDFLAGS) $(dpkg_trigger_OBJECTS) $(dpkg_trigger_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -357,6 +374,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remove.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigcmd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigproc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update.Po@am__quote@
.c.o:
diff -pruN 1.14.5ubuntu4/utils/Makefile.in 1.14.5ubuntu5/utils/Makefile.in
--- 1.14.5ubuntu4/utils/Makefile.in 2007-07-04 15:26:28.000000000 +0100
+++ 1.14.5ubuntu5/utils/Makefile.in 2007-08-16 15:43:16.000000000 +0100
@@ -148,6 +148,9 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Reply to: