bump the version and drop obsolete patches

debian/changelog

@@ -1,4 +1,4 @@
-freeipa (2.1.4-1) UNRELEASED; urgency=low
+freeipa (2.2.0-1) UNRELEASED; urgency=low
 
   [ Michele Baldessari ]
   * Initial release (Closes: #12345)
@@ -13,8 +13,6 @@ freeipa (2.1.4-1) UNRELEASED; urgency=low
   * Fix dependencies.
   * Add fix_dnsclient.py.patch, we don't use autconfig.
   * Add add_debian.py.patch, platform support code.
-  * Add include-stdint.patch from upstream to fix build errors.
-  * Add no-arrows.patch to not fail test_lang.
   * Add no-testcert.patch to not fail make-testcert.
   * Bump compat and debhelper build-depends to 9.
   * Add missing files to freeipa.install.
@@ -25,9 +23,6 @@ freeipa (2.1.4-1) UNRELEASED; urgency=low
   * rules: Strip the executable bit from translation files.
   * fix-format-string.diff: Fix build errors, thanks Krzysztof Klimonda!
   * Use dh_python2.
-  * create-client-dirs.patch: Add a patch from upstream that creates
-    /etc/ipa and /var/lib/ipa-client/sysrestore paths. Stop creating them in
-    rules.
   * Add DEP-3 compliant headers to the patches.
   * control: client; Move libpam-krb5 to Suggests.
   * control: Update the maintainer address and repo location.

debian/patches/create-client-dirs.patch

@@ -1,44 +0,0 @@
-commit 534ca86b69b5d5abfe070ddf752e4d8f150ad1e2
-Author: Alexander Bokovoy <abokovoy@redhat.com>
-Date:   Thu Nov 17 10:45:15 2011 +0200
-
-    Create directories for client install
-    
-    When ``make client-install`` is called, create /etc/ipa and
-    /var/lib/ipa-client/sysrestore directories required for successful use of
-    ipa-client-install.
-    
-    Do it only if DESTDIR is set to help packagers to notice that these
-    directories have to exist
-    
-    https://fedorahosted.org/freeipa/ticket/1849
-
-diff --git a/Makefile b/Makefile
-index 318364a..baf6eee 100644
---- a/Makefile
-+++ b/Makefile
-@@ -68,7 +68,7 @@ install: all server-install
- 		(cd $$subdir && $(MAKE) $@) || exit 1; \
- 	done
- 
--client-install: client
-+client-install: client client-dirs
- 	@for subdir in $(CLIENTDIRS); do \
- 		(cd $$subdir && $(MAKE) install) || exit 1; \
- 	done
-@@ -79,6 +79,15 @@ client-install: client
- 		python setup-client.py install --root $(DESTDIR); \
- 	fi
- 
-+client-dirs:
-+	@if [ "$(DESTDIR)" != "" ] ; then \
-+		mkdir -p $(DESTDIR)/etc/ipa ; \
-+		mkdir -p $(DESTDIR)/var/lib/ipa-client/sysrestore ; \
-+	else \
-+		echo "DESTDIR was not set, please create /etc/ipa and /var/lib/ipa-client/sysrestore" ; \
-+		echo "Without those directories ipa-client-install will fail" ; \
-+	fi
-+
- lint:
- 	./make-lint $(LINT_OPTIONS)
- 

debian/patches/include-stdint.patch

@@ -1,37 +0,0 @@
-From 45aa80195204329c1fb6f0fd1c8e8142618da604 Mon Sep 17 00:00:00 2001
-From: Marko Myllynen <myllynen@redhat.com>
-Date: Wed, 21 Sep 2011 15:03:55 +0300
-Subject: [PATCH] include <stdint.h> for uintptr_t
-
----
- daemons/ipa-slapi-plugins/common/util.h |    1 +
- ipa-client/ipa-client-common.h          |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/daemons/ipa-slapi-plugins/common/util.h b/daemons/ipa-slapi-plugins/common/util.h
-index 8804fbe..eb3ddc0 100644
---- a/daemons/ipa-slapi-plugins/common/util.h
-+++ b/daemons/ipa-slapi-plugins/common/util.h
-@@ -40,6 +40,7 @@
- #define EOK 0
- #define EFAIL -1
- 
-+#include <stdint.h>
- #ifndef discard_const
- #define discard_const(ptr) ((void *)((uintptr_t)(ptr)))
- #endif
-diff --git a/ipa-client/ipa-client-common.h b/ipa-client/ipa-client-common.h
-index b738fb4..e831c59 100644
---- a/ipa-client/ipa-client-common.h
-+++ b/ipa-client/ipa-client-common.h
-@@ -23,6 +23,7 @@
- #include <libintl.h>
- #define _(STRING) gettext(STRING)
- 
-+#include <stdint.h>
- #ifndef discard_const
- #define discard_const(ptr) ((void *)((uintptr_t)(ptr)))
- #endif
--- 
-1.7.4.1
-

debian/patches/no-arrows.patch

@@ -1,20 +0,0 @@
-Author: Timo Aaltonen <tjaalton@ubuntu.com>
-Date:   Tue Nov 1 10:53:18 2011 -0400
-
-    Add no-arrows.patch to not fail test_lang.
-
-diff --git a/install/po/Makefile.in b/install/po/Makefile.in
-index 49d125d..e04341b 100644
---- a/install/po/Makefile.in
-+++ b/install/po/Makefile.in
-@@ -190,8 +190,8 @@ test_lang:
- 	rm -rf test.po test_locale
- 	$(MSGINIT) --no-translator -i $(DOMAIN).pot -l en_US -o test.po
- 	$(SED) -i -r -e 's/Language: en_US/Language: xh_ZA/' test.po
--	$(SED) -i -r -e 's/^msgstr[ \t]+"(..*)"[ \t]*$$/msgstr "\xe2\x86\x92\1\xe2\x86\x90"/' test.po
--	$(SED) -i -r -e 's/^msgstr[ \t]+"(.*)(\\n)(.)"[ \t]*$$/msgstr "\1\xe2\x86\x90\2"/' test.po
-+#	$(SED) -i -r -e 's/^msgstr[ \t]+"(..*)"[ \t]*$$/msgstr "\xe2\x86\x92\1\xe2\x86\x90"/' test.po
-+#	$(SED) -i -r -e 's/^msgstr[ \t]+"(.*)(\\n)(.)"[ \t]*$$/msgstr "\1\xe2\x86\x90\2"/' test.po
- 	$(MKDIR_P) test_locale/xh_ZA/LC_MESSAGES
- 	$(MSGFMT) -o test_locale/xh_ZA/LC_MESSAGES/ipa.mo test.po
- 

debian/patches/series

@@ -1,8 +1,5 @@
 fix_dnsclient.py.patch
 add_debian.py.patch
-include-stdint.patch
-no-arrows.patch
 no-testcert.patch
 prefix.patch
 fix-string-format.diff
-create-client-dirs.patch