The following commit has been merged in the master branch:
commit 16efeda6ccc227384326a059bb75f7362a5ce609
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Mon May 19 07:33:49 2008 +0300
Fix link order when using libcompat.a and libintl.a
Place them after libdpkg.a.
Based on a patch by Martin Koeppe. Closes: #481805
diff --git a/ChangeLog b/ChangeLog
index ed13abb..24219ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-19 Martin Koeppe <[EMAIL PROTECTED]>,
+ Guillem Jover <[EMAIL PROTECTED]>
+
+ * dpkg-deb/Makefile.am (dpkg_deb_LDADD): Move 'libcompat.a' and
+ '$(LIBINTL)' after 'libdpkg.a'.
+ * dpkg-split/Makefile.am (dpkg_split_LDADD): Likewise.
+ * dselect/Makefile.am (dselect_LDADD): Likewise.
+ * /src/Makefile.am (dpkg_LDADD): Likewise.
+ (dpkg_query_LDADD): Likewise.
+ (dpkg_trigger_LDADD): Likewise.
+
2008-05-19 Guillem Jover <[EMAIL PROTECTED]>
* scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add
diff --git a/THANKS b/THANKS
index f54f865..d203253 100644
--- a/THANKS
+++ b/THANKS
@@ -108,6 +108,7 @@ Marcel Toele <[EMAIL PROTECTED]>
Marco d'Itri <[EMAIL PROTECTED]>
Marcus Brinkmann <[EMAIL PROTECTED]>
Mark Rosenstand <[EMAIL PROTECTED]>
+Martin Koeppe <[EMAIL PROTECTED]>
Masato Taruishi <[EMAIL PROTECTED]>
Mathias Weidner <[EMAIL PROTECTED]>
Matt Kraai <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index a3744cd..c288900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Mark and coalesce similar strings for translation.
* Add '.be' to the default dpkg-source -i regex. Closes: #481716
Based on a patch by Ben Finney.
+ * Fix link order when using libcompat.a and libintl.a by placing them after
+ libdpkg.a. Based on a patch by Martin Koeppe. Closes: #481805
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am
index d433cb4..e948c43 100644
--- a/dpkg-deb/Makefile.am
+++ b/dpkg-deb/Makefile.am
@@ -17,5 +17,10 @@ dpkg_deb_SOURCES = \
main.c
dpkg_deb_LDADD = \
+ ../lib/libdpkg.a \
../libcompat/libcompat.a \
- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+ $(LIBINTL) \
+ $(ZLIB_LIBS) \
+ $(BZ2_LIBS) \
+ $(SELINUX_LIBS)
+
diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am
index 7d85d15..e596351 100644
--- a/dpkg-split/Makefile.am
+++ b/dpkg-split/Makefile.am
@@ -19,9 +19,9 @@ dpkg_split_SOURCES = \
split.c
dpkg_split_LDADD = \
+ ../lib/libdpkg.a \
../libcompat/libcompat.a \
- $(LIBINTL) \
- ../lib/libdpkg.a
+ $(LIBINTL)
pkglib_SCRIPTS = mksplit
diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index f4a97ad..c0bb6bc 100644
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -35,10 +35,10 @@ dselect_SOURCES = \
pkgtop.cc
dselect_LDADD = \
- ../libcompat/libcompat.a \
- $(LIBINTL) \
$(CURSES_LIBS) \
- ../lib/libdpkg.a
+ ../lib/libdpkg.a \
+ ../libcompat/libcompat.a \
+ $(LIBINTL)
EXTRA_DIST = keyoverride mkcurkeys.pl
diff --git a/src/Makefile.am b/src/Makefile.am
index a1377e7..25c3757 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,8 +28,12 @@ dpkg_SOURCES = \
update.c
dpkg_LDADD = \
+ ../lib/libdpkg.a \
../libcompat/libcompat.a \
- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+ $(LIBINTL) \
+ $(ZLIB_LIBS) \
+ $(BZ2_LIBS) \
+ $(SELINUX_LIBS)
dpkg_query_SOURCES = \
errors.c \
@@ -37,17 +41,17 @@ dpkg_query_SOURCES = \
query.c
dpkg_query_LDADD = \
+ ../lib/libdpkg.a \
../libcompat/libcompat.a \
- $(LIBINTL) \
- ../lib/libdpkg.a
+ $(LIBINTL)
dpkg_trigger_SOURCES = \
trigcmd.c
dpkg_trigger_LDADD = \
+ ../lib/libdpkg.a \
../libcompat/libcompat.a \
- $(LIBINTL) \
- ../lib/libdpkg.a
+ $(LIBINTL)
install-data-local:
$(mkdir_p) $(DESTDIR)$(admindir)/alternatives
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
