Commit 4c86e9e8 authored by Mathieu Bridon's avatar Mathieu Bridon

Rename everything

parent 89f3c161
......@@ -8,10 +8,10 @@ recursive-include help *.page *.xml *.po
include MANIFEST.in
include meld.doap
include data/meld.appdata.xml.in
include data/org.gnome.meld.appdata.xml.in
include data/meld.css
include data/meld.desktop.in
include data/mime/meld.xml.in
include data/org.gnome.meld.desktop.in
include data/mime/org.gnome.meld.xml.in
include data/org.gnome.meld.gschema.xml
include meld/ui/catalog.xml
include setup_win32.py
all:
inkscape hicolor/scalable/apps/meld.svg -w 48 -h 48 -e hicolor/48x48/apps/meld.png
convert -background transparent hicolor/48x48/apps/meld.png -define icon:auto-resize=16,22,32,48 meld.ico
inkscape hicolor/scalable/apps/org.gnome.meld.svg -w 48 -h 48 -e hicolor/48x48/apps/org.gnome.meld.png
convert -background transparent hicolor/48x48/apps/org.gnome.meld.png -define icon:auto-resize=16,22,32,48 org.gnome.meld.ico
......@@ -3,6 +3,6 @@
<mime-type type="application/x-meld-comparison">
<_comment>Meld comparison description</_comment>
<glob pattern="*.meldcmp"/>
<icon name="meld"/>
<icon name="org.gnome.meld"/>
</mime-type>
</mime-info>
......@@ -25,9 +25,6 @@
"V": "1"
}
},
"rename-appdata-file": "meld.appdata.xml",
"rename-desktop-file": "meld.desktop",
"rename-icon": "meld",
"finish-args": [
/* X11 + XShm */
"--share=ipc", "--socket=x11",
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013-2014 Kai Willadsen <kai.willadsen@gmail.com> -->
<component type="desktop">
<id>meld.desktop</id>
<id>org.gnome.meld.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
<_name>Meld</_name>
......
......@@ -8,7 +8,7 @@ _Keywords=diff;merge;
Exec=meld %F
Terminal=false
Type=Application
Icon=meld
Icon=org.gnome.meld
MimeType=application/x-meld-comparison;
StartupNotify=true
Categories=GTK;Development;
......@@ -6,7 +6,7 @@
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">About Meld</property>
<property name="icon_name">meld</property>
<property name="icon_name">org.gnome.meld</property>
<property name="type_hint">dialog</property>
<property name="program_name">Meld</property>
<property name="copyright" translatable="yes">Copyright © 2002-2009 Stephen Kennedy
......@@ -19,7 +19,7 @@ Vincent Legoll</property>
<property name="translator_credits" translatable="yes">translator-credits</property>
<property name="artists">GNOME Project
Josef Vybíral</property>
<property name="logo_icon_name">meld</property>
<property name="logo_icon_name">org.gnome.meld</property>
<property name="license_type">gpl-2-0</property>
<child internal-child="vbox">
<object class="GtkBox" id="aboutdialog-vbox1">
......
......@@ -5,7 +5,7 @@
<property name="height_request">400</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Meld</property>
<property name="icon_name">meld</property>
<property name="icon_name">org.gnome.meld</property>
<signal name="delete-event" handler="on_delete_event" swapped="no"/>
<child>
<object class="GtkVBox" id="appvbox">
......
bin/meld
data/meld.desktop.in
[type: gettext/xml]data/meld.appdata.xml.in
[type: gettext/xml]data/mime/meld.xml.in
data/org.gnome.meld.desktop.in
[type: gettext/xml]data/org.gnome.meld.appdata.xml.in
[type: gettext/xml]data/mime/org.gnome.meld.xml.in
data/org.gnome.meld.gschema.xml
[type: gettext/xml]data/styles/meld-base.xml
[type: gettext/xml]data/styles/meld-dark.xml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment