GNOME.org
 

[libgda] Browser: re-named desktp/appdata files

commit 8c5e7ac059b8ba60dece46b1e246f517a547ac43
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Wed Feb 6 13:57:37 2019 -0600

    Browser: re-named desktp/appdata files
    
    using reverse DNS org.gnome.gda

 tools/Makefile.am                                      |  17 +++++++++--------
 tools/browser/Makefile.am                              |   8 ++++----
 tools/browser/gda-browser.desktop.in.in                |  15 ---------------
 tools/browser/meson.build                              |  14 +++++++-------
 ...ata.xml.in => org.gnome.gda.Browser.appdata.xml.in} |   5 +++--
 tools/browser/org.gnome.gda.Browser.desktop.in.in      |  11 +++++++++++
 tools/meson.build                                      |   2 +-
 tools/resources/org.gnome.gda.Browser.png              | Bin 0 -> 59869 bytes
 tools/tools.gresource.xml                              |   3 +++
 9 files changed, 38 insertions(+), 37 deletions(-)
---
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2080d9bb7..e02eebd84 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = \
        gda-sql-6.0
 
 if HAVE_UI
-bin_PROGRAMS+=gda-browser-6.0
+bin_PROGRAMS+=org.gnome.gda.Browser
 SUBDIRS+=browser
 noinst_LTLIBRARIES = libbrowser.la
 endif
@@ -48,13 +48,13 @@ gda_sql_6_0_LDADD += $(LIBSOUP_LIBS)
 endif
 
 if HAVE_UI
-gda_browser_6_0_SOURCES = \
+org_gnome_gda_Browser_SOURCES = \
        tools-main.c \
        tools.gresources.c
 
 if PLATFORM_WIN32
 EXTRALDFLAGS=-mwindows
-gda_browser_6_0_SOURCES += gda-browser-res.rc
+org_gnome_gda_Browser_SOURCES += gda-browser-res.rc
 else
 EXTRALDFLAGS=
 endif
@@ -76,16 +76,16 @@ libbrowser_la_LIBADD = \
        browser/query-exec/libperspective.la \
        browser/data-manager/libperspective.la
 
-gda_browser_6_0_CPPFLAGS = \
+org_gnome_gda_Browser_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(GTK_CFLAGS) \
         $(GTKSOURCEVIEW_CFLAGS) \
         $(MAC_INTEGRATION_CFLAGS) \
        -DIS_BROWSER
 
-gda_browser_6_0_LDFLAGS = $(EXTRALDFLAGS)
+org_gnome_gda_Browser_LDFLAGS = $(EXTRALDFLAGS)
 
-gda_browser_6_0_LDADD = \
+org_gnome_gda_Browser_LDADD = \
        libbrowser.la \
         $(top_builddir)/libgda/libgda-6.0.la \
         $(COREDEPS_LIBS) \
@@ -96,7 +96,7 @@ gda_browser_6_0_LDADD = \
        $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS) $(MAC_INTEGRATION_LIBS)
 
 if LIBSOUP
-gda_browser_6_0_LDADD += $(LIBSOUP_LIBS)
+org_gnome_gda_Browser_LDADD += $(LIBSOUP_LIBS)
 endif
 endif
 
@@ -132,7 +132,8 @@ RESOURCES=\
        resources/gda-browser-reference.png \
        resources/gda-browser-schema.png \
        resources/gda-browser-table.png \
-       resources/gda-browser-view.png
+       resources/gda-browser-view.png \
+       resources/org.gnome.gda.Browser.png
 
 tools.gresources.c: $(RESOURCES)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/tools/resources 
--generate-source $(top_srcdir)/tools/tools.gresource.xml
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 1fe1ac6e1..7eda22f91 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -85,16 +85,16 @@ $(OBJECTS): marshal.c marshal.h
 # app icon
 appiconsdir=$(datadir)/pixmaps
 appicons_DATA= \
-       data/256x256/gda-browser-6.0.png
+       data/256x256/org.gnome.gda.Browser.png
 
 @INTLTOOL_XML_RULE@
 metainfodir = $(datadir)/metainfo
 metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
-metainfo_in_files = gda-browser-6.0.appdata.xml.in
+metainfo_in_files = org.gnome.gda.Browser.appdata.xml.in
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir=$(datadir)/applications
-Desktop_in_files = gda-browser-6.0.desktop.in
+Desktop_in_files = org.gnome.gda.Browser.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST = \
@@ -105,6 +105,6 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = \
        $(desktop_DATA) \
-       gda-browser-6.0.desktop.in \
+       org.gnome.gda.Browser.desktop.in \
        $(metainfo_DATA)
 
diff --git a/tools/browser/meson.build b/tools/browser/meson.build
index 6b6ca1792..5a733d7b4 100644
--- a/tools/browser/meson.build
+++ b/tools/browser/meson.build
@@ -78,12 +78,12 @@ gda_browser_sources += gda_browser_sourcesf
 
 subdir('data')
 
