cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove conflicting file from -ui... grr @ make plist.

Browse Source 
reported by naddy@
ok sthen@
This commit is contained in:
ajacoutot 2012-01-31 07:58:19 +00:00
parent 4785675f6c
commit f350ec581f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/libgda/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2012/01/25 14:40:36 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.60 2012/01/31 07:58:19 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -21,7 +21,7 @@ PKGNAME-mysql= libgda-mysql-${GNOME_VERSION}
PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION} PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION}
PKGNAME-ui= libgda-ui-${GNOME_VERSION} PKGNAME-ui= libgda-ui-${GNOME_VERSION}
REVISION-ui= 0 REVISION-ui= 1
EPOCH-main= 2 EPOCH-main= 2
EPOCH-ldap= 0 EPOCH-ldap= 0

3
x11/gnome/libgda/pkg/PLIST-ui
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ui,v 1.17 2012/01/25 14:40:36 ajacoutot Exp $ @comment $OpenBSD: PLIST-ui,v 1.18 2012/01/31 07:58:19 ajacoutot Exp $
@conflict libgda-<4.2.8p1v2 @conflict libgda-<4.2.8p1v2
@bin bin/gda-browser-${GDA_MAJOR} @bin bin/gda-browser-${GDA_MAJOR}
@bin bin/gda-control-center-${GDA_MAJOR} @bin bin/gda-control-center-${GDA_MAJOR}
@ -445,7 +445,6 @@ share/libgda-${GDA_MAJOR}/demo/linked_model_param.c
share/libgda-${GDA_MAJOR}/demo/login.c share/libgda-${GDA_MAJOR}/demo/login.c
share/libgda-${GDA_MAJOR}/demo/provider_sel.c share/libgda-${GDA_MAJOR}/demo/provider_sel.c
share/libgda-${GDA_MAJOR}/demo/tree.c share/libgda-${GDA_MAJOR}/demo/tree.c
share/libgda-${GDA_MAJOR}/dtd/gdaui-layout.dtd
share/libgda-${GDA_MAJOR}/icons/ share/libgda-${GDA_MAJOR}/icons/
share/libgda-${GDA_MAJOR}/icons/hicolor/ share/libgda-${GDA_MAJOR}/icons/hicolor/
share/libgda-${GDA_MAJOR}/icons/hicolor/16x16/ share/libgda-${GDA_MAJOR}/icons/hicolor/16x16/