Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Add desktop file and appropriate lines to Makefile. #50

Merged
merged 1 commit into from about 2 years ago

3 participants

Bartłomiej Piotrowski xaizek Bert Münnich
Bartłomiej Piotrowski

According to the Arch Linux bugtracker, package maintainers are obliged to contact with upstream about adding .desktop files instead of adding it on their's own account.

I've commited the desktop file used in Arch' [community] repository and added some lines to Makefile to make use of it.

Bartłomiej Piotrowski

Damn, I see small typo in Makefile. Please, do s/removind/removing/ :<

xaizek

s/removind/removing/

@Barthalion, FYI, you can do this yourself. Just make the change then run git commit -a --amend followed by git push --force (forcing is bad, but not in this case), and it's done.

Bartłomiej Piotrowski

It will let me to edit last commit message, not the file itself AFAIK.

xaizek

No, it will let you add changes to your commit (it adds all staged changes). You talking about the case when you don't run any git add commands. But if you pass -a key to git commit it will have affect of git add -u and all your changes in the working tree will be added to the last commit.

Bert Münnich muennich merged commit 45f4f6d into from
Bert Münnich muennich closed this
Bert Münnich
Owner

Please notice commit 56b6d23, with which the .desktop file is not installed automatically anymore.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Apr 17, 2012
Bartłomiej Piotrowski Barthalion Add desktop file and appropriate lines to Makefile. 45f4f6d
This page is out of date. Refresh to see the latest.

Showing 2 changed files with 11 additions and 0 deletions. Show diff stats Hide diff stats

  1. +4 0 Makefile
  2. +7 0 sxiv.desktop
4 Makefile
@@ -41,6 +41,8 @@ clean:
41 41 install: all
42 42 @echo "installing executable file to $(DESTDIR)$(PREFIX)/bin"
43 43 @install -D -m 755 sxiv $(DESTDIR)$(PREFIX)/bin/sxiv
  44 + @echo "installing desktop file to $(DESTDIR)$(PREFIX)/share/applications"
  45 + @install -D -m 0644 sxiv.desktop $(DESTDIR)$(PREFIX)/share/applications/sxiv.desktop
44 46 @echo "installing manual page to $(DESTDIR)$(MANPREFIX)/man1"
45 47 @mkdir -p $(DESTDIR)$(MANPREFIX)/man1
46 48 @sed "s/VERSION/$(VERSION)/g" sxiv.1 > $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
@@ -49,5 +51,7 @@ install: all
49 51 uninstall:
50 52 @echo "removing executable file from $(DESTDIR)$(PREFIX)/bin"
51 53 @rm -f $(DESTDIR)$(PREFIX)/bin/sxiv
  54 + @echo "removind desktop file from $(DESTDIR)$(PREFIX)/share/applications"
  55 + @rm -f $(DESTDIR)$(PREFIX)/share/applications/sxiv.desktop
52 56 @echo "removing manual page from $(DESTDIR)$(MANPREFIX)/man1"
53 57 @rm -f $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
7 sxiv.desktop
... ... @@ -0,0 +1,7 @@
  1 +[Desktop Entry]
  2 +Type=Application
  3 +Name=sxiv
  4 +GenericName=Image Viewer
  5 +Exec=sxiv %F
  6 +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;
  7 +NoDisplay=true

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.