From 8427756eecab5d1d57049fdbf7a84521b8ce513b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aur=C3=A9lien=20Larcher?= Date: Mon, 17 Oct 2016 09:18:14 +0200 Subject: [PATCH] Move pgadmin to database --- components/{ => database}/pgadmin/Makefile | 7 ++++--- .../pgadmin/files/icons/128x128/apps/pgadmin.png | Bin .../pgadmin/files/icons/16x16/apps/pgadmin.png | Bin .../pgadmin/files/icons/192x192/apps/pgadmin.png | Bin .../pgadmin/files/icons/22x22/apps/pgadmin.png | Bin .../pgadmin/files/icons/24x24/apps/pgadmin.png | Bin .../pgadmin/files/icons/32x32/apps/pgadmin.png | Bin .../pgadmin/files/icons/36x36/apps/pgadmin.png | Bin .../pgadmin/files/icons/48x48/apps/pgadmin.png | Bin .../pgadmin/files/icons/64x64/apps/pgadmin.png | Bin .../pgadmin/files/icons/72x72/apps/pgadmin.png | Bin .../pgadmin/files/icons/96x96/apps/pgadmin.png | Bin .../pgadmin/files/icons/scalable/apps/pgadmin.svg | 0 components/{ => database}/pgadmin/files/pgadmin3.1 | 0 components/{ => database}/pgadmin/files/pgadmin3.desktop | 0 .../{ => database}/pgadmin/manifests/sample-manifest.p5m | 0 components/{ => database}/pgadmin/pgadmin.license | 0 components/{ => database}/pgadmin/pgadmin.p5m | 0 18 files changed, 4 insertions(+), 3 deletions(-) rename components/{ => database}/pgadmin/Makefile (88%) rename components/{ => database}/pgadmin/files/icons/128x128/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/16x16/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/192x192/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/22x22/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/24x24/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/32x32/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/36x36/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/48x48/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/64x64/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/72x72/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/96x96/apps/pgadmin.png (100%) rename components/{ => database}/pgadmin/files/icons/scalable/apps/pgadmin.svg (100%) rename components/{ => database}/pgadmin/files/pgadmin3.1 (100%) rename components/{ => database}/pgadmin/files/pgadmin3.desktop (100%) rename components/{ => database}/pgadmin/manifests/sample-manifest.p5m (100%) rename components/{ => database}/pgadmin/pgadmin.license (100%) rename components/{ => database}/pgadmin/pgadmin.p5m (100%) diff --git a/components/pgadmin/Makefile b/components/database/pgadmin/Makefile similarity index 88% rename from components/pgadmin/Makefile rename to components/database/pgadmin/Makefile index b4c9b3aa7..bc11bcb43 100644 --- a/components/pgadmin/Makefile +++ b/components/database/pgadmin/Makefile @@ -13,10 +13,11 @@ # Copyright 2013 Alexander Pyhalov. All rights reserved. # -include ../../make-rules/shared-macros.mk +include ../../../make-rules/shared-macros.mk COMPONENT_NAME= pgadmin3 COMPONENT_VERSION= 1.18.1 +COMPONENT_REVISION= 1 COMPONENT_SUMMARY= pgAdminIII administration and development GUI for PostgreSQL COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz @@ -38,9 +39,9 @@ include $(WS_TOP)/make-rules/prep.mk include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk -COMPONENT_PRE_CONFIGURE_ACTION = (cp -a $(SOURCE_DIR)/* $(@D)) +COMPONENT_PRE_CONFIGURE_ACTION= (cp -a $(SOURCE_DIR)/* $(@D)) -COMPONENT_BUILD_ENV += LDFLAGS="$(LDFLAGS)" +COMPONENT_BUILD_ENV+= LDFLAGS="$(LDFLAGS)" build: $(BUILD_32) diff --git a/components/pgadmin/files/icons/128x128/apps/pgadmin.png b/components/database/pgadmin/files/icons/128x128/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/128x128/apps/pgadmin.png rename to components/database/pgadmin/files/icons/128x128/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/16x16/apps/pgadmin.png b/components/database/pgadmin/files/icons/16x16/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/16x16/apps/pgadmin.png rename to components/database/pgadmin/files/icons/16x16/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/192x192/apps/pgadmin.png b/components/database/pgadmin/files/icons/192x192/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/192x192/apps/pgadmin.png rename to components/database/pgadmin/files/icons/192x192/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/22x22/apps/pgadmin.png b/components/database/pgadmin/files/icons/22x22/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/22x22/apps/pgadmin.png rename to components/database/pgadmin/files/icons/22x22/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/24x24/apps/pgadmin.png b/components/database/pgadmin/files/icons/24x24/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/24x24/apps/pgadmin.png rename to components/database/pgadmin/files/icons/24x24/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/32x32/apps/pgadmin.png b/components/database/pgadmin/files/icons/32x32/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/32x32/apps/pgadmin.png rename to components/database/pgadmin/files/icons/32x32/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/36x36/apps/pgadmin.png b/components/database/pgadmin/files/icons/36x36/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/36x36/apps/pgadmin.png rename to components/database/pgadmin/files/icons/36x36/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/48x48/apps/pgadmin.png b/components/database/pgadmin/files/icons/48x48/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/48x48/apps/pgadmin.png rename to components/database/pgadmin/files/icons/48x48/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/64x64/apps/pgadmin.png b/components/database/pgadmin/files/icons/64x64/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/64x64/apps/pgadmin.png rename to components/database/pgadmin/files/icons/64x64/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/72x72/apps/pgadmin.png b/components/database/pgadmin/files/icons/72x72/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/72x72/apps/pgadmin.png rename to components/database/pgadmin/files/icons/72x72/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/96x96/apps/pgadmin.png b/components/database/pgadmin/files/icons/96x96/apps/pgadmin.png similarity index 100% rename from components/pgadmin/files/icons/96x96/apps/pgadmin.png rename to components/database/pgadmin/files/icons/96x96/apps/pgadmin.png diff --git a/components/pgadmin/files/icons/scalable/apps/pgadmin.svg b/components/database/pgadmin/files/icons/scalable/apps/pgadmin.svg similarity index 100% rename from components/pgadmin/files/icons/scalable/apps/pgadmin.svg rename to components/database/pgadmin/files/icons/scalable/apps/pgadmin.svg diff --git a/components/pgadmin/files/pgadmin3.1 b/components/database/pgadmin/files/pgadmin3.1 similarity index 100% rename from components/pgadmin/files/pgadmin3.1 rename to components/database/pgadmin/files/pgadmin3.1 diff --git a/components/pgadmin/files/pgadmin3.desktop b/components/database/pgadmin/files/pgadmin3.desktop similarity index 100% rename from components/pgadmin/files/pgadmin3.desktop rename to components/database/pgadmin/files/pgadmin3.desktop diff --git a/components/pgadmin/manifests/sample-manifest.p5m b/components/database/pgadmin/manifests/sample-manifest.p5m similarity index 100% rename from components/pgadmin/manifests/sample-manifest.p5m rename to components/database/pgadmin/manifests/sample-manifest.p5m diff --git a/components/pgadmin/pgadmin.license b/components/database/pgadmin/pgadmin.license similarity index 100% rename from components/pgadmin/pgadmin.license rename to components/database/pgadmin/pgadmin.license diff --git a/components/pgadmin/pgadmin.p5m b/components/database/pgadmin/pgadmin.p5m similarity index 100% rename from components/pgadmin/pgadmin.p5m rename to components/database/pgadmin/pgadmin.p5m -- 2.11.4.GIT