diff --git a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _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: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -110,6 +113,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/lenny/applications/kbibtex/debian/cdbs/kde.mk b/debian/lenny/applications/kbibtex/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/debian/lenny/applications/kbibtex/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kbibtex/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,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/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kbibtex/debian/control b/debian/lenny/applications/kbibtex/debian/control index baf128689..ece779a30 100644 --- a/debian/lenny/applications/kbibtex/debian/control +++ b/debian/lenny/applications/kbibtex/debian/control @@ -2,7 +2,7 @@ Source: kbibtex-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 7.0.50~), quilt, autotools-dev, cdbs, automake, libtool, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev Standards-Version: 3.9.0 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git diff --git a/debian/lenny/applications/kbibtex/debian/docs b/debian/lenny/applications/kbibtex/debian/docs index 166765aba..ba6c8ac4b 100644 --- a/debian/lenny/applications/kbibtex/debian/docs +++ b/debian/lenny/applications/kbibtex/debian/docs @@ -1,2 +1,5 @@ +AUTHORS +BUGS NEWS +README TODO diff --git a/debian/lenny/applications/kbibtex/debian/rules b/debian/lenny/applications/kbibtex/debian/rules index 24b9a8fff..4a317e325 100755 --- a/debian/lenny/applications/kbibtex/debian/rules +++ b/debian/lenny/applications/kbibtex/debian/rules @@ -1,38 +1,20 @@ #!/usr/bin/make -f -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -LDFLAGS += -Wl,--as-needed -include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/lenny/applications/kbibtex/debian/watch b/debian/lenny/applications/kbibtex/debian/watch deleted file mode 100644 index a0b02fa2d..000000000 --- a/debian/lenny/applications/kbibtex/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-([\d\.]+)\.tar\.bz2 - diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _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: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -110,6 +113,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/kde.mk b/debian/squeeze/applications/kbibtex/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/debian/squeeze/applications/kbibtex/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kbibtex/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,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/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kbibtex/debian/control b/debian/squeeze/applications/kbibtex/debian/control index baf128689..ece779a30 100644 --- a/debian/squeeze/applications/kbibtex/debian/control +++ b/debian/squeeze/applications/kbibtex/debian/control @@ -2,7 +2,7 @@ Source: kbibtex-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 7.0.50~), quilt, autotools-dev, cdbs, automake, libtool, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev Standards-Version: 3.9.0 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git diff --git a/debian/squeeze/applications/kbibtex/debian/docs b/debian/squeeze/applications/kbibtex/debian/docs index 166765aba..ba6c8ac4b 100644 --- a/debian/squeeze/applications/kbibtex/debian/docs +++ b/debian/squeeze/applications/kbibtex/debian/docs @@ -1,2 +1,5 @@ +AUTHORS +BUGS NEWS +README TODO diff --git a/debian/squeeze/applications/kbibtex/debian/rules b/debian/squeeze/applications/kbibtex/debian/rules index 24b9a8fff..e5c16cf8a 100755 --- a/debian/squeeze/applications/kbibtex/debian/rules +++ b/debian/squeeze/applications/kbibtex/debian/rules @@ -1,38 +1,20 @@ #!/usr/bin/make -f -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -LDFLAGS += -Wl,--as-needed -include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/squeeze/applications/kbibtex/debian/watch b/debian/squeeze/applications/kbibtex/debian/watch deleted file mode 100644 index a0b02fa2d..000000000 --- a/debian/squeeze/applications/kbibtex/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-([\d\.]+)\.tar\.bz2 - diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _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: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -110,6 +113,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,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/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kbibtex/debian/control b/ubuntu/maverick/applications/kbibtex/debian/control index baf128689..ece779a30 100644 --- a/ubuntu/maverick/applications/kbibtex/debian/control +++ b/ubuntu/maverick/applications/kbibtex/debian/control @@ -2,7 +2,7 @@ Source: kbibtex-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 7.0.50~), quilt, autotools-dev, cdbs, automake, libtool, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev Standards-Version: 3.9.0 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git diff --git a/ubuntu/maverick/applications/kbibtex/debian/docs b/ubuntu/maverick/applications/kbibtex/debian/docs index 166765aba..ba6c8ac4b 100644 --- a/ubuntu/maverick/applications/kbibtex/debian/docs +++ b/ubuntu/maverick/applications/kbibtex/debian/docs @@ -1,2 +1,5 @@ +AUTHORS +BUGS NEWS +README TODO diff --git a/ubuntu/maverick/applications/kbibtex/debian/rules b/ubuntu/maverick/applications/kbibtex/debian/rules index 24b9a8fff..e5c16cf8a 100755 --- a/ubuntu/maverick/applications/kbibtex/debian/rules +++ b/ubuntu/maverick/applications/kbibtex/debian/rules @@ -1,38 +1,20 @@ #!/usr/bin/make -f -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -LDFLAGS += -Wl,--as-needed -include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/maverick/applications/kbibtex/debian/watch b/ubuntu/maverick/applications/kbibtex/debian/watch deleted file mode 100644 index a0b02fa2d..000000000 --- a/ubuntu/maverick/applications/kbibtex/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-([\d\.]+)\.tar\.bz2 -