GNOME.org
 

[gnome-power-manager] Rename some files for flatpak support

commit 80fc6a211c4c41968cb5e68571fa7c05c1adf4b7
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 18 11:56:28 2016 +0100

    Rename some files for flatpak support

 README                                             |    9 ---------
 RELEASE                                            |    2 +-
 configure.ac                                       |    4 ++--
 contrib/gnome-power-manager.spec.in                |    4 ++--
 data/Makefile.am                                   |    4 ++--
 data/appdata/Makefile.am                           |    2 +-
 ....xml.in => org.gnome.PowerStats.appdata.xml.in} |    2 +-
 ...wer-statistics.png => org.gnome.PowerStats.png} |  Bin 738 -> 738 bytes
 ...wer-statistics.png => org.gnome.PowerStats.png} |  Bin 1002 -> 1002 bytes
 ...wer-statistics.png => org.gnome.PowerStats.png} |  Bin 1555 -> 1555 bytes
 ...wer-statistics.png => org.gnome.PowerStats.png} |  Bin 1519 -> 1519 bytes
 ...wer-statistics.png => org.gnome.PowerStats.png} |  Bin 2483 -> 2483 bytes
 data/icons/hicolor/Makefile.am                     |   14 +++++++-------
 ...wer-statistics.svg => org.gnome.PowerStats.svg} |    0
 ...bolic.svg => org.gnome.PowerStats-symbolic.svg} |    2 +-
 ...op.in.in => org.gnome.PowerStats.desktop.in.in} |    2 +-
 po/POTFILES.in                                     |    4 ++--
 po/POTFILES.skip                                   |    2 +-
 18 files changed, 21 insertions(+), 30 deletions(-)
---
diff --git a/README b/README
index d8325b0..3ef4014 100644
--- a/README
+++ b/README
@@ -1,10 +1 @@
-                             GNOME Power Manager
-                       Power Management Stuff for GNOME
-
-GNOME Power Manager comes in three main parts:
-
-       - gnome-settings-daemon plugin: the manager daemon itself
-       - gnome-control-center panel:   the control panel program, for configuration
-       - gnome-power-statistics:       the statistics graphing program
-
 For more information, please see https://projects.gnome.org/gnome-power-manager/
diff --git a/RELEASE b/RELEASE
index 8824aa7..602a0d4 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,7 +1,7 @@
 Follow http://developer.gnome.org/dotplan/for_maintainers.html
 
 git log --format="%s" GNOME_POWER_MANAGER_3_20_1.. | grep -i -v trivial | grep -v Merge | uniq
-Add any user visible changes into data/appdata/gnome-power-statistics.appdata.xml.in
+Add any user visible changes into data/appdata/org.gnome.PowerStats.appdata.xml.in
 
 Run "make distcheck", correct any problems encountered
 
diff --git a/configure.ac b/configure.ac
index 7c6e0f8..8707a90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.63)
 
-AC_INIT([gnome-power-manager],[3.21.1])
+AC_INIT([gnome-power-manager],[3.21.4])
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar foreign])
@@ -115,7 +115,7 @@ src/Makefile
 man/Makefile
 po/Makefile.in
 data/Makefile
-data/gnome-power-statistics.desktop.in
+data/org.gnome.PowerStats.desktop.in
 data/appdata/Makefile
 data/icons/Makefile
 data/icons/hicolor/Makefile
diff --git a/contrib/gnome-power-manager.spec.in b/contrib/gnome-power-manager.spec.in
index 56dbf61..2a5d17d 100644
--- a/contrib/gnome-power-manager.spec.in
+++ b/contrib/gnome-power-manager.spec.in
@@ -64,8 +64,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/gnome-power-statistics.*
-%{_datadir}/icons/HighContrast/*/apps/gnome-power-statistics.*
+%{_datadir}/icons/hicolor/*/apps/org.gnome.PowerStats.*
+%{_datadir}/icons/HighContrast/*/apps/org.gnome.PowerStats.*
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_mandir}/man1/*.1.gz
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 66a6b58..9928dc7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = appdata icons
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-power-statistics.desktop.in
+desktop_in_files = org.gnome.PowerStats.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @GSETTINGS_RULES@
@@ -16,7 +16,7 @@ clean-local :
        rm -f *~
 
 DISTCLEANFILES =                                       \
-       gnome-power-statistics.desktop                  \
+       org.gnome.PowerStats.desktop                    \
        org.gnome.power-manager.gschema.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
index ccdecf3..b97f7cd 100644
--- a/data/appdata/Makefile.am
+++ b/data/appdata/Makefile.am
@@ -1,7 +1,7 @@
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gnome-power-statistics.appdata.xml.in
+appdata_in_files = org.gnome.PowerStats.appdata.xml.in
 EXTRA_DIST = $(appdata_in_files)
 CLEANFILES = $(appdata_DATA)
 
diff --git a/data/appdata/gnome-power-statistics.appdata.xml.in 
b/data/appdata/org.gnome.PowerStats.appdata.xml.in
similarity index 98%
rename from data/appdata/gnome-power-statistics.appdata.xml.in
rename to data/appdata/org.gnome.PowerStats.appdata.xml.in
index 7392767..785fb77 100644
--- a/data/appdata/gnome-power-statistics.appdata.xml.in
+++ b/data/appdata/org.gnome.PowerStats.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Richard Hughes <richard hughsie com> -->
 <component type="desktop">
-  <id>gnome-power-statistics.desktop</id>
+  <id>org.gnome.PowerStats.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and GFDL-1.3</project_license>
   <_name>GNOME Power Statistics</_name>
diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
index 2517409..b63144f 100644
--- a/data/icons/hicolor/Makefile.am
+++ b/data/icons/hicolor/Makefile.am
@@ -6,13 +6,13 @@ icon48dir=$(datadir)/icons/hicolor/48x48/apps
 iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
 iconsymbolicdir=$(datadir)/icons/hicolor/symbolic/apps
 
-icon16_DATA = 16x16/gnome-power-statistics.png
-icon22_DATA = 22x22/gnome-power-statistics.png
-icon24_DATA = 24x24/gnome-power-statistics.png
-icon32_DATA = 32x32/gnome-power-statistics.png
-icon48_DATA = 48x48/gnome-power-statistics.png
-iconscalable_DATA = scalable/gnome-power-statistics.svg
-iconsymbolic_DATA = symbolic/gnome-power-statistics-symbolic.svg
+icon16_DATA = 16x16/org.gnome.PowerStats.png
+icon22_DATA = 22x22/org.gnome.PowerStats.png
+icon24_DATA = 24x24/org.gnome.PowerStats.png
+icon32_DATA = 32x32/org.gnome.PowerStats.png
+icon48_DATA = 48x48/org.gnome.PowerStats.png
+iconscalable_DATA = scalable/org.gnome.PowerStats.svg
+iconsymbolic_DATA = symbolic/org.gnome.PowerStats-symbolic.svg
 
 EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon48_DATA) $(iconscalable_DATA) 
$(iconsymbolic_DATA)
 
diff --git a/data/icons/hicolor/scalable/gnome-power-statistics.svg 
b/data/icons/hicolor/scalable/org.gnome.PowerStats.svg
similarity index 100%
rename from data/icons/hicolor/scalable/gnome-power-statistics.svg
rename to data/icons/hicolor/scalable/org.gnome.PowerStats.svg
diff --git a/data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg 
b/data/icons/hicolor/symbolic/org.gnome.PowerStats-symbolic.svg
similarity index 89%
rename from data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg
rename to data/icons/hicolor/symbolic/org.gnome.PowerStats-symbolic.svg
index f9b7ed3..0c186f1 100644
--- a/data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg
+++ b/data/icons/hicolor/symbolic/org.gnome.PowerStats-symbolic.svg
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' 
sodipodi:docname='gnome-power-statistics-symbolic.svg' height='16' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' 
xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' 
version='1.1' inkscape:version='0.91 r13725' width='16.000002' xmlns='http://www.w3.org/2000/svg'>
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' 
sodipodi:docname='org.gnome.PowerStats-symbolic.svg' height='16' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' 
xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' 
version='1.1' inkscape:version='0.91 r13725' width='16.000002' xmlns='http://www.w3.org/2000/svg'>
   <metadata id='metadata90'>
     <rdf:RDF>
       <cc:Work rdf:about=''>
diff --git a/data/gnome-power-statistics.desktop.in.in b/data/org.gnome.PowerStats.desktop.in.in
similarity index 94%
rename from data/gnome-power-statistics.desktop.in.in
rename to data/org.gnome.PowerStats.desktop.in.in
index 4be55ef..d0eacf4 100644
--- a/data/gnome-power-statistics.desktop.in.in
+++ b/data/org.gnome.PowerStats.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Power Statistics
 _Comment=Observe power management
 _Keywords=battery;consumption;charge;
-Icon=gnome-power-statistics
+Icon=org.gnome.PowerStats
 Exec=gnome-power-statistics
 Terminal=false
 Type=Application
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bd40aed..17a12fe 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,8 +2,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/org.gnome.power-manager.gschema.xml
-data/appdata/gnome-power-statistics.appdata.xml.in
-data/gnome-power-statistics.desktop.in.in
+data/appdata/org.gnome.PowerStats.appdata.xml.in
+data/org.gnome.PowerStats.desktop.in.in
 [type: gettext/glade]src/gpm-statistics.ui
 src/gpm-graph-widget.c
 src/gpm-statistics.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 4a587c5..e2d11b9 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1 @@
-data/gnome-power-statistics.desktop.in
+data/org.gnome.PowerStats.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]