From 36f8fe535ea852baa93dcdd9cf1a71241e7b04e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 24 Feb 2019 15:27:32 +0100 Subject: DEB kbarcode: Switch to cmake. The man page has been moved to the main tree. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../kbarcode/debian/cdbs/debian-qt-kde.mk | 4 + .../applications/kbarcode/debian/cdbs/kde.mk | 4 +- .../maverick/applications/kbarcode/debian/control | 2 +- ubuntu/maverick/applications/kbarcode/debian/docs | 2 + .../applications/kbarcode/debian/kbarcode.1 | 194 --------------------- ubuntu/maverick/applications/kbarcode/debian/rules | 48 ++--- .../kbarcode/debian/source.lintian-overrides | 1 - ubuntu/maverick/applications/kbarcode/debian/watch | 2 - 8 files changed, 22 insertions(+), 235 deletions(-) delete mode 100644 ubuntu/maverick/applications/kbarcode/debian/kbarcode.1 delete mode 100644 ubuntu/maverick/applications/kbarcode/debian/source.lintian-overrides delete mode 100644 ubuntu/maverick/applications/kbarcode/debian/watch (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kbarcode/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/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kbarcode/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/kbarcode/debian/control b/ubuntu/maverick/applications/kbarcode/debian/control index 02773eade..6921040cc 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/control +++ b/ubuntu/maverick/applications/kbarcode/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbarcode-trinity diff --git a/ubuntu/maverick/applications/kbarcode/debian/docs b/ubuntu/maverick/applications/kbarcode/debian/docs index 724e08449..c17f03764 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/docs +++ b/ubuntu/maverick/applications/kbarcode/debian/docs @@ -1,2 +1,4 @@ +AUTHORS +NEWS README TODO diff --git a/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1 b/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1 deleted file mode 100644 index b81aee534..000000000 --- a/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1 +++ /dev/null @@ -1,194 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KBARCODE 1 "Jun 2006" "Trinity Desktop Environment" "barcode and label printing" -.SH NAME -kbarcode -\- KBarcode is a barcode and label printing application -.SH SYNOPSIS -\fBkbarcode\fP [Qt\-options] [TDE\-options] [\fIfile\fP] -.SH DESCRIPTION -\fBKBarcode\fP is a barcode and label printing application for TDE. It can be used to print everything from simple business cards up to complex labels with several barcodes, such as article descriptions. -.sp 1 -\fBKBarcode\fP comes with an easy\-to\-use WYSIWYG label designer, a setup wizard, batch import of labels (directly from the delivery note), thousands of predefined labels, database management tools, and translations in many languages. -.sp 1 -Even printing more than 10,000 labels in one go is no problem for \fBKBarcode\fP. -.sp 1 -Additionally, it is a simple xbarcode replacement for the creation of barcodes. All major types of barcodes like EAN, UPC, CODE39, and ISBN are supported. -.SH OPTIONS -.SS -.SS Arguments: -.TP -.B file -load label -.SS -.SS Options: -.TP -.BR \-b \ +[ \fIfile\fP ] -import data for batch printing -.TP -.BR \-l \ +[ \fIfile\fP ] -label for batch printing -.TP -.B \-c -customer id for batch printing -.TP -.B \-d -Printer/destination to print on -.TP -.B \-\-single -start as xbarcode replacement -.TP -.B \-\-batch -start in batch printing mode -.TP -.B \-\-label -start label editor -.TP -.B \-\-print -print immediately in batch mode -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display -Use the X\-server display 'displayname' -.TP -.B \-\-session -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font -defines the application font -.TP -.B \-\-bg, \-\-background -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground -sets the default foreground color -.TP -.B \-\-btn, \-\-button -sets the default button color -.TP -.B \-\-name -sets the application name -.TP -.B \-\-title -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget \- see man X for the argument format -.SS - -.SH SEE ALSO -.TP -\fI/usr/share/apps/kbarcode/barcodes.html\fP -informations about different barcodes -.TP -\fBhttp://freshmeat.net/projects/kbarcode/\fP -\fBKBarcode\fP project page -.TP -\fBhttp://www.kbarcode.net/\fP -\fBKBarcode\fP home page -.br -.SH AUTHORS -.nf -Dominik Seichter <domseichter@web.de> -.br -Stefan "Stonki" Onken <support@stonki.de> -.br - -.br -.fi -Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (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 or any later version published by the Free Software Foundation. -.PP -On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/applications/kbarcode/debian/rules b/ubuntu/maverick/applications/kbarcode/debian/rules index f0aedb1c7..e5c16cf8a 100755 --- a/ubuntu/maverick/applications/kbarcode/debian/rules +++ b/ubuntu/maverick/applications/kbarcode/debian/rules @@ -1,44 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.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 - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_INSTALL_MANPAGES_kbarcode-trinity := debian/kbarcode.1 - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -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 - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -makebuilddir/kbarcode-trinity:: - find . -type f -name Makefile.in | xargs rm -f - $(MAKE) -f admin/Makefile.common - -binary-install/kbarcode-trinity:: - mv debian/kbarcode-trinity/usr/share/man debian/kbarcode-trinity/opt/trinity/share/ +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/kbarcode/debian/source.lintian-overrides b/ubuntu/maverick/applications/kbarcode/debian/source.lintian-overrides deleted file mode 100644 index cb165370f..000000000 --- a/ubuntu/maverick/applications/kbarcode/debian/source.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -kbarcode-trinity source: source-contains-CVS-dir admin/CVS diff --git a/ubuntu/maverick/applications/kbarcode/debian/watch b/ubuntu/maverick/applications/kbarcode/debian/watch deleted file mode 100644 index f0291570e..000000000 --- a/ubuntu/maverick/applications/kbarcode/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kbarcode/kbarcode-(.*)\.tar\.gz debian svn-upgrade -- cgit v1.2.1