remove -ldl from cdrom and -lutil from apt-get linkage

Building src:apt shows:
dpkg-shlibdeps: warning: package could avoid a useless dependency if
debian/apt/usr/lib/apt/methods/cdrom was not linked against libdl.so.2
(it uses none of the library's symbols)
dpkg-shlibdeps: warning: package could avoid a useless dependency if
debian/apt/usr/bin/apt-get was not linked against libutil.so.1 (it uses
none of the library's symbols)

diff --git a/cmdline/makefile b/cmdline/makefile
index f3712232af9e2ce3671b68983559715813305871..460a7124004f9a4b2b81dd315f552c5b9e299bba 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -14,7 +14,7 @@ include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 
 # The apt-get program
 PROGRAM=apt-get

-SLIBS = -lapt-pkg -lutil $(INTLLIBS)
+SLIBS = -lapt-pkg $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)

diff --git a/debian/changelog b/debian/changelog
index 1a8604e099a27b6a45f1a2e71b7dc2776b23e2c6..662289fba7e8008aab1d635c842627234569f758 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low
 
   [ David Kalnischkies ]
   * build the en manpages in subdirectory doc/en
 
   [ David Kalnischkies ]
   * build the en manpages in subdirectory doc/en

+  * remove -ldl from cdrom and -lutil from apt-get linkage

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 09 Jun 2013 15:06:24 +0200
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 09 Jun 2013 15:06:24 +0200
 


@@ -24,7 +25,6 @@ apt (0.9.8.2) unstable; urgency=low
   * Fix crash when the "mirror" method does not find any entry
     (closes: #699303)
 
   * Fix crash when the "mirror" method does not find any entry
     (closes: #699303)
 

-

   [ Johan Kiviniemi ]
   * cmdline/apt-key:
     - Create new keyrings with mode 0644 instead of 0600.
   [ Johan Kiviniemi ]
   * cmdline/apt-key:
     - Create new keyrings with mode 0644 instead of 0600.

diff --git a/methods/makefile b/methods/makefile
index a271aff5e0ac220273e4e786843e0f6b3b2d7031..294c55d235aaec9527f65251af21e9b0ffa08821 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -39,7 +39,7 @@ include $(PROGRAM_H)
 
 # The cdrom method
 PROGRAM=cdrom
 
 # The cdrom method
 PROGRAM=cdrom

-SLIBS = -lapt-pkg -ldl $(INTLLIBS)
+SLIBS = -lapt-pkg $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)