diff options
| author | Wu Xiaotian <[email protected]> | 2019-02-08 00:25:47 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-02-08 23:58:54 +0100 |
| commit | 5a2002745849ef3ce08045a380e13a85b36ee740 (patch) | |
| tree | c6a10718d00d5fece5b2e3eeb6731d0cf13d8d61 | |
| parent | c12436f38f6d939c7288a26f624f4a39fbddffe7 (diff) | |
| download | mate-session-manager-5a2002745849ef3ce08045a380e13a85b36ee740.tar.bz2 mate-session-manager-5a2002745849ef3ce08045a380e13a85b36ee740.tar.xz | |
Fix make distcheck fail on debian.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/mate-session-properties.desktop.in (renamed from data/mate-session-properties.desktop.in.in) | 4 | ||||
| -rw-r--r-- | data/mate-wm.desktop.in (renamed from data/mate-wm.desktop.in.in) | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | po/POTFILES.skip | 2 |
6 files changed, 3 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index b173260..c3834fd 100644 --- a/configure.ac +++ b/configure.ac @@ -295,8 +295,6 @@ doc/dbus/Makefile doc/dbus/mate-session.xml doc/man/Makefile data/Makefile -data/mate-wm.desktop.in -data/mate-session-properties.desktop.in data/org.mate.session.gschema.xml data/icons/Makefile data/icons/16x16/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index d286601..5bf1791 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -31,6 +31,7 @@ EXTRA_DIST = \ $(xsession_in_files) \ $(gsettingsschema_in_files) \ $(ui_DATA) \ + $(desktop_in_files) \ $(pixmap_DATA_dist) CLEANFILES = \ @@ -39,7 +40,4 @@ CLEANFILES = \ $(gsettings_SCHEMAS) \ mate-wm.desktop -DISTCLEANFILES = \ - $(desktop_in_files) - -include $(top_srcdir)/git.mk diff --git a/data/mate-session-properties.desktop.in.in b/data/mate-session-properties.desktop.in index 4b5bafd..79a9ffc 100644 --- a/data/mate-session-properties.desktop.in.in +++ b/data/mate-session-properties.desktop.in @@ -9,7 +9,3 @@ StartupNotify=true Categories=GTK;Settings;X-MATE-PersonalSettings; Keywords=MATE;session;properties;applications;login;start; OnlyShowIn=MATE; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-session -X-MATE-Bugzilla-Component=mate-session-properties -X-MATE-Bugzilla-Version=@VERSION@ diff --git a/data/mate-wm.desktop.in.in b/data/mate-wm.desktop.in index 271dbb4..93a31ab 100644 --- a/data/mate-wm.desktop.in.in +++ b/data/mate-wm.desktop.in @@ -7,7 +7,3 @@ NoDisplay=true X-MATE-Autostart-Phase=WindowManager X-MATE-Provides=windowmanager X-MATE-Autostart-Notify=true -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-session -X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=@VERSION@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 0c8ccba..b5d4f1b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,9 +6,9 @@ capplet/gsp-app.c capplet/main.c [type: gettext/gsettings]data/org.mate.session.gschema.xml.in data/mate.desktop.in -data/mate-wm.desktop.in.in +data/mate-wm.desktop.in [type: gettext/glade]data/gsm-inhibit-dialog.ui -data/mate-session-properties.desktop.in.in +data/mate-session-properties.desktop.in [type: gettext/glade]data/session-properties.ui egg/eggdesktopfile.c egg/eggsmclient.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 17705b5..86d8710 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,6 +2,4 @@ # translated. # Please keep this file sorted alphabetically. data/org.mate.session.gschema.xml.in -data/mate-session-properties.desktop.in data/mate-session.schemas.in -data/mate-wm.desktop.in |