Merge from sid [dgit]

3 files changed, 0 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 4fc313b..8a314a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 ipp-usb
 tags
 *.swp
-
-.pc
diff --git a/debian/patches/auto-gitignore b/debian/patches/auto-gitignore
deleted file mode 100644
index f1e6939..0000000
--- a/debian/patches/auto-gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Update .gitignore from Debian packaging branch
-
-The Debian packaging git branch contains these updates to the upstream
-.gitignore file(s).  This patch is autogenerated, to provide these
-updates to users of the official Debian archive view of the package.
-
-[dgit (9.11) update-gitignore]
----
-diff --git a/.gitignore b/.gitignore
-index 8a314a7..4fc313b 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,3 +1,5 @@
- ipp-usb
- tags
- *.swp
-+
-+.pc
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a22980a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-
-auto-gitignore