summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/lenny/applications/abakus/debian/control2
-rwxr-xr-xdebian/lenny/applications/abakus/debian/rules46
-rw-r--r--debian/squeeze/applications/abakus/debian/control2
-rwxr-xr-xdebian/squeeze/applications/abakus/debian/rules46
-rwxr-xr-xubuntu/maverick/applications/abakus/debian/rules15
5 files changed, 60 insertions, 51 deletions
diff --git a/debian/lenny/applications/abakus/debian/control b/debian/lenny/applications/abakus/debian/control
index 93c3d77c3..a5cd5363f 100644
--- a/debian/lenny/applications/abakus/debian/control
+++ b/debian/lenny/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), scons (>= 0.96), imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
Standards-Version: 3.8.4
Package: abakus-trinity
diff --git a/debian/lenny/applications/abakus/debian/rules b/debian/lenny/applications/abakus/debian/rules
index b434be427..10ec1e1b3 100755
--- a/debian/lenny/applications/abakus/debian/rules
+++ b/debian/lenny/applications/abakus/debian/rules
@@ -1,41 +1,39 @@
#!/usr/bin/make -f
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/langcore.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include debian/cdbs/debian-qt-kde.mk
+
+DEB_KDE_APIDOX := yes
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
-SCONS = scons --no-cache -Q
-DEB_INSTALL_DOCS_ALL =
-DEB_COMPRESS_EXCLUDE = .docbook
+# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
+# never build in parallel, regardless of DEB_BUILD_OPTIONS.
+DEB_BUILD_PARALLEL = true
-debian/abakus.xpm: src/hi64-app-abakus.png
+debian/abakus.xpm: icons/hi64-app-abakus.png
convert -resize 32 $< $@
-common-build-arch:: build-stamp
-build-stamp: debian/abakus.xpm
- 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 $(SCONS) configure prefix=/opt/trinity
- 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 $(SCONS)
- touch build-stamp
+common-build-arch:: debian/abakus.xpm
common-install-arch::
- 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 $(SCONS) install
install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm
chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus
dh_icons -pabakus
clean::
- #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 $(SCONS) --clean
rm -f debian/abakus.xpm
- rm -rf cache
- rm -rf .sconf_temp
- rm -f bksys/generic.pyc
- rm -f bksys/abakus.pyc
- rm -f bksys/help.pyc
- rm -f bksys/kde.pyc
- rm -f config.log
diff --git a/debian/squeeze/applications/abakus/debian/control b/debian/squeeze/applications/abakus/debian/control
index 93c3d77c3..a5cd5363f 100644
--- a/debian/squeeze/applications/abakus/debian/control
+++ b/debian/squeeze/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), scons (>= 0.96), imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
Standards-Version: 3.8.4
Package: abakus-trinity
diff --git a/debian/squeeze/applications/abakus/debian/rules b/debian/squeeze/applications/abakus/debian/rules
index b434be427..10ec1e1b3 100755
--- a/debian/squeeze/applications/abakus/debian/rules
+++ b/debian/squeeze/applications/abakus/debian/rules
@@ -1,41 +1,39 @@
#!/usr/bin/make -f
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/langcore.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include debian/cdbs/debian-qt-kde.mk
+
+DEB_KDE_APIDOX := yes
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
-SCONS = scons --no-cache -Q
-DEB_INSTALL_DOCS_ALL =
-DEB_COMPRESS_EXCLUDE = .docbook
+# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
+# never build in parallel, regardless of DEB_BUILD_OPTIONS.
+DEB_BUILD_PARALLEL = true
-debian/abakus.xpm: src/hi64-app-abakus.png
+debian/abakus.xpm: icons/hi64-app-abakus.png
convert -resize 32 $< $@
-common-build-arch:: build-stamp
-build-stamp: debian/abakus.xpm
- 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 $(SCONS) configure prefix=/opt/trinity
- 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 $(SCONS)
- touch build-stamp
+common-build-arch:: debian/abakus.xpm
common-install-arch::
- 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 $(SCONS) install
install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm
chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus
dh_icons -pabakus
clean::
- #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 $(SCONS) --clean
rm -f debian/abakus.xpm
- rm -rf cache
- rm -rf .sconf_temp
- rm -f bksys/generic.pyc
- rm -f bksys/abakus.pyc
- rm -f bksys/help.pyc
- rm -f bksys/kde.pyc
- rm -f config.log
diff --git a/ubuntu/maverick/applications/abakus/debian/rules b/ubuntu/maverick/applications/abakus/debian/rules
index 8041bcf1e..10ec1e1b3 100755
--- a/ubuntu/maverick/applications/abakus/debian/rules
+++ b/ubuntu/maverick/applications/abakus/debian/rules
@@ -23,4 +23,17 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true \ No newline at end of file
+DEB_BUILD_PARALLEL = true
+
+debian/abakus.xpm: icons/hi64-app-abakus.png
+ convert -resize 32 $< $@
+
+common-build-arch:: debian/abakus.xpm
+
+common-install-arch::
+ install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm
+ chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus
+ dh_icons -pabakus
+
+clean::
+ rm -f debian/abakus.xpm