Merge ~racb/git-ubuntu:disable-overrides into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:a5071ba115808859bed4651494bb3ea66bfa42b2
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/540/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/540//rebuild

review: Approve (continuous-integration)

[Robie Basak (racb)]

Self-approving: these are override changes only. No code changes.

review: Approve

diff --git a/gitubuntu/parent_overrides.txt b/gitubuntu/parent_overrides.txt
index 6045bfc..04d0ab4 100644
--- a/gitubuntu/parent_overrides.txt
+++ b/gitubuntu/parent_overrides.txt
@@ -1,4 +1 @@
 # pkgname child-version changelog-parent-version
-clamav 0.91.2-3ubuntu2.1~feisty1 0.91.2-3ubuntu2.1
-memcached 1.1.12-1 -
-golang-golang-x-net-dev 1:0.0+git20150817.66f0418-1 0.0+git20150226.3d87fd6-3
diff --git a/gitubuntu/patch_overrides.txt b/gitubuntu/patch_overrides.txt
 deleted file mode 100644
index 2d8997b..0000000
--- a/gitubuntu/patch_overrides.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<distribution>/<pkgname> <inclusive start version> <exclusive end version> <path to patch>
-ubuntu/apt 0.7.19ubuntu1 0.7.25.3ubuntu2 patch_overrides/apt_changelog.patch
-debian/at - 3.1.11-1 patch_overrides/at_changelog.patch
-ubuntu/at - 3.1.11-1 patch_overrides/at_changelog.patch
-ubuntu/cloud-utils 0.5-0ubuntu1 0.6-0ubuntu1 patch_overrides/cloud-utils_changelog.patch
diff --git a/gitubuntu/patch_overrides/apt_changelog.patch b/gitubuntu/patch_overrides/apt_changelog.patch
 deleted file mode 100644
index 70777d1..0000000
--- a/gitubuntu/patch_overrides/apt_changelog.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/debian/changelog b/debian/changelog
-index acc413b..d439f50 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -387,19 +387,6 @@ apt (0.7.14ubuntu2) intrepid; urgency=low
- 
-  -- Michael Vogt <[e-mail]>  Fri, 09 May 2008 13:50:22 +0200
- 
--apt (0.7.14ubuntu1) intrepid; urgency=low
--
--  [ Michael Vogt ]
--  * enable installation of recommends by default
--  * debian/apt.conf.ubuntu:
--    - remove APT::Install-Recommends-Sections (no longer needed)
--  * merged from debian/sid, remaining changes:
--    - authentication-reliable branch (to be merged into debian soon)
--    - mirror:// uri branch (breaks ABI in debian, not merged yet)
--    - apport failure reporting
--    - show warning on apt-get source with 'Vcs-' header
--    - proxy detection from gconf in apt.cron
--  
- apt (0.7.14) unstable; urgency=low
- 
-   [ Christian Perrier ]
diff --git a/gitubuntu/patch_overrides/at_changelog.patch b/gitubuntu/patch_overrides/at_changelog.patch
 deleted file mode 100644
index 9d731d4..0000000
--- a/gitubuntu/patch_overrides/at_changelog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru at-3.1.10.2/debian/changelog at-3.1.11/debian/changelog
---- at-3.1.10.2/debian/changelog	2008-09-23 02:11:28.000000000 -0700
-+++ at-3.1.11/debian/changelog	2016-09-19 12:24:35.000000000 -0700
-@@ -134,6 +193,8 @@
- 
-  -- Siggy Brentrup <[e-mail]>  Mon,  3 Apr 2000 13:56:47 +0200
- 
-+Old Changelog:
-+
- at (3.1.8-9) frozen unstable; urgency=low, closes=53715 56047 56607 55560 55514
- 
-   * Added SIGCHLD handler to release zombies (closes 53715 56047 56607)
diff --git a/gitubuntu/patch_overrides/cloud-utils_changelog.patch b/gitubuntu/patch_overrides/cloud-utils_changelog.patch
 deleted file mode 100644
index 828bfa4..0000000
--- a/gitubuntu/patch_overrides/cloud-utils_changelog.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/changelog b/debian/changelog
-index 3cbb7ef..697fd57 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -12,7 +12,7 @@ cloud-utils (0.4-0ubuntu1) lucid; urgency=low
- 
-   * Fix package versioning
- 
-- -- Dustin Kirkland < [e-mail]>   Thu, 18 Feb 2010 15:04:39 -0600
-+ -- Dustin Kirkland < [e-mail]>  Thu, 18 Feb 2010 15:04:39 -0600
- 
- cloud-utils (0.3ubuntu1) lucid; urgency=low
- 
diff --git a/gitubuntu/pull_overrides.txt b/gitubuntu/pull_overrides.txt
index 67c05e4..b264e7a 100644
--- a/gitubuntu/pull_overrides.txt
+++ b/gitubuntu/pull_overrides.txt
@@ -1,4 +1 @@
 # pkgname version dsc-url file-url...
-pcre3 2:8.35-3.2 https://launchpadlibrarian.net/192002399/pcre3_8.35-3.2.dsc https://launchpadlibrarian.net/192002401/pcre3_8.35-3.2.debian.tar.gz
-netty 1:3.1.0.CR1-1 - https://launchpadlibrarian.net/38886650/netty_3.1.0.CR1.orig.tar.gz
-ipvsadm 1:1.24-2 - https://launchpadlibrarian.net/15550377/ipvsadm_1.24.orig.tar.gz