Changed Debian install directory and run script name based upon issue #135
This commit is contained in:
parent
db114ea30b
commit
59211053dc
55
Makefile
55
Makefile
|
@ -1,5 +1,7 @@
|
||||||
APP=pybitmessage
|
APP=pybitmessage
|
||||||
VERSION=0.3.0
|
VERSION=0.3.0
|
||||||
|
DEST_SHARE=/usr/share
|
||||||
|
DEST_APP=$(DEST_SHARE)/$(APP)
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
|
||||||
|
@ -9,35 +11,36 @@ source:
|
||||||
tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude=.git
|
tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude=.git
|
||||||
|
|
||||||
install:
|
install:
|
||||||
mkdir -m 755 -p /usr/share/applications
|
mkdir -m 755 -p $(DEST_APP)
|
||||||
mkdir -m 755 -p /usr/share/applications/$(APP)
|
mkdir -m 755 -p $(DEST_SHARE)/applications
|
||||||
mkdir -m 755 -p /usr/share/applications/$(APP)/images
|
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)
|
||||||
mkdir -m 755 -p /usr/share/applications/$(APP)/pyelliptic
|
mkdir -m 755 -p $(DEST_APP)/images
|
||||||
mkdir -m 755 -p /usr/share/applications/$(APP)/socks
|
mkdir -m 755 -p $(DEST_APP)/pyelliptic
|
||||||
mkdir -m 755 -p /usr/share/applications/$(APP)/bitmessageqt
|
mkdir -m 755 -p $(DEST_APP)/socks
|
||||||
mkdir -m 755 -p /usr/share/pixmaps
|
mkdir -m 755 -p $(DEST_APP)/bitmessageqt
|
||||||
mkdir -m 755 -p /usr/share/icons
|
mkdir -m 755 -p $(DEST_SHARE)/pixmaps
|
||||||
mkdir -m 755 -p /usr/share/icons/hicolor
|
mkdir -m 755 -p $(DEST_SHARE)/icons
|
||||||
mkdir -m 755 -p /usr/share/icons/hicolor/scalable
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor
|
||||||
mkdir -m 755 -p /usr/share/icons/hicolor/scalable/apps
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable
|
||||||
mkdir -m 755 -p /usr/share/icons/hicolor/24x24
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable/apps
|
||||||
mkdir -m 755 -p /usr/share/icons/hicolor/24x24/apps
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24
|
||||||
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24/apps
|
||||||
|
|
||||||
install -m 644 src/*.ui /usr/share/applications/$(APP)
|
install -m 644 src/*.ui $(DEST_APP)
|
||||||
install -m 644 src/*.py /usr/share/applications/$(APP)
|
install -m 644 src/*.py $(DEST_APP)
|
||||||
install -m 644 src/*.qrc /usr/share/applications/$(APP)
|
install -m 644 src/*.qrc $(DEST_APP)
|
||||||
|
|
||||||
install -m 644 src/images/*.png /usr/share/applications/$(APP)/images
|
install -m 644 src/images/*.png $(DEST_APP)/images
|
||||||
install -m 644 src/images/*.ico /usr/share/applications/$(APP)/images
|
install -m 644 src/images/*.ico $(DEST_APP)/images
|
||||||
install -m 644 src/pyelliptic/*.py /usr/share/applications/$(APP)/pyelliptic
|
install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic
|
||||||
install -m 644 src/socks/*.py /usr/share/applications/$(APP)/socks
|
install -m 644 src/socks/*.py $(DEST_APP)/socks
|
||||||
install -m 644 src/bitmessageqt/*.py /usr/share/applications/$(APP)/bitmessageqt
|
install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
|
||||||
install -m 755 debian/pybm /usr/bin
|
install -m 755 debian/pybm /usr/bin/pybitmessage
|
||||||
|
|
||||||
install -m 644 desktop/$(APP).desktop /usr/share/applications/$(APP)/$(APP).desktop
|
install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP)/$(APP).desktop
|
||||||
install -m 644 src/images/can-icon-24px.png /usr/share/icons/hicolor/24x24/apps/$(APP).png
|
install -m 644 src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
|
||||||
install -m 644 desktop/can-icon.svg /usr/share/icons/hicolor/scalable/apps/$(APP).svg
|
install -m 644 desktop/can-icon.svg $(DEST_SHARE)/icons/hicolor/scalable/apps/$(APP).svg
|
||||||
install -m 644 desktop/can-icon.svg /usr/share/pixmaps/$(APP).svg
|
install -m 644 desktop/can-icon.svg $(DEST_SHARE)/pixmaps/$(APP).svg
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf debian/$(APP)
|
rm -rf debian/$(APP)
|
||||||
|
|
2
debian/pybm
vendored
2
debian/pybm
vendored
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd /usr/share/applications/pybitmessage
|
cd /usr/share/pybitmessage
|
||||||
python bitmessagemain.py
|
python bitmessagemain.py
|
||||||
|
|
||||||
|
|
28
debian/rules
vendored
28
debian/rules
vendored
|
@ -3,6 +3,7 @@ APP=pybitmessage
|
||||||
|
|
||||||
DEST_MAIN=$(CURDIR)/debian/$(APP)/usr/bin
|
DEST_MAIN=$(CURDIR)/debian/$(APP)/usr/bin
|
||||||
DEST_SHARE=$(CURDIR)/debian/$(APP)/usr/share
|
DEST_SHARE=$(CURDIR)/debian/$(APP)/usr/share
|
||||||
|
DEST_APP=$(DEST_SHARE)/$(APP)
|
||||||
|
|
||||||
build: build-stamp
|
build: build-stamp
|
||||||
make
|
make
|
||||||
|
@ -21,12 +22,13 @@ install: build clean
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr
|
mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr
|
||||||
mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr/bin
|
mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr/bin
|
||||||
|
mkdir -m 755 -p $(DEST_APP)
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/applications
|
mkdir -m 755 -p $(DEST_SHARE)/applications
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)
|
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/images
|
mkdir -m 755 -p $(DEST_APP)/images
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/pyelliptic
|
mkdir -m 755 -p $(DEST_APP)/pyelliptic
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/socks
|
mkdir -m 755 -p $(DEST_APP)/socks
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/bitmessageqt
|
mkdir -m 755 -p $(DEST_APP)/bitmessageqt
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/pixmaps
|
mkdir -m 755 -p $(DEST_SHARE)/pixmaps
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/icons
|
mkdir -m 755 -p $(DEST_SHARE)/icons
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor
|
||||||
|
@ -35,16 +37,16 @@ install: build clean
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24
|
||||||
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24/apps
|
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24/apps
|
||||||
|
|
||||||
install -m 644 $(CURDIR)/src/*.ui $(DEST_SHARE)/applications/$(APP)
|
install -m 644 $(CURDIR)/src/*.ui $(DEST_APP)
|
||||||
install -m 644 $(CURDIR)/src/*.py $(DEST_SHARE)/applications/$(APP)
|
install -m 644 $(CURDIR)/src/*.py $(DEST_APP)
|
||||||
install -m 644 $(CURDIR)/src/*.qrc $(DEST_SHARE)/applications/$(APP)
|
install -m 644 $(CURDIR)/src/*.qrc $(DEST_APP)
|
||||||
|
|
||||||
install -m 644 $(CURDIR)/src/images/*.png $(DEST_SHARE)/applications/$(APP)/images
|
install -m 644 $(CURDIR)/src/images/*.png $(DEST_APP)/images
|
||||||
install -m 644 $(CURDIR)/src/images/*.ico $(DEST_SHARE)/applications/$(APP)/images
|
install -m 644 $(CURDIR)/src/images/*.ico $(DEST_APP)/images
|
||||||
install -m 644 $(CURDIR)/src/pyelliptic/*.py $(DEST_SHARE)/applications/$(APP)/pyelliptic
|
install -m 644 $(CURDIR)/src/pyelliptic/*.py $(DEST_APP)/pyelliptic
|
||||||
install -m 644 $(CURDIR)/src/socks/*.py $(DEST_SHARE)/applications/$(APP)/socks
|
install -m 644 $(CURDIR)/src/socks/*.py $(DEST_APP)/socks
|
||||||
install -m 644 $(CURDIR)/src/bitmessageqt/*.py $(DEST_SHARE)/applications/$(APP)/bitmessageqt
|
install -m 644 $(CURDIR)/src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
|
||||||
install -m 755 $(CURDIR)/debian/pybm $(DEST_MAIN)
|
install -m 755 $(CURDIR)/debian/pybm $(DEST_MAIN)/pybitmessage
|
||||||
|
|
||||||
install -m 644 $(CURDIR)/desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP)/$(APP).desktop
|
install -m 644 $(CURDIR)/desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP)/$(APP).desktop
|
||||||
install -m 644 $(CURDIR)/src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
|
install -m 644 $(CURDIR)/src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
|
||||||
|
|
|
@ -3,7 +3,7 @@ Type=Application
|
||||||
Name=PyBitmessage
|
Name=PyBitmessage
|
||||||
GenericName=PyBitmessage
|
GenericName=PyBitmessage
|
||||||
Comment=Send encrypted messages to another person or to many subscribers
|
Comment=Send encrypted messages to another person or to many subscribers
|
||||||
Exec=pybm %U
|
Exec=pybitmessage %U
|
||||||
Icon=pybitmessage
|
Icon=pybitmessage
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Categories=Network
|
Categories=Network
|
||||||
|
|
Reference in New Issue
Block a user