/pidgin/main: 12216afa24ab: Fix make distcheck for 2.x.y

[Tomasz Wasilczyk]

Changeset: 12216afa24abfbd2c007038712eaec9170ee244b
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-16 20:55 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/12216afa24ab

Description:

Fix make distcheck for 2.x.y

diffstat:

 .hgignore                                                                         |  1 +
 Makefile.am                                                                       |  5 +++--
 pidgin/win32/nsis/pidgin-installer.nsi                                            |  6 +++---
 share/ca-certs/Makefile.am                                                        |  6 +++---
 share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem   |  0 
 share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem |  0 
 share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem   |  0 
 7 files changed, 10 insertions(+), 8 deletions(-)

diffs (68 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -85,6 +85,7 @@ pidgin-*.*.*-win32-bin.zip$
 pidgin-*.*.*-win32bin$
 pidgin-.*.tar.bz2
 pidgin-.*.tar.gz
+pidgin-[0-9a-z.-]+/
 pidgin.apspec$
 pidgin.desktop$
 pidgin.desktop.in$
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,9 +138,10 @@ endif
 
 # perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which
 # breaks "make distcheck" unless we ignore perl things
+# TODO drop it when we drop perl wrapper
 
 distuninstallcheck_listfiles = \
-	find . -type f -print | grep -v perl | grep -v Purple.3pm
+	find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm
 
 DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \
-			intltool-merge intltool-update
+			intltool-merge intltool-update package_revision_raw.txt
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -554,9 +554,9 @@ Section Uninstall
     Delete "$INSTDIR\ca-certs\ValiCert_Class_2_VA.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
-    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem"
-    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
-    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Primary_CA-G2.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Primary_CA-G5.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Primary_CA-G5-2.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_International_Server_Class_3_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
     RMDir "$INSTDIR\ca-certs"
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
@@ -17,9 +17,9 @@ CERTIFICATES = \
 		Thawte_Primary_Root_CA.pem \
 		ValiCert_Class_2_VA.pem \
 		Verisign_Class3_Primary_CA.pem \
-		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem \
-		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
-		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
+		VeriSign_Class_3_Primary_CA-G2.pem \
+		VeriSign_Class_3_Primary_CA-G5.pem \
+		VeriSign_Class_3_Primary_CA-G5-2.pem
 
 # TODO: Microsoft_Secure_Server_Authority_2010.pem is going to expire
 # on 19-05-2014. After this date, remove it.
diff --git a/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem b/share/ca-certs/VeriSign_Class_3_Primary_CA-G2.pem
rename from share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
rename to share/ca-certs/VeriSign_Class_3_Primary_CA-G2.pem
diff --git a/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem b/share/ca-certs/VeriSign_Class_3_Primary_CA-G5-2.pem
rename from share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
rename to share/ca-certs/VeriSign_Class_3_Primary_CA-G5-2.pem
diff --git a/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem b/share/ca-certs/VeriSign_Class_3_Primary_CA-G5.pem
rename from share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
rename to share/ca-certs/VeriSign_Class_3_Primary_CA-G5.pem