-desktopf = files(['gda-browser.desktop.in.in'])
+desktopf = files(['org.gnome.gda.Browser.desktop.in.in'])
 desktopconf = configuration_data()
 desktopconf.set('GDA_VERSION', project_version)
 desktopfin = configure_file(
-       input: 'gda-browser.desktop.in.in',
-       output: 'gda-browser-'+project_api_version+'.desktop.in',
+       input: 'org.gnome.gda.Browser.desktop.in.in',
+       output: 'org.gnome.gda.Browser.desktop.in',
        configuration: desktopconf
        )
 
@@ -91,19 +91,19 @@ i18n.merge_file('browser_desktop',
        po_dir: join_paths(meson.source_root(),'po'),
        type: 'desktop',
        input: desktopfin,
-       output: 'gda-browser-'+project_api_version+'.desktop',
+       output: 'org.gnome.gda.Browser.desktop',
        install: true,
        install_dir: join_paths(get_option('datadir'),'applications')
        )
 
-custom_target('gda-browser-6.0.appdata',
+custom_target('org.gnome.gda.Browser.appdata',
                command: [intlmerge,
                        '-u', '-x',
                        join_paths(meson.source_root(),'po'),
                        '@INPUT@', '@OUTPUT@'
                        ],
-               input: 'gda-browser-6.0.appdata.xml.in',
-               output: 'gda-browser-6.0.appdata.xml',
+               input: 'org.gnome.gda.Browser.appdata.xml.in',
+               output: 'org.gnome.gda.Browser.appdata.xml',
                install: true,
                install_dir: join_paths(get_option('datadir'),'metainfo')
                )
diff --git a/tools/browser/gda-browser-6.0.appdata.xml.in b/tools/browser/org.gnome.gda.Browser.appdata.xml.in
similarity index 90%
rename from tools/browser/gda-browser-6.0.appdata.xml.in
rename to tools/browser/org.gnome.gda.Browser.appdata.xml.in
index b14b19661..48830bbb7 100644
--- a/tools/browser/gda-browser-6.0.appdata.xml.in
+++ b/tools/browser/org.gnome.gda.Browser.appdata.xml.in
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Ryan Lerch <rlerch redhat com> -->
+<!-- Copyright 2019 Daniel Espinosa <esodan gmail com> -->
 
 <application>
-  <id type="desktop">gda-browser-6.0.desktop</id>
+  <id type="desktop">org.gnome.gda.Browser.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <_summary>View the schema and data of databases</_summary>
   <description>
@@ -26,6 +27,6 @@
     
<screenshot>http://www.gnome-db.org/GdaBrowser?action=AttachFile&amp;do=view&amp;target=GdaBrowser-query1.png</screenshot>
     
<screenshot>http://www.gnome-db.org/GdaBrowser?action=AttachFile&amp;do=view&amp;target=dataman-persp.png</screenshot>
   </screenshots>
-  <updatecontact>vmalerba_at_gmail.com</updatecontact>
+  <updatecontact>esodan_at_gmail.com</updatecontact>
   <project_group>GNOME</project_group>
 </application>
diff --git a/tools/browser/org.gnome.gda.Browser.desktop.in.in 
b/tools/browser/org.gnome.gda.Browser.desktop.in.in
new file mode 100644
index 000000000..37426dd84
--- /dev/null
+++ b/tools/browser/org.gnome.gda.Browser.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_GenericName=Database browser
+_Name=GdaBrowser
+_Comment=Browse database's contents
+Icon=org.gnome.gda.Browser
+Exec=org.gnome.gda.Browser
+Terminal=false
+Type=Application
+Categories=GTK;Development;Database;
+StartupNotify=true
+_Keywords=SGBD;PostgreSQL;MySQL;SQLite;JDBC;LDAP;
\ No newline at end of file
diff --git a/tools/meson.build b/tools/meson.build
index c89e45884..c1ca1d5ca 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -126,7 +126,7 @@ if windows
        gda_browser_sources += win_res
 endif
 
-executable('gda-browser-'+project_api_version,
+executable('org.gnome.gda.Browser',
        gda_browser_sources,
        link_with: [
                libgda,
diff --git a/tools/resources/org.gnome.gda.Browser.png b/tools/resources/org.gnome.gda.Browser.png
new file mode 100644
index 000000000..a193079b9
Binary files /dev/null and b/tools/resources/org.gnome.gda.Browser.png differ
diff --git a/tools/tools.gresource.xml b/tools/tools.gresource.xml
index 0c5a3da29..8e6167d74 100644
--- a/tools/tools.gresource.xml
+++ b/tools/tools.gresource.xml
@@ -3,6 +3,9 @@
   <gresource prefix="/ui">
     <file compressed="yes">menus.ui</file>
   </gresource>
+  <gresource prefix="/images">
+    <file compressed="no">org.gnome.gda.Browser.png</file>
+  </gresource>
   <gresource prefix="/images">
     <file compressed="no">gda-browser-action.png</file>
   </gresource>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]