Revision: 22851
http://sourceforge.net/p/gar/code/22851
Author: rthurner
Date: 2014-01-18 16:01:56 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
subversion/trunk: adjust dependencies
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2014-01-18 11:49:21 UTC (rev
22850)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2014-01-18 16:01:56 UTC (rev
22851)
@@ -56,12 +56,12 @@
RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8
RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibneon27
RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-3
RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibdbus1-3
RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibgnome-keyring0
RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0
CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibdbus1-3
+CHECKPKG_OVERRIDES_CSWsvn +=
file-with-bad-content|/usr/local|root/opt/csw/lib/svn/libsvn_repos-1.so.0.0.0
RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
@@ -88,6 +88,10 @@
RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0
CHECKPKG_OVERRIDES_CSWap2svn +=
catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWsvn
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibapr1-0
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibaprutil1-0
PACKAGES += CSWjavasvn
@@ -139,12 +143,14 @@
RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython
DISTFILES += CSWsvn.checkinstall
DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
+
# Fix: Add java headers for nested classes
# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
PATCHFILES += javahl_headers_for_nested_classes.diff
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
