From c46f94aa48a9707668c46118b3eec77ff318b78c Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 12 Jul 2017 13:42:18 +0200
Subject: Drop cacheiterators.h include

Including cacheiterators.h before pkgcache.h fails because
pkgcache.h depends on cacheiterators.h.
---
 apt-pkg/clean.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'apt-pkg/clean.cc')

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 9f408e46e..9fa0fb4e8 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 #include <string.h>
-- 
cgit v1.2.3


From 87274d0f22e1dfd99b2e5200e2fe75c1b804eac3 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 12 Jul 2017 13:40:41 +0200
Subject: Reformat and sort all includes with clang-format

This makes it easier to see which headers includes what.

The changes were done by running

    git grep -l '#\s*include'  \
        | grep -E '.(cc|h)$' \
        | xargs sed -i -E 's/(^\s*)#(\s*)include/\1#\2 include/'

To modify all include lines by adding a space, and then running
./git-clang-format.sh.
---
 apt-pkg/clean.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'apt-pkg/clean.cc')

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 9fa0fb4e8..e9bf73b6c 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -8,23 +8,23 @@
    ##################################################################### */
 									/*}}}*/
 // Includes								/*{{{*/
-#include<config.h>
+#include <config.h>
 
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/clean.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/strutl.h>
 
 #include <string>
-#include <string.h>
 #include <dirent.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <apti18n.h>
 									/*}}}*/
-- 
cgit v1.2.3