From 53fe99952ff09fcdb71ad60ce83380fc6b9117a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 20 Sep 2019 17:28:58 +0200 Subject: [PATCH] DEB kdiff3: Switch to cmake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit a7e299ee4ef14356e1758d2421c498402080a9ae) --- .../_base/applications/kdiff3/debian/control | 2 +- .../kdiff3/debian/kdiff3-trinity.sgml | 258 ------------------ debian/_base/applications/kdiff3/debian/rules | 65 +---- debian/_base/applications/kdiff3/debian/watch | 6 - .../_base/applications/kdiff3/debian/control | 2 +- .../kdiff3/debian/kdiff3-trinity.sgml | 258 ------------------ ubuntu/_base/applications/kdiff3/debian/rules | 65 +---- ubuntu/_base/applications/kdiff3/debian/watch | 6 - 8 files changed, 24 insertions(+), 638 deletions(-) delete mode 100644 debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml delete mode 100644 debian/_base/applications/kdiff3/debian/watch delete mode 100644 ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml delete mode 100644 ubuntu/_base/applications/kdiff3/debian/watch diff --git a/debian/_base/applications/kdiff3/debian/control b/debian/_base/applications/kdiff3/debian/control index fbd410e27..e76b7c549 100644 --- a/debian/_base/applications/kdiff3/debian/control +++ b/debian/_base/applications/kdiff3/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Eike Sauer -Build-Depends: debhelper (>= 7.0.50~), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, docbook-to-man, libacl1-dev, libattr1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev Standards-Version: 3.8.4 Package: kdiff3-trinity diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml b/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml deleted file mode 100644 index eaf1d947e..000000000 --- a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml +++ /dev/null @@ -1,258 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'. - A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - EIKE"> - SAUER"> - - Oktober 2, 2006"> - - 1"> - eikes@cs.tu-berlin.de>"> - - KDIFF3"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003, 2006 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - compares two or three input files or directories - - - - &dhpackage; - - - - - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; tool. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - For comprehensive help, please see khelpcenter help:/kdiff3. - - - &dhpackage; is a program that - - compares or merges two or three text input files or directories - shows the differences line by line and character by character - provides an automatic merge-facility and - an integrated editor for comfortable solving of merge-conflicts - supports Unicode, UTF-8 and other codecs - supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.) - Printing of differences - Manual alignment of lines - Automatic merging of version control history ($Log$) - - - - - - OPTIONS - - This program follows the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a full summary of options, run - &dhpackage; --help. - - - - - - - - Merge the input. - - - - - - - Explicit base file. For compatibility with certain tools. - - - - - - - Output file. Implies -m. E.g.: -o newfile.txt - - - - - - - Output file, again. (For compatibility with certain tools.) - - - - - - - No GUI if all conflicts are auto-solvable. (Needs -o file) - - - - - - - Don't solve conflicts automatically. (For compatibility...) - - - - - - - Visible name replacement for first file/base file. - - - - - - - Visible name replacement for second file. - - - - - - - Visible name replacement for third file. - - - - - - - Visible name replacement. May by supplied for each input. - - - - - - - Change a setting, e. g. --cs "AutoAdvance=1". - - - - - - - Show a list of all settings and their values. - - - - - - - Use a different settings file. - - - - - - - Show author of program. - - - - - - - Show version of program. - - - - - - - Show license of program. - - - - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 - (or, at your option, any later version published by the Free - Software Foundation). - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - diff --git a/debian/_base/applications/kdiff3/debian/rules b/debian/_base/applications/kdiff3/debian/rules index 7eea3fbd6..18aa16b96 100755 --- a/debian/_base/applications/kdiff3/debian/rules +++ b/debian/_base/applications/kdiff3/debian/rules @@ -1,62 +1,19 @@ #!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -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 - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -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 - -build/kdiff3-trinity:: - dh_testdir - /usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1 - -install/kdiff3-trinity:: - dh_testdir - # move kdiff3.desktop to freedesktop.org conforming place - mkdir --parents debian/tmp/opt/trinity/share/applications/tde/ - mv debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop debian/tmp/opt/trinity/share/applications/tde/ - rmdir debian/tmp/opt/trinity/share/applnk/Development - -install/kdiff3-trinity-doc:: - dh_testdir - # that's not where we want to have a man page - rm -rf debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1 - # move HTML help /opt/trinity/share/doc/kdiff3/html/ - rm -rf debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3 - mkdir --parents debian/tmp/opt/trinity/share/doc/kdiff3/html/ - mv debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html debian/tmp/opt/trinity/share/doc/kdiff3/html/ - rmdir debian/tmp/opt/trinity/share/apps/kdiff3/doc - -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/trinity" \ + -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/_base/applications/kdiff3/debian/watch b/debian/_base/applications/kdiff3/debian/watch deleted file mode 100644 index 1f8b23456..000000000 --- a/debian/_base/applications/kdiff3/debian/watch +++ /dev/null @@ -1,6 +0,0 @@ -# As version numbering of KDiff3 has changed from 0.93, 0.931, ... to 0.9.50, 0.9.60, -# we have to dump the former ones. They would be considered to have a higher version -# number by uscan. Addition: Ignore a x.y.zz-QT version as well. - -version=3 -http://sf.net/kdiff3/kdiff3-(.\..\...)\.tar.gz debian uupdate diff --git a/ubuntu/_base/applications/kdiff3/debian/control b/ubuntu/_base/applications/kdiff3/debian/control index e97c8b697..63cdb9bdc 100644 --- a/ubuntu/_base/applications/kdiff3/debian/control +++ b/ubuntu/_base/applications/kdiff3/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Eike Sauer -Build-Depends: debhelper (>= 7.0.50~), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, docbook-to-man, libacl1-dev, libattr1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev Standards-Version: 3.8.4 Package: kdiff3-trinity diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml deleted file mode 100644 index eaf1d947e..000000000 --- a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml +++ /dev/null @@ -1,258 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'. - A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - EIKE"> - SAUER"> - - Oktober 2, 2006"> - - 1"> - eikes@cs.tu-berlin.de>"> - - KDIFF3"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003, 2006 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - compares two or three input files or directories - - - - &dhpackage; - - - - - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; tool. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - For comprehensive help, please see khelpcenter help:/kdiff3. - - - &dhpackage; is a program that - - compares or merges two or three text input files or directories - shows the differences line by line and character by character - provides an automatic merge-facility and - an integrated editor for comfortable solving of merge-conflicts - supports Unicode, UTF-8 and other codecs - supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.) - Printing of differences - Manual alignment of lines - Automatic merging of version control history ($Log$) - - - - - - OPTIONS - - This program follows the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a full summary of options, run - &dhpackage; --help. - - - - - - - - Merge the input. - - - - - - - Explicit base file. For compatibility with certain tools. - - - - - - - Output file. Implies -m. E.g.: -o newfile.txt - - - - - - - Output file, again. (For compatibility with certain tools.) - - - - - - - No GUI if all conflicts are auto-solvable. (Needs -o file) - - - - - - - Don't solve conflicts automatically. (For compatibility...) - - - - - - - Visible name replacement for first file/base file. - - - - - - - Visible name replacement for second file. - - - - - - - Visible name replacement for third file. - - - - - - - Visible name replacement. May by supplied for each input. - - - - - - - Change a setting, e. g. --cs "AutoAdvance=1". - - - - - - - Show a list of all settings and their values. - - - - - - - Use a different settings file. - - - - - - - Show author of program. - - - - - - - Show version of program. - - - - - - - Show license of program. - - - - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 - (or, at your option, any later version published by the Free - Software Foundation). - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - diff --git a/ubuntu/_base/applications/kdiff3/debian/rules b/ubuntu/_base/applications/kdiff3/debian/rules index 7eea3fbd6..18aa16b96 100755 --- a/ubuntu/_base/applications/kdiff3/debian/rules +++ b/ubuntu/_base/applications/kdiff3/debian/rules @@ -1,62 +1,19 @@ #!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -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 - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -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 - -build/kdiff3-trinity:: - dh_testdir - /usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1 - -install/kdiff3-trinity:: - dh_testdir - # move kdiff3.desktop to freedesktop.org conforming place - mkdir --parents debian/tmp/opt/trinity/share/applications/tde/ - mv debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop debian/tmp/opt/trinity/share/applications/tde/ - rmdir debian/tmp/opt/trinity/share/applnk/Development - -install/kdiff3-trinity-doc:: - dh_testdir - # that's not where we want to have a man page - rm -rf debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1 - # move HTML help /opt/trinity/share/doc/kdiff3/html/ - rm -rf debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3 - mkdir --parents debian/tmp/opt/trinity/share/doc/kdiff3/html/ - mv debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html debian/tmp/opt/trinity/share/doc/kdiff3/html/ - rmdir debian/tmp/opt/trinity/share/apps/kdiff3/doc - -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/trinity" \ + -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/_base/applications/kdiff3/debian/watch b/ubuntu/_base/applications/kdiff3/debian/watch deleted file mode 100644 index 1f8b23456..000000000 --- a/ubuntu/_base/applications/kdiff3/debian/watch +++ /dev/null @@ -1,6 +0,0 @@ -# As version numbering of KDiff3 has changed from 0.93, 0.931, ... to 0.9.50, 0.9.60, -# we have to dump the former ones. They would be considered to have a higher version -# number by uscan. Addition: Ignore a x.y.zz-QT version as well. - -version=3 -http://sf.net/kdiff3/kdiff3-(.\..\...)\.tar.gz debian uupdate