GNOME.org
 

[gnome-weather] Rename package distribution to org.gnome.Weather

commit 8a545b86afa3924a3faa8483293e1465ef0bf618
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Tue May 13 23:20:34 2014 +0200

    Rename package distribution to org.gnome.Weather
    
    Drop the final Application, which is reserved for the actual
    application. This is in preparation for having a
    org.gnome.Weather.BackgroundService, in the same package.
    
    This in practice just moves the installed files around (sorry
    packagers!). The biggest change is the gettext domain, from
    org.gnome.Weather.Application to org.gnome.Weather (because the
    background service will also need translations), but it looks
    like damned lies will cope just fine (uses the module name).
    
    GSettings schemas, desktop files, appdata files, icons etc have
    not been renamed, because they belong to the application proper
    (and because renaming them would be a compatibility break).
    
    Finally, the git repository and official tarball is still
    gnome-weather. But don't tell anyone ;)

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |   32 ++++++++++----------
 data/icons/Makefile.am                             |   12 ++++----
 data/org.gnome.Weather.Application.service.in      |    4 +-
 ...ther.Application.spec => org.gnome.Weather.spec |   16 +++++-----
 src/Makefile.am                                    |   18 +++++-----
 src/org.gnome.Weather.Application.in               |    2 +-
 7 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a3d5b28..bc1e279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([org.gnome.Weather.Application],[3.13.1],
+AC_INIT([org.gnome.Weather],[3.13.1],
        [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-weather],
        [gnome-weather],
        [https://wiki.gnome.org/Apps/Weather])
diff --git a/data/Makefile.am b/data/Makefile.am
index 232b0b6..a718125 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,28 +2,28 @@
 # 5 different directory declarations
 SUBDIRS = icons
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(PACKAGE_NAME).data.gresource.xml)
-$(PACKAGE_NAME).data.gresource: $(PACKAGE_NAME).data.gresource.xml $(resource_files)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(PACKAGE_NAME).Application.data.gresource.xml)
+$(PACKAGE_NAME).Application.data.gresource: $(PACKAGE_NAME).Application.data.gresource.xml $(resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 
 resourcedir = $(pkgdatadir)
-resource_DATA = $(PACKAGE_NAME).data.gresource
+resource_DATA = $(PACKAGE_NAME).Application.data.gresource
 
 appsdir = $(datadir)/applications
-apps_DATA = $(PACKAGE_NAME).desktop
+apps_DATA = $(PACKAGE_NAME).Application.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-gsettings_SCHEMAS = $(PACKAGE_NAME).gschema.xml
+gsettings_SCHEMAS = $(PACKAGE_NAME).Application.gschema.xml
 
 @GSETTINGS_RULES@
 
 appdatadir = $(datadir)/appdata
-appdata_DATA = $(PACKAGE_NAME).appdata.xml
+appdata_DATA = $(PACKAGE_NAME).Application.appdata.xml
 
 @INTLTOOL_XML_RULE@
 
-$(PACKAGE_NAME).service: $(PACKAGE_NAME).service.in
+$(PACKAGE_NAME).Application.service: $(PACKAGE_NAME).Application.service.in
        $(AM_V_GEN) sed \
                -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
                -e "s|[ ]pkgdatadir@|$(pkgdatadir)|g" \
@@ -32,25 +32,25 @@ $(PACKAGE_NAME).service: $(PACKAGE_NAME).service.in
 
 
 servicedir = $(datadir)/dbus-1/services
-service_DATA = $(PACKAGE_NAME).service
+service_DATA = $(PACKAGE_NAME).Application.service
 
 searchproviderdir = $(datadir)/gnome-shell/search-providers
-dist_searchprovider_DATA = org.gnome.Weather.Application.search-provider.ini
+dist_searchprovider_DATA = $(PACKAGE_NAME).Application.search-provider.ini
 
 EXTRA_DIST = \
        CREDITS \
-       $(PACKAGE_NAME).desktop.in \
-       $(PACKAGE_NAME).service.in \
-       $(PACKAGE_NAME).data.gresource.xml \
+       $(PACKAGE_NAME).Application.desktop.in \
+       $(PACKAGE_NAME).Application.service.in \
+       $(PACKAGE_NAME).Application.data.gresource.xml \
        $(gsettings_SCHEMAS) \
-       $(PACKAGE_NAME).appdata.xml.in \
+       $(PACKAGE_NAME).Application.appdata.xml.in \
        $(resource_files) \
        $(NULL)
 
 CLEANFILES = \
-       $(PACKAGE_NAME).service \
-       $(PACKAGE_NAME).data.gresource \
-       $(PACKAGE_NAME).appdata.xml \
+       $(PACKAGE_NAME).Application.service \
+       $(PACKAGE_NAME).Application.data.gresource \
+       $(PACKAGE_NAME).Application.appdata.xml \
        $(apps_DATA) \
        *.valid \
        gschemas.compiled \
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 3f3cc1c..ec76de1 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -3,13 +3,13 @@ icondir = $(datadir)/icons/
 # I'd like to use nobase_dist_icon_DATA, but
 # automake doesn't recognizes two prefixes at once
 nobase_icon_DATA = \
-       hicolor/16x16/apps/$(PACKAGE_NAME).png \
-       hicolor/22x22/apps/$(PACKAGE_NAME).png \
-       hicolor/32x32/apps/$(PACKAGE_NAME).png \
-       hicolor/48x48/apps/$(PACKAGE_NAME).png \
-       hicolor/256x256/apps/$(PACKAGE_NAME).png
+       hicolor/16x16/apps/$(PACKAGE_NAME).Application.png \
+       hicolor/22x22/apps/$(PACKAGE_NAME).Application.png \
+       hicolor/32x32/apps/$(PACKAGE_NAME).Application.png \
+       hicolor/48x48/apps/$(PACKAGE_NAME).Application.png \
+       hicolor/256x256/apps/$(PACKAGE_NAME).Application.png
 
-EXTRA_DIST = $(nobase_icon_DATA) hicolor/$(PACKAGE_NAME).svg
+EXTRA_DIST = $(nobase_icon_DATA) hicolor/$(PACKAGE_NAME).Application.svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; gtk-update-icon-cache -f -t 
$(datadir)/icons/HighContrast
 
diff --git a/data/org.gnome.Weather.Application.service.in b/data/org.gnome.Weather.Application.service.in
index 0b69597..966e758 100644
--- a/data/org.gnome.Weather.Application.service.in
+++ b/data/org.gnome.Weather.Application.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name= PACKAGE_NAME@
-Exec= pkgdatadir@/@PACKAGE_NAME@ --gapplication-service
+Name= PACKAGE_NAME@.Application
+Exec= pkgdatadir@/@PACKAGE_NAME  Application --gapplication-service
diff --git a/org.gnome.Weather.Application.spec b/org.gnome.Weather.spec
similarity index 77%
rename from org.gnome.Weather.Application.spec
rename to org.gnome.Weather.spec
index a71de78..8546276 100644
--- a/org.gnome.Weather.Application.spec
+++ b/org.gnome.Weather.spec
@@ -24,13 +24,13 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -fR $RPM_BUILD_ROOT/%{_bindir}
-desktop-file-edit $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop \
+desktop-file-edit $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.Application.desktop \
     --set-key=X-AppInstall-Package --set-value=%{name}
 
 %find_lang %{name}
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.Application.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -48,11 +48,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %doc NEWS COPYING
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/dbus-1/services/%{name}.service
-%{_datadir}/glib-2.0/schemas/%{name}.gschema.xml
-%{_datadir}/gnome-shell/search-providers/%{name}.search-provider.ini
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/appdata/%{name}.Application.appdata.xml
+%{_datadir}/applications/%{name}.Application.desktop
+%{_datadir}/dbus-1/services/%{name}.Application.service
+%{_datadir}/glib-2.0/schemas/%{name}.Application.gschema.xml
+%{_datadir}/gnome-shell/search-providers/%{name}.Application.search-provider.ini
+%{_datadir}/icons/hicolor/*/apps/%{name}.Application.png
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
diff --git a/src/Makefile.am b/src/Makefile.am
index 4827877..5d1cb85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,12 +3,12 @@ NULL =
 appdir = $(pkgdatadir)
 nodist_app_SCRIPTS = org.gnome.Weather.Application
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(PACKAGE_NAME).src.gresource.xml)
-$(PACKAGE_NAME).src.gresource: $(PACKAGE_NAME).src.gresource.xml $(resource_files)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(PACKAGE_NAME).Application.src.gresource.xml)
+$(PACKAGE_NAME).Application.src.gresource: $(PACKAGE_NAME).Application.src.gresource.xml $(resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 
 resourcedir = $(pkgdatadir)
-resource_DATA = $(PACKAGE_NAME).src.gresource
+resource_DATA = $(PACKAGE_NAME).Application.src.gresource
 
 # Legacy, until we can depend on package.js provided by gjs
 jsdir = $(pkgdatadir)
@@ -25,20 +25,20 @@ org.gnome.Weather.Application: org.gnome.Weather.Application.in
        @chmod +x $@
 
 EXTRA_DIST = \
-       $(PACKAGE_NAME).in \
-       $(PACKAGE_NAME).src.gresource.xml \
+       $(PACKAGE_NAME).Application.in \
+       $(PACKAGE_NAME).Application.src.gresource.xml \
        $(resource_files) \
        $(NULL)
 
 CLEANFILES = \
-       $(PACKAGE_NAME) \
-       $(PACKAGE_NAME).src.gresource \
+       $(PACKAGE_NAME).Application \
+       $(PACKAGE_NAME).Application.src.gresource \
        $(NULL)
 
 install-exec-hook:
        $(MKDIR_P) $(DESTDIR)$(bindir)
-       $(LN_S) $(appdir)/$(PACKAGE_NAME) $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)
+       $(LN_S) $(appdir)/$(PACKAGE_NAME).Application $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)
 uninstall-hook:
-       -rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)
+       -rm -f $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/org.gnome.Weather.Application.in b/src/org.gnome.Weather.Application.in
index dc7b6bc..124ffb4 100644
--- a/src/org.gnome.Weather.Application.in
+++ b/src/org.gnome.Weather.Application.in
@@ -1,6 +1,6 @@
 #! GJS@
 imports.searchPath.push("@pkgdatadir@");
-imports.package.start({ name: "org.gnome.Weather.Application",
+imports.package.start({ name: "org.gnome.Weather",
                         version: "@PACKAGE_VERSION@",
                         prefix: "@prefix@",
                         libdir: "@libdir@" });
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]