diff options
Diffstat (limited to 'ubuntu/maverick/applications/knetworkmanager/debian')
4 files changed, 56 insertions, 24 deletions
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk index 888f4be38..47e83ef4a 100644 --- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,9 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk index 9dbcfbafd..5b6508f8c 100644 --- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager/debian/control index d1389862e..d1bde2e36 100644 --- a/ubuntu/maverick/applications/knetworkmanager/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, libnm-glib-dev (>= 0.7.0), network-manager-dev (>= 0.7.0), libhal-dev, - libdbus-1-tqt-dev (>= 0.8.1), + libdbus-1-qt3-dev (>= 0.8.1), libiw-dev, libnl-dev (>= 1.1), quilt, @@ -18,11 +18,11 @@ Build-Depends: cdbs, network-manager-openvpn, network-manager-strongswan, network-manager-pptp, - libtool, libltdl-dev, cmake -Standards-Version: 3.8.3 + automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 Homepage: http://opensuse.org/Projects/KNetworkManager -Package: network-manager-tde +Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/rules b/ubuntu/maverick/applications/knetworkmanager/debian/rules index 5043dd652..97955e38b 100755 --- a/ubuntu/maverick/applications/knetworkmanager/debian/rules +++ b/ubuntu/maverick/applications/knetworkmanager/debian/rules @@ -1,26 +1,47 @@ #!/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/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 +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -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" \ --DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON" +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 + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop + +clean:: + find . -name Makefile.in | xargs rm -f + rm -f aclocal.m4 + rm -f acinclude.m4 + rm -f configure + rm -f configure.files + rm -f configure.in + rm -f config.h.in + rm -f stamp-h.in + rm -f subdirs + rm -f admin/ltmain.sh + rm -f admin/libtool.m4.in + rm -f debian/stamp-bootstrap |