SF.net SVN: gar:[22834] csw/mgar/pkg/gthumb/trunk/Makefile

[cgrzemba at users.sourceforge.net]

Revision: 22834
          http://sourceforge.net/p/gar/code/22834
Author:   cgrzemba
Date:     2014-01-14 12:38:01 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
gthumb/trunk: new package structure

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

Modified: csw/mgar/pkg/gthumb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gthumb/trunk/Makefile	2014-01-14 12:36:54 UTC (rev 22833)
+++ csw/mgar/pkg/gthumb/trunk/Makefile	2014-01-14 12:38:01 UTC (rev 22834)
@@ -32,29 +32,6 @@
 # BUILD_DEP_PKGS += CSWlibsoupdevel 
 # BUILD_DEP_PKGS += CSWgnomekeyring-dev
 
-PACKAGES += CSWgthumb-extensions
-CATALOGNAME_CSWgthumb-extensions = gthumb_extensions
-PKGFILES_CSWgthumb-extensions += $(call baseisadirs,$(libdir)/gthumb/extensions,.*)
-SPKG_DESC_CSWgthumb-extensions += $(DESCRIPTION), extensions
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpango1-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstreamer0-10-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup-gnome2-4-1
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstinterfaces0-10-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup2-4-1
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpangocairo1-0-0
-
 PACKAGES += CSWgthumb-dev
 CATALOGNAME_CSWgthumb-dev = gthumb_dev
 PKGFILES_CSWgthumb-dev += $(PKGFILES_DEVEL)
@@ -62,18 +39,19 @@
 
 PACKAGES += CSWgthumb-data
 CATALOGNAME_CSWgthumb-data = gthumb_data
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/gthumb # $(call catalogname,$P)
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/gnome
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/icons
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/locale
-PKGFILES_CSWgthumb-data += $(sysconfigdir)/gconf
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gthumb/.* # $(call catalogname,$P)
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gnome/.*
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/icons/.*
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/locale/.*
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/applications/.*
+PKGFILES_CSWgthumb-data += $(sysconfdir)/gconf/schemas/.*
 SPKG_DESC_CSWgthumb-data += $(DESCRIPTION), arch-independent files
+ARCHALL_CSWgthumb-data = 1
 
 PACKAGES += CSWgthumb
 CATALOGNAME_CSWgthumb = gthumb
 SPKG_DESC_CSWgthumb += $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-data
-RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-extensions
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibintl8
@@ -86,6 +64,15 @@
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstreamer0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup-gnome2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstinterfaces0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup2-4-1
+
 EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/var/lib.*
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpango1-0-0
 # RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff5
@@ -100,8 +87,8 @@
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpangocairo1-0-0
 CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-extensions
 CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-data
+OBSOLETED_BY_CSWgthumb += CSWlibgthumb
 
-
 # for xmllint
 EXTRA_TEST_ENV += http_proxy=http://proxy:3128
 

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