From: Raphael Hertzog <hertzog@debian.org>
Date: Mon, 24 Sep 2007 18:54:54 +0000 (+0200)
Subject: Merge branch 'master' into dpkg-shlibdeps-buxy
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca270df7beb27b4ee72a7e54aad7dd9268a5749;p=dpkg

Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

	scripts/Makefile.am
---

dca270df7beb27b4ee72a7e54aad7dd9268a5749
diff --cc scripts/Makefile.am
index d5e54b24,87ea0603..9a338fc1
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -57,12 -55,8 +57,13 @@@ CLEANFILES = 
  
  perllibdir = $(PERL_LIBDIR)
  nobase_dist_perllib_DATA = \
 +	Dpkg/Shlibs.pm \
 +	Dpkg/Shlibs/Objdump.pm \
 +	Dpkg/Shlibs/SymbolFile.pm \
 +	Dpkg/ErrorHandling.pm \
+ 	Dpkg/BuildOptions.pm \
  	Dpkg/Gettext.pm \
 +	Dpkg/Version.pm \
  	Dpkg.pm
  
  dist_pkglib_SCRIPTS = \