From 6582a97a5e24f371087943438265d9e901b1a7ea Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Apr 13 2017 13:06:56 +0000 Subject: Update install patch. --- diff --git a/cqrlog-2.0.4-install.patch b/cqrlog-2.0.4-install.patch deleted file mode 100644 index 3e98297..0000000 --- a/cqrlog-2.0.4-install.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -7,15 +7,13 @@ tmpdir = /tmp - - cqrlog: src/cqrlog.lpi - $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi -- $(ST) src/cqrlog -- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz - - clean: - rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled debian/cqrlog.* src/ipc/*.o src/ipc/*.ppu src/cqrlog.or - rm -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh src/*.rst src/*.a - rm -rf debian/cqrlog - rm -f -v src/mysql/*.ppu src/mysq/*.bak src/mysql/*.o -- rm -f -v tools/cqrlog.1.gz -+ rm -f -v tools/cqrlog.1 - - install: - install -d -v $(bindir) -@@ -60,7 +58,7 @@ install: - install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png - # install -v -m 0644 images/icon/* $(sharedir)/icons/cqrlog/ - install -v -m 0644 src/changelog.html $(datadir)/changelog.html -- install -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz -+ install -v -m 0644 tools/cqrlog.1 $(sharedir)/man/man1/cqrlog.1 - deb: - dpkg-buildpackage -rfakeroot -i -I - deb_src: diff --git a/cqrlog-2.0.5-install.patch b/cqrlog-2.0.5-install.patch new file mode 100644 index 0000000..0ea04e0 --- /dev/null +++ b/cqrlog-2.0.5-install.patch @@ -0,0 +1,54 @@ +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,13 @@ tmpdir = /tmp + + cqrlog: src/cqrlog.lpi + $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi +- $(ST) src/cqrlog +- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz + + clean: + rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled debian/cqrlog.* src/ipc/*.o src/ipc/*.ppu src/cqrlog.or + rm -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh src/*.rst src/*.a + rm -rf debian/cqrlog + rm -f -v src/mysql/*.ppu src/mysq/*.bak src/mysql/*.o +- rm -f -v tools/cqrlog.1.gz ++ rm -f -v tools/cqrlog.1 + + install: + install -d -v $(bindir) +@@ -32,8 +30,8 @@ install: + install -d -v $(datadir)/images/icon/64x64 + install -d -v $(datadir)/images/icon/128x128 + install -d -v $(datadir)/images/icon/256x256 +- install -d -v $(sharedir)/pixmaps/cqrlog +- install -d -v $(sharedir)/icons/cqrlog ++# install -d -v $(sharedir)/pixmaps/cqrlog ++# install -d -v $(sharedir)/icons/cqrlog + install -d -v $(sharedir)/applications + install -d -v $(sharedir)/man/man1 + install -v -m 0755 src/cqrlog $(bindir) +@@ -49,18 +47,18 @@ install: + install -v -m 0644 zipcodes/* $(datadir)/zipcodes/ + # install -v -m 0644 -t images/* $(datadir)/images/ + cp -v -R images/* $(datadir)/images +- cp -v -R images/icon/* $(sharedir)/icons/cqrlog +- cp -v -R images/icon/* $(sharedir)/pixmaps/cqrlog ++# cp -v -R images/icon/* $(sharedir)/icons/cqrlog ++# cp -v -R images/icon/* $(sharedir)/pixmaps/cqrlog + # install -v -m 0644 images/icon/32x32/* $(datadir)/images/icon/32x32/ + # install -v -m 0644 images/icon/64x64/* $(datadir)/images/icon/64x64/ + # install -v -m 0644 images/icon/128x128/* $(datadir)/images/icon/128x128/ + # install -v -m 0644 images/icon/256x256/* $(datadir)/images/icon/256x256/ + # install -v -m 0644 images/* $(datadir)/images/ + install -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop +- install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png +- install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png ++# install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png ++# install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png + install -v -m 0644 src/changelog.html $(datadir)/changelog.html +- install -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz ++ install -v -m 0644 tools/cqrlog.1 $(sharedir)/man/man1/cqrlog.1 + deb: + dpkg-buildpackage -rfakeroot -i -I + deb_src: