catalog: Deprecate some functions

catalog.c

@@ -854,6 +854,8 @@ xmlCatalogUnWrapURN(const xmlChar *urn) {
 /**
  * @param filename  the filename
  *
+ * @deprecated Use XML_PARSE_NO_SYS_CATALOG.
+ *
  * parse an XML file and build a tree. It's like xmlParseFile()
  * except it bypass all catalog lookups.
  *

include/libxml/catalog.h

@@ -134,6 +134,7 @@ XMLPUBFUN int
 					 const xmlChar *replace);
 XMLPUBFUN int
 		xmlCatalogRemove	(const xmlChar *value);
+XML_DEPRECATED
 XMLPUBFUN xmlDocPtr
 		xmlParseCatalogFile	(const char *filename);
 XMLPUBFUN int
@@ -170,8 +171,10 @@ XMLPUBFUN xmlCatalogAllow
 
 
 /* DEPRECATED interfaces */
+XML_DEPRECATED
 XMLPUBFUN const xmlChar *
 		xmlCatalogGetSystem	(const xmlChar *sysID);
+XML_DEPRECATED
 XMLPUBFUN const xmlChar *
 		xmlCatalogGetPublic	(const xmlChar *pubID);
 

python/generator.py

@@ -598,6 +598,8 @@ deprecated_funcs = {
     'htmlParseElement': True,
     'xmlAddEncodingAlias': True,
     'xmlByteConsumed': True,
+    'xmlCatalogGetPublic': True,
+    'xmlCatalogGetSystem': True,
     'xmlCheckFilename': True,
     'xmlCheckLanguageID': True,
     'xmlCleanupCharEncodingHandlers': True,
@@ -630,6 +632,7 @@ deprecated_funcs = {
     'xmlParseAttValue': True,
     'xmlParseAttributeListDecl': True,
     'xmlParseCDSect': True,
+    'xmlParseCatalogFile': True,
     'xmlParseCharData': True,
     'xmlParseCharRef': True,
     'xmlParseComment': True,