Update URLs for new website and screenshots

README.md

@@ -56,7 +56,7 @@ Unix users should get Meld from their distribution package manager, or from
 [Flathub](https://flathub.org/).
 
 Windows users should download the provided MSIs on the
-[Meld home page](https://meldmerge.org/).
+[Meld home page](https://meld.app/).
 
 OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there
 are unofficial native builds available from the
@@ -117,8 +117,8 @@ Support forum:  https://discourse.gnome.org/tag/meld
 Links
 -----
 
-Home page:      http://meldmerge.org
+Home page:      https://meld.app/
 
-Documentation:  http://meldmerge.org/help/
+Documentation:  https://meld.app/help/
 
 Wiki:           https://wiki.gnome.org/Apps/Meld

data/org.gnome.meld.appdata.xml.in.in

@@ -31,18 +31,18 @@
     <kudo>UserDocs</kudo>
   </kudos>
   <screenshots>
-    <screenshot type="default" height="759" width="992">
-      <image>http://meldmerge.org/images/meld-filediff-full.png</image>
+    <screenshot type="default" height="736" width="1132">
+      <image>https://meld.app/images/filediff.png</image>
     </screenshot>
-    <screenshot height="532" width="655">
-      <image>http://meldmerge.org/images/meld-dircomp-full.png</image>
+    <screenshot height="736" width="1132">
+      <image>https://meld.app/images/dirdiff.png</image>
     </screenshot>
-    <screenshot height="532" width="655">
-      <image>http://meldmerge.org/images/meld-vc-full.png</image>
+    <screenshot height="736" width="1132">
+      <image>https://meld.app/images/vcview.png</image>
     </screenshot>
   </screenshots>
-  <url type="homepage">http://meldmerge.org</url>
-  <url type="help">http://meldmerge.org/help/</url>
+  <url type="homepage">https://meld.app/</url>
+  <url type="help">https://meld.app/help/</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/meld/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="translate">https://wiki.gnome.org/TranslationProject</url>

meld.doap

@@ -13,7 +13,7 @@
   files as desired. Last but by no means least, Meld lets you work with your
   current changes in a wide variety of version control systems, including Git,
   Bazaar, Mercurial, Subversion and CVS.</description>
-  <homepage rdf:resource="https://meldmerge.org/" />
+  <homepage rdf:resource="https://meld.app/" />
   <support-forum rdf:resource="https://discourse.gnome.org/tag/meld" />
   <developer-forum rdf:resource="https://discourse.gnome.org/tag/meld" />
   <download-page rdf:resource="https://download.gnome.org/sources/meld/" />

meld/meldapp.py

@@ -122,7 +122,7 @@ def preferences_callback(self, action, parameter):
 
     def help_callback(self, action, parameter):
         if meld.conf.DATADIR_IS_UNINSTALLED:
-            uri = "http://meldmerge.org/help/"
+            uri = "https://meld.app/help/"
         else:
             uri = "help:meld"
         Gtk.show_uri(

meld/resources/ui/about-dialog.ui

@@ -6,8 +6,8 @@
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <property name="copyright" translatable="yes">Copyright © 2002-2009 Stephen Kennedy
-Copyright © 2009-2021 Kai Willadsen</property>
-    <property name="website">https://meldmerge.org/</property>
+Copyright © 2009-2022 Kai Willadsen</property>
+    <property name="website">https://meld.app/</property>
     <property name="authors">Stephen Kennedy
 Kai Willadsen
 Vincent Legoll</property>

setup.py

@@ -21,7 +21,7 @@
     description='Visual diff and merge tool',
     author='Kai Willadsen',
     author_email='[email protected]',
-    url='http://meldmerge.org',
+    url='https://meld.app',
     license='GPLv2+',
     classifiers=[
         'Development Status :: 5 - Production/Stable',

setup_win32.py

@@ -154,7 +154,7 @@ def get_non_python_libs():
     author='The Meld project',
     author_email='[email protected]',
     maintainer='Kai Willadsen',
-    url='http://meldmerge.org',
+    url='https://meld.app',
     license='GPLv2+',
     classifiers=[
         'Development Status :: 5 - Production/Stable',