diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-08-30 03:00:49 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-30 03:16:09 +0200 |
| commit | c3c1892f34dbbdd0b1a83781e6dcd8c9db1dc7f5 (patch) | |
| tree | 4a4a0dc84dd8795426ea2b1953ea59cc583dd9c3 | |
| parent | 42c1982c7bb2d27715b2f84c38db0a916f268fa2 (diff) | |
| download | tde-packaging-c3c1892f34dbbdd0b1a83781e6dcd8c9db1dc7f5.tar.gz tde-packaging-c3c1892f34dbbdd0b1a83781e6dcd8c9db1dc7f5.zip | |
Fix kstreamripper FTBFS on Debian and Ubuntu
(cherry picked from commit 3d082b0a7744791a2900f2021e50fa62b9c41ca3)
| -rwxr-xr-x | debian/lenny/applications/kstreamripper/debian/rules | 10 | ||||
| -rwxr-xr-x | debian/squeeze/applications/kstreamripper/debian/rules | 10 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kstreamripper/debian/rules | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/debian/lenny/applications/kstreamripper/debian/rules b/debian/lenny/applications/kstreamripper/debian/rules index 2d2d15924..9b9309541 100755 --- a/debian/lenny/applications/kstreamripper/debian/rules +++ b/debian/lenny/applications/kstreamripper/debian/rules @@ -1,14 +1,14 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 +#DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 PATH := /opt/trinity/bin:$(PATH) -build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) +build/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 $(MAKE) -install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install +install/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 DESTDIR=$(DEB_DESTDIR) $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/debian/squeeze/applications/kstreamripper/debian/rules b/debian/squeeze/applications/kstreamripper/debian/rules index 2d2d15924..9b9309541 100755 --- a/debian/squeeze/applications/kstreamripper/debian/rules +++ b/debian/squeeze/applications/kstreamripper/debian/rules @@ -1,14 +1,14 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 +#DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 PATH := /opt/trinity/bin:$(PATH) -build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) +build/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 $(MAKE) -install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install +install/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 DESTDIR=$(DEB_DESTDIR) $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/ubuntu/maverick/applications/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules index 2d2d15924..9b9309541 100755 --- a/ubuntu/maverick/applications/kstreamripper/debian/rules +++ b/ubuntu/maverick/applications/kstreamripper/debian/rules @@ -1,14 +1,14 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 +#DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 PATH := /opt/trinity/bin:$(PATH) -build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) +build/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 $(MAKE) -install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install +install/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 DESTDIR=$(DEB_DESTDIR) $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ |