/pidgin/main: 6207e7f9548b: Merge the dist-clean fixes

[Gary Kramlich]

Changeset: 6207e7f9548bafa31375b03a75d4424488be42a2
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-06-18 20:07 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/6207e7f9548b

Description:

Merge the dist-clean fixes

diffstat:

 .hgignore                  |  4 ++++
 share/ca-certs/Makefile.am |  5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diffs (30 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: regexp
 (.*/)?TAGS$
 (.*/)?\.svn
+.*.swp
 .*/?.*\.pc$
 .*/?Makefile(\.in)?$
 .*/?Makefile\.am\.mingw$
@@ -117,3 +118,6 @@ po/stamp-it
 stamp-h1
 test-driver
 win32-install-dir(\.release)?
+share/ca-certs/cacert.pem
+share/ca-certs/certdata.txt
+
diff --git a/share/ca-certs/Makefile.am b/share/ca-certs/Makefile.am
--- a/share/ca-certs/Makefile.am
+++ b/share/ca-certs/Makefile.am
@@ -30,3 +30,8 @@ mk-ca-bundle.pl:
 .PHONY: mozilla.pem
 mozilla.pem: mk-ca-bundle.pl
 	./mk-ca-bundle.pl -u mozilla.pem
+
+CLEANFILES = \
+	certdata.txt \
+	mozilla.pem
+