diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-25 14:41:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-25 14:50:39 +0200 |
| commit | 6c50447eb443768764f83b3ba86ef32780ba6dde (patch) | |
| tree | 7ac40ab4ee01f42b2e120042aafbf7c32d01a61c | |
| parent | 506ab3c78fb67f5e452a1748f4870af767de5ebb (diff) | |
reduce delta from ubuntu
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 1 | ||||
| -rw-r--r-- | debian/apt.conf.autoremove | 2 | ||||
| -rw-r--r-- | debian/apt.install.in | 2 | ||||
| -rw-r--r-- | ftparchive/override.cc | 4 |
5 files changed, 7 insertions, 4 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c3e7e1d1d..c52b83c6e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1617,7 +1617,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) string::size_type pos; FILE *report; - if (_config->FindB("Dpkg::ApportFailureReport", false) == false) + if (_config->FindB("Dpkg::ApportFailureReport", true) == false) { std::clog << "configured to not write apport reports" << std::endl; return; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 3a35f852e..241628632 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -86,6 +86,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$"); // Default cdrom mount point Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/"); diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index cf69d56c3..fc02350ae 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -22,6 +22,8 @@ APT ".*-modules"; ".*-kernel"; "linux-backports-modules-.*"; + # tools + "linux-tools"; }; Never-MarkAuto-Sections diff --git a/debian/apt.install.in b/debian/apt.install.in index 4ffe43e3b..9c9489572 100644 --- a/debian/apt.install.in +++ b/debian/apt.install.in @@ -3,4 +3,4 @@ bin/apt-* usr/bin/ bin/methods/* usr/lib/apt/methods/ scripts/dselect/* usr/lib/dpkg/methods/apt/ usr/share/locale/*/*/apt.mo -bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/
\ No newline at end of file +bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ftparchive/override.cc b/ftparchive/override.cc index b4cd49b6c..8a0c5bab1 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -37,7 +37,7 @@ bool Override::ReadOverride(string const &File,bool const &Source) if (F == 0) return _error->Errno("fopen",_("Unable to open %s"),File.c_str()); - char Line[500]; + char Line[1000]; unsigned long long Counter = 0; while (fgets(Line,sizeof(Line),F) != 0) { @@ -141,7 +141,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/) if (F == 0) return _error->Errno("fopen",_("Unable to open %s"),File.c_str()); - char Line[500]; + char Line[1000]; unsigned long long Counter = 0; while (fgets(Line,sizeof(Line),F) != 0) { |