SF.net SVN: gar:[25773] csw/mgar/pkg/subversion/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 25773
          http://sourceforge.net/p/gar/code/25773
Author:   dmichelsen
Date:     2016-06-15 14:16:52 +0000 (Wed, 15 Jun 2016)
Log Message:
-----------
subversion/trunk: Rename packages to latest standards

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2016-06-15 08:49:28 UTC (rev 25772)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2016-06-15 14:16:52 UTC (rev 25773)
@@ -52,50 +52,53 @@
 BUILD_DEP_PKGS-5.10 += CSWlibserf-dev
 BUILD_DEP_PKGS += $(BUILD_DEP_PKGS-$(GAROSREL))
 
-PACKAGES += CSWsvn
-SPKG_DESC_CSWsvn = Version control rethought
-CATALOGNAME_CSWsvn = subversion
-CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn
-RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-1
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWsvn_5.9 += CSWglib2
-RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
+PACKAGES += CSWsubversion
+SPKG_DESC_CSWsubversion = Version control rethought
+RUNTIME_DEP_PKGS_CSWsubversion = CSWbdb48
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibz1
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibserf1-1
+#RUNTIME_DEP_PKGS_CSWsubversion += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWsubversion-5.9 += CSWglib2
+RUNTIME_DEP_PKGS_CSWsubversion-5.10 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL))
 
-PACKAGES += CSWsvn-dev
-SPKG_DESC_CSWsvn-dev = Subversion Development Support
-PKGFILES_CSWsvn-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW
-OBSOLETED_BY_CSWsvn-dev += CSWsvn-devel
+OBSOLETED_BY_CSWsubversion += CSWsvn
+CATALOGNAME_CSWsvn = subversion_stub
 
-PACKAGES += CSWap2svn
-SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2
-CATALOGNAME_CSWap2svn = ap2_subversion
-CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn
-PKGFILES_CSWap2svn += $(prefix)/apache2/.*
-PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWap2svn  = CSWsvn
-RUNTIME_DEP_PKGS_CSWap2svn += CSWapache2
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48
-RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2
+PACKAGES += CSWsubversion-dev
+SPKG_DESC_CSWsubversion-dev = Subversion Development Support
+PKGFILES_CSWsubversion-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWsubversion-dev += $(docdir)/$(CATALOGNAME_CSWsubversion-dev)/changelog.CSW
+OBSOLETED_BY_CSWsubversion-dev += CSWsvn-dev
 
+PACKAGES += CSWap2-subversion
+SPKG_DESC_CSWap2-subversion = Subversion Modules for Apache 2.2
+PKGFILES_CSWap2-subversion += $(prefix)/apache2/.*
+PKGFILES_CSWap2-subversion += $(docdir)/$(CATALOGNAME_CSWap2-subversion)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWap2-subversion  = CSWsubversion
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWapache2
+#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWap2-subversion-sparc += CSWlibmagic1
+#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsqlite3-0
+#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibz1
+RUNTIME_DEP_PKGS_CSWap2-subversion-sparc += CSWlibintl8
+#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWbdb48
+#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWap2-subversion += $(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GARCH))
+
+OBSOLETED_BY_CSWap2-subversion += CSWap2svn
+CATALOGNAME_CSWap2svn = ap2_subversion_stub
+
 PACKAGES-5.10 += CSWjavasvn
 PACKAGES += $(PACKAGES-$(GAROSREL))
 SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
@@ -103,150 +106,115 @@
 PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW 
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibserf1-1
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWsubversion
+RUNTIME_DEP_PKGS_CSWjavasvn-sparc += CSWlibmagic1
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibiconv2
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsasl2-2
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0
+#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibserf1-1
+RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GARCH))
 
 # This would go away when -norunpath would make it to the linker, but at this point this is difficult.
 # Override for now as it is not harmful.
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 
-PACKAGES += CSWpmsvn
-SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding
-CATALOGNAME_CSWpmsvn = pm_subversion
-CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn
-PKGFILES_CSWpmsvn += $(libdir)/perl.*
-PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.*
+PACKAGES += CSWpm-subversion
+SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding
+PKGFILES_CSWpm-subversion += $(libdir)/perl.*
+PKGFILES_CSWpm-subversion += $(SVNLIB)/.*perl.*
 # Put .3* manpages in this package, not *-dev
-PKGFILES_CSWpmsvn += $(mandir)/.*\.3perl
+PKGFILES_CSWpm-subversion += $(mandir)/.*\.3perl
 PKGFILES_DEVEL_MAN3_MANPAGE =
-PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0
+PKGFILES_CSWpm-subversion += $(docdir)/$(CATALOGNAME_CSWpm-subversion)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWperl
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWsubversion
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWpm-subversion-sparc += CSWlibiconv2
+#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibexpat1
+#RUNTIME_DEP_PKGS_CSWpm-subversion-sparc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpm-subversion-sparc += CSWlibintl8
+#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibaprutil1-0
+#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += $(RUNTIME_DEP_PKGS_CSWpm-subversion-$(GARCH))
 
-PACKAGES += CSWrbsvn
-SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
-PKGFILES_CSWrbsvn += $(libdir)/ruby.*
-PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.*
-PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWrbsvn-5.9 += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWrbsvn-5.10 += CSWruby20
-RUNTIME_DEP_PKGS_CSWrbsvn += $(RUNTIME_DEP_PKGS_CSWrbsvn-$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWbdb48
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1
+OBSOLETED_BY_CSWpm-subversion += CSWpmsvn
+CATALOGNAME_CSWpmsvn = pm_subversion_stub
 
+PACKAGES += CSWrb-subversion
+SPKG_DESC_CSWrb-subversion = Subversion Ruby Language Binding
+PKGFILES_CSWrb-subversion += $(libdir)/ruby.*
+PKGFILES_CSWrb-subversion += $(SVNLIB)/.*swig_ruby.*
+PKGFILES_CSWrb-subversion += $(docdir)/$(CATALOGNAME_CSWrb-subversion)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWsubversion
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrb-subversion-5.9 += CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWrb-subversion-5.10 += CSWruby20
+RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWrb-subversion-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GARCH))
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibiconv2
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibexpat1
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibz1
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsasl2-2
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWbdb48
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsqlite3-0
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibaprutil1-0
+#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibserf1-1
+
+OBSOLETED_BY_CSWrb-subversion += CSWrbsvn
+
 # We do depend on CSWruby20, this is an artifact of checkpkg lack of following symlinks
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
+CHECKPKG_OVERRIDES_CSWrb-subversion += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
 
-PACKAGES += CSWpythonsvn
-SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding
-PKGFILES_CSWpythonsvn += $(libdir)/.*python.*
-PKGFILES_CSWpythonsvn += $(SVNLIB)/.*python.*
-PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.*
-PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibserf1-1
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython
+PACKAGES += CSWpy-subversion
+SPKG_DESC_CSWpy-subversion = Subversion Python Language Binding
+PKGFILES_CSWpy-subversion += $(libdir)/.*python.*
+PKGFILES_CSWpy-subversion += $(SVNLIB)/.*python.*
+PKGFILES_CSWpy-subversion += $(SVNLIB)/.*swig_py.*
+PKGFILES_CSWpy-subversion += $(docdir)/$(CATALOGNAME_CSWpy-subversion)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWsubversion
+RUNTIME_DEP_PKGS_CSWpy-subversion-sparc += CSWlibmagic1
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsqlite3-0
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibexpat1
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpy-subversion-sparc += CSWlibintl8
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibiconv2
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWbdb48
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsasl2-2
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibaprutil1-0
+#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibserf1-1
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython
+RUNTIME_DEP_PKGS_CSWpy-subversion += $(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GARCH))
+CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython
 
-# These are all due to linker problems with -z ignore
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsasl2-2
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWpy-subversion += python-package-missing-py26-files
+CHECKPKG_OVERRIDES_CSWpy-subversion += python-package-missing-py-files
 
+OBSOLETED_BY_CSWpy-subversion = CSWpythonsvn
+
 # This is for /usr/share/lib/zoneinfo
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_delta.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_ra.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_fs.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_diff.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_client.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_core.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_wc.so
-CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_repos.so
-CHECKPKG_OVERRIDES_CSWpythonsvn += $(CHECKPKG_OVERRIDES_CSWpythonsvn-$(GAROSREL))
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_delta.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_ra.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_fs.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_diff.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_client.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_core.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_wc.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_repos.so
+CHECKPKG_OVERRIDES_CSWpy-subversion += $(CHECKPKG_OVERRIDES_CSWpy-subversion-$(GAROSREL))
 
 # should be in lib ... put something below to at least make it compile.
 # on the svn mailing list people say we should not build the package

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.