drop upstreamed patches

debian/changelog

@@ -4,16 +4,16 @@ freeipa (4.5.0-1) UNRELEASED; urgency=medium
     - Remove upstreamed patches: add-debian-platform.diff,
       ipa-kdb-support-dal-version-5-and-6.diff,
       purge-firefox-extension.diff, fix-ipa-otpd-install.diff,
-      fix-ipa-otpd-service.diff, purge-firefox-extension.diff
+      fix-ipa-otpd-service.diff, purge-firefox-extension.diff,
+      prefix.patch, fix-kdcproxy-path.diff, fix-is-running.diff
     - Remove obsolete patches: fix-memcached.diff,
       fix-oddjobs.diff
     - Refresh patches: fix-dnssec-services.diff,
-      fix-ipa-conf.diff, fix-replicainstall.diff, prefix.patch
+      fix-ipa-conf.diff, fix-replicainstall.diff
   * control et al: Memcached is not used anymore.
   * control, server.install: Depend on gssproxy.
   * control: Build-depend on python-jinja2, add CSR files to python-
     ipaclient.
-  * fix-xmlrpc-check.diff: Detect xmlrpc-c properly on Debian.
   * *.install: Updated.
   * client.postinst: Fix update_ipa_nssdb import.
   * rules, autoreconf: Refactor the build to match current upstream,

debian/patches/fix-is-running.diff

@@ -1,11 +0,0 @@
---- a/ipaplatform/debian/services.py
-+++ b/ipaplatform/debian/services.py
-@@ -96,7 +96,7 @@ class DebianSysvService(base_services.Pl
-         if wait and self.is_running(instance_name):
-             self.__wait_for_open_ports(instance_name)
- 
--    def is_running(self, instance_name=""):
-+    def is_running(self, instance_name="", wait=True):
-         ret = True
-         try:
-             result = ipautil.run([paths.SBIN_SERVICE,

debian/patches/fix-kdcproxy-path.diff

@@ -1,10 +0,0 @@
---- a/ipaplatform/debian/paths.py
-+++ b/ipaplatform/debian/paths.py
-@@ -87,6 +87,7 @@ class DebianPathNamespace(BasePathNamesp
-     GENERATE_RNDC_KEY = "/bin/true"
-     IPA_DNSKEYSYNCD_REPLICA = "/usr/lib/ipa/ipa-dnskeysync-replica"
-     IPA_DNSKEYSYNCD = "/usr/lib/ipa/ipa-dnskeysyncd"
-+    IPA_HTTPD_KDCPROXY = "/usr/lib/ipa/ipa-httpd-kdcproxy"
-     IPA_ODS_EXPORTER = "/usr/lib/ipa/ipa-ods-exporter"
-     HTTPD = "/usr/sbin/apache2ctl"
-     REMOVE_DS_PL = "/usr/sbin/remove-ds"

debian/patches/fix-xmlrpc-check.diff

@@ -1,24 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,7 +165,20 @@ PKG_CHECK_MODULES([SASL], [libsasl2])
- dnl ---------------------------------------------------------------------------
- dnl - Check for XMLRPC-C
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES([XMLRPC], [xmlrpc xmlrpc_client xmlrpc_util])
-+PKG_CHECK_MODULES([XMLRPC], [xmlrpc xmlrpc_client xmlrpc_util], [],
-+                  [try_xmlrpc_fallback=true])
-+if test x"$try_xmlrpc_fallback" = xtrue; then
-+    XMLRPC_LIBS=
-+    AC_CHECK_HEADER([xmlrpc-c/base.h], [],
-+                    [AC_MSG_ERROR([xmlrpc-c/base.h not found])])
-+
-+    AC_CHECK_LIB([xmlrpc_client], [xmlrpc_client_init2],
-+                 [XMLRPC_LIBS="-lxmlrpc -lxmlrpc_client -lxmlrpc_util"])
-+    if test "x$XMLRPC_LIBS" = "x" ; then
-+        AC_MSG_ERROR([xmlrpc-c not found])
-+    fi
-+    AC_SUBST(XMLRPC_LIBS)
-+fi
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for libintl

debian/patches/prefix.patch

@@ -1,15 +0,0 @@
-Author: Timo Aaltonen <tjaalton@ubuntu.com>
-Date:   Mon Jan 2 16:09:40 2012 +0200
-
-use the debian layout when installing python modules
-
---- a/Makefile.python.am
-+++ b/Makefile.python.am
-@@ -28,6 +28,7 @@ install-exec-local: $(top_builddir)/ipas
- 		        --prefix "$(DESTDIR)$(prefix)" \
- 		        --single-version-externally-managed \
- 		        --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \
-+			--install-layout=deb \
- 		        --optimize 1; \
- 	fi
- 

debian/patches/series

@@ -1,7 +1,6 @@
 # from upstream
 
 # not upstreamable
-prefix.patch
 hack-libarch.diff
 enable-mod-nss-during-setup.diff
 
@@ -12,6 +11,3 @@ fix-replicainstall.diff
 fix-dnssec-services.diff
 create-sysconfig-ods.diff
 fix-named-conf-template.diff
-fix-is-running.diff
-fix-kdcproxy-path.diff
-fix-xmlrpc-check.diff