Neroth · mitcoes · Oct 14, 2015 · Oct 14, 2015 · Oct 14, 2015 · Oct 14, 2015
diff --git a/.gitignore b/.gitignore
@@ -16,5 +16,4 @@ staging/
 *~
 *.gmo
 metadata.json
-*.gschema.xml
 *.gschema.valid
diff --git a/AUTHORS b/AUTHORS
@@ -5,4 +5,5 @@ Ecyrbe <[email protected]>,
 Timur Kristóf <[email protected]>,
 Simon Legner <[email protected]>,
 Mattia Meneguzzo <[email protected]>,
-Christian Metzler <[email protected]>
+Christian Metzler <[email protected]>,
+Jens Lody <[email protected]>
diff --git a/Makefile.am b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = src data po
 
-uuid = "weather-extension@xeked.com"
+uuid = "openweather-extension@jenslody.de"
 
 localprefix = $(HOME)/.local/share/gnome-shell/extensions
 
@@ -13,19 +13,19 @@ zip-file: all
 	$(MKDIR_P) $(builddir)/zip-file; \
 	$(MAKE) install DESTDIR="$(abs_builddir)/_build"; \
 	cp -r "$(builddir)/_build$(datadir)/gnome-shell/extensions/$(uuid)" "$(builddir)/_build"; \
-	if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml" ]; then \
+	if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/org.gnome.shell.extensions.openweather.gschema.xml" ]; then \
 		$(MKDIR_P) "$(builddir)/_build/$(uuid)/schemas"; \
-		mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml" "$(builddir)/_build/$(uuid)/schemas"; \
+		mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/org.gnome.shell.extensions.openweather.gschema.xml" "$(builddir)/_build/$(uuid)/schemas"; \
 		glib-compile-schemas "$(builddir)/_build/$(uuid)/schemas"; \
 	fi; \
 	cp -r "$(builddir)/_build$(datadir)/locale" "$(builddir)/_build/$(uuid)"; \
 	(cd "$(builddir)/_build/$(uuid)/"; \
-	 zip -qr "$(abs_builddir)/zip-file/weather.shell-extension.zip" .; \
+	 zip -qr "$(abs_builddir)/zip-file/openweather.shell-extension.zip" .; \
 	); \
 	rm -fR $(builddir)/_build
 
 local-install: zip-file
-	zip_file="$(abs_builddir)/zip-file/weather.shell-extension.zip"; \
+	zip_file="$(abs_builddir)/zip-file/openweather.shell-extension.zip"; \
 	if [ -d "$(localprefix)/$(uuid)" ]; then \
 	rm -fR "$(localprefix)/$(uuid)"; \
 	fi; \

diff --git a/README.md b/README.md
@@ -1,125 +1,8 @@
-# Weather Extension V2
+# A R C H I V E D
 
-![Screenshot](https://f.cloud.github.com/assets/1255506/833069/0f754966-f28b-11e2-9fb3-3ea413919c69.png)
+I migrated all my repos to gitlab.com and archived them here on guíthub.
 
-*gnome-shell-extension-weather* is a simple extension for displaying weather conditions and forecasts in GNOME Shell, featuring support for multiple locations, no need for WOEID, a symmetrical layout and a settings panel through *gnome-shell-extension-prefs*.
+You find it by using the following URL:
+https://gitlab.com/jenslody/gnome-shell-extension-openweather
 
-The weather report include forecasts for ~ 10 days.
-
-Support GNOME Shell >= 3.8
-
-Contact the author : [Neroth (Christian METZLER)](https://plus.google.com/u/0/106579473281691119257).
-
-We need translator ! [Translate the extension](https://github.com/Neroth/gnome-shell-extension-weather/wiki/Translate).
-
-----
-
-# Installation
-
-## Through extensions.gnome.org (Local installation)
-
-**Waiting for review / Version 9 : V1 (<= GNOME Shell 3.8) / Version 10 : V2 (>= GNOME Shell 3.8)**
-
-Go on the [Weather extension page](https://extensions.gnome.org/extension/613/weather/) on extensions.gnome.org, click on the switch ("OFF" => "ON"), click on the install button.
-That's it !
-
-## Through a package manager
-
-After the installation, restart GNOME Shell (`Alt`+`F2`, `r`, `Enter`) and enable the extension through *gnome-tweak-tool*.
-
-### [Ubuntu, Mint, and derivatives](https://launchpad.net/~gnome-shell-extensions/+archive/ppa/+packages)
-
-Add the PPA *ppa:gnome-shell-extensions* to your source list, update the package list and install *gnome-shell-extension-weather*:
-
-	sudo add-apt-repository ppa:gnome-shell-extensions
-	sudo apt-get update
-	sudo apt-get install gnome-shell-extension-weather
-
-### [Debian](http://packages.debian.org/source/unstable/gnome-shell-extension-weather)
-
-For Debian "Wheezy" 7, add the (official backports archive)[http://backports.debian.org/Instructions/] to your sources list. This step is not needed for Debian "Jessie" or "Sid".
-
-Then install the package through APT:
-
-	sudo apt-get install gnome-shell-extension-weather
-
-### [Fedora](http://rpmfusion.org/)
-
-Packages for Fedora are available in the [RPM Fusion](http://rpmfusion.org/) repositories. If these are not enabled on your system, please install them through the following command (root password required):
-
-	su -c 'yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-stable.noarch.rpm'
-Then, install *gnome-shell-extension-weather* (root password required):
-
-	su -c 'yum install gnome-shell-extension-weather'
-
-### [Arch Linux](https://aur.archlinux.org/packages/gnome-shell-extension-weather-git/)
-
-Download the package from AUR, make and install it:
-
-	wget https://aur.archlinux.org/packages/gn/gnome-shell-extension-weather-git/gnome-shell-extension-weather-git.tar.gz
-	tar xvzf gnome-shell-extension-weather-git.tar.gz
-	cd gnome-shell-extension-weather-git && makepkg -si
-
-## Generic (Local installation)
-
-Make sure you have the following dependencies installed:
-* *gettext*,
-* *pkg-config*,
-* *git*,
-* *glib2*,
-* *glib2-devel* or *libglib2.0-dev*,
-* *zip*,
-* *gnome-common*,
-* *autoconf*,
-* *automake*,
-* *intltool*,
-* *gir1.2-gweather-3.0*.
-
-Run the following commands:
-
-	cd ~ && git clone git://github.com/Neroth/gnome-shell-extension-weather.git
-	cd ~/gnome-shell-extension-weather
-	./autogen.sh && make local-install
-
-Restart GNOME Shell (`Alt`+`F2`, `r`, `Enter`) and enable the extension through *gnome-tweak-tool*.
-
-----
-
-# Configuration
-
-Launch *gnome-shell-extension-prefs* (reachable also through the *Weather Settings* button on the extension popup) and select *Weather* from the drop-down menu to edit the configuration.
-
-![Screenshot](https://github.com/neroth/gnome-shell-extension-weather/raw/master/data/weather-settings.gif)
-
-You can also use *dconf-editor* or *gsettings* to configure the extension through the command line.
-
-----
-
-# Debug
-
-To debug the extension, active the switch `Debug extension` in the settings:
-
-You have now two new file ("weather.log" and "weather-prefs.log") in the extension dir (`~/.local/share/gnome-shell/extensions/[email protected]/`).
-
-----
-
-# Licence
-
-Copyright (C) 2011 - 2013
-
-* Christian Metzler <[email protected]>,
-* Elad Alfassa <[email protected]>,
-* Mark Benjamin <[email protected]>,
-* Simon Claessens <[email protected]>,
-* Ecyrbe <[email protected]>,
-* Timur Kristóf <[email protected]>,
-* Simon Legner <[email protected]>,
-* Mattia Meneguzzo <[email protected]>.
-
-This file is part of *gnome-shell-extension-weather*.
-
-*gnome-shell-extension-weather* is free software: you can redistribute it and/or modify it under the terms of the **GNU General Public License as published by the Free Software Foundation, either version 3** of the License, or (at your option) any later version.
-
-*gnome-shell-extension-weather* is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with *gnome-shell-extension-weather*.  If not, see <http://www.gnu.org/licenses/>.
+Sorry for the inconvenience!
diff --git a/autogen.sh b/autogen.sh
@@ -1,11 +1,36 @@
-#!/bin/bash
+#!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+#
+#
+#  Weather extension for GNOME Shell
+#  - generate Makefiles
+#
+# Copyright (C) 2012 - 2015
+#     Jens Lody <[email protected]>,
+#
+# This file is part of gnome-shell-extension-openweather.
+#
+# gnome-shell-extension-openweather is free software: you can
+# redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# gnome-shell-extension-openweather is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with gnome-shell-extension-openweather.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="gnome-shell-extension-weather"
-
 touch ChangeLog
 
 test -f $srcdir/configure.ac || {

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.63)
 dnl be carefull, the version needs to be in sync with your gnome shell version
-AC_INIT([gnome-shell-extension-weather],[1.1],[https://github.com/Neroth/gnome-shell-extension-weather/issues])
+AC_INIT([gnome-shell-extension-openweather],[1.1],[https://github.com/jenslody/gnome-shell-extension-openweather/issues])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
@@ -11,16 +11,21 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PROG_SED
 
-GETTEXT_PACKAGE=gnome-shell-extension-weather
+GETTEXT_PACKAGE=gnome-shell-extension-openweather
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
-IT_PROG_INTLTOOL(0.26)
+
+# i18n
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.2])
 
 PKG_PROG_PKG_CONFIG([0.22])
 
 GLIB_GSETTINGS
 
+AC_ARG_VAR(GIT_VERSION, git-version to be placed in metadata.json, will be overwritten when uploaded to gnome.org (default not set))
+
 AC_ARG_WITH(desktop-dir, [  --with-desktop-dir=PATH where to install desktop files (default=PREFIX/share)])
 
 if test "x$with_desktop_dir" != x; then
@@ -41,7 +46,7 @@ AC_ARG_WITH([local-install],
 AC_SUBST(use_local_install)
 AM_CONDITIONAL(LOCAL_INSTALL, test "x${use_local_install}" == "xyes")
 
-extensiontopdir=${datadir}/gnome-shell/extensions/[email protected]
+extensiontopdir=${datadir}/gnome-shell/extensions/[email protected]
 
 dnl This is beyond ugly. Suggestions accepted.
 if test "x${use_local_install}" == "xyes"; then

diff --git a/data/Makefile.am b/data/Makefile.am
@@ -1,13 +1,13 @@
-extensionurl = https://github.com/Neroth/gnome-shell-extension-weather
+extensionurl = https://github.com/jenslody/gnome-shell-extension-openweather
 
 # Change these to modify how installation is performed
 topextensiondir = $(datadir)/gnome-shell/extensions
 
-uuid = weather-extension@xeked.com
+uuid = openweather-extension@jenslody.de
 
 extensiondir = $(topextensiondir)/$(uuid)
 
-dist_extension_DATA = stylesheet.css weather-settings.ui
+dist_extension_DATA = OpenWeather.png stylesheet.css weather-settings.ui
 
 nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
 
@@ -16,15 +16,13 @@ EXTRA_DIST = metadata.json.in
 metadata.json: metadata.json.in $(top_builddir)/config.status
 	$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
 	    -e "s|[@]uuid@|$(uuid)|" \
-	    -e "s|[@]url@|$(extensionurl)|" $< > $@
+	    -e "s|[@]url@|$(extensionurl)|" \
+	    -e "s|[@]version@|$(GIT_VERSION)|" $< > $@
 
 CLEANFILES = metadata.json
 
-gschemas_in = org.gnome.shell.extensions.weather.gschema.xml.in
+gsettings_SCHEMAS = org.gnome.shell.extensions.openweather.gschema.xml
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
-gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml) @GSETTINGS_RULES@
-
-EXTRA_DIST += $(gschemas_in)
-CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
+EXTRA_DIST += $(gsettings_SCHEMAS)
diff --git a/data/OpenWeather.png b/data/OpenWeather.png
diff --git a/data/Screenshot.jpg b/data/Screenshot.jpg
diff --git a/data/metadata.json.in b/data/metadata.json.in
@@ -1,8 +1,9 @@
 {
 "uuid": "@uuid@",
-"name": "Weather",
-"description": "A simple extension for displaying weather information from several cities in GNOME Shell",
-"shell-version": [ "3.8" ],
+"name": "OpenWeather",
+"description": "Weather extension to display weather information from https://openweathermap.org/ or https://darksky.net for almost all locations in the world.\nFor openweathermap.org, you can either use the extensions default-key or register at https://openweathermap.org/appid and set the appropriate switch in the preferences dialog to \"off\".\nFor Dark Sky you have to register at https://darksky.net/dev/register and get a personal API-key.\n\nSince version 29 this extensions uses coordinates to store the locations and makes the names editable to support multiple weather-providers!\nIf you update from versions prior to 29 to 29 or greater (with darksky.net - support) you have to recreate your locations.",
+"shell-version": [ "3.14", "3.16", "3.18", "3.20", "3.22", "3.24", "3.26" ],
 "localedir": "@LOCALEDIR@",
-"url": "@url@"
+"url": "@url@",
+"version": "@version@"
 }