From 7cd3999fccd80ebfa99d60745d0a77a25cd4cddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Sat, 14 Mar 2015 09:03:25 +0000 Subject: [PATCH] some fixes, does not yet compile --- AUTHORS | 1 + ChangeLog | 16 ++ README | 14 +- bootstrap.sh | 2 +- debian/changelog.in | 7 +- debian/control.in | 27 ++- debian/copyright | 27 +++ debian/cron.d.ex | 4 + debian/dirs | 0 debian/emacsen-install.ex | 45 +++++ debian/emacsen-remove.ex | 15 ++ debian/emacsen-startup.ex | 25 +++ debian/manpage.1.ex | 59 +++++++ debian/manpage.sgml.ex | 154 +++++++++++++++++ debian/manpage.xml.ex | 291 +++++++++++++++++++++++++++++++++ debian/menu | 13 ++ debian/menu.ex | 2 + debian/postinst.ex | 39 +++++ debian/postrm.ex | 37 +++++ debian/preinst.ex | 35 ++++ debian/prerm.ex | 38 +++++ debian/rules | 8 + debian/shlibs.local.ex | 1 + debian/swisssurfer-dev.dirs | 1 + debian/swisssurfer-dev.install | 11 +- debian/swisssurfer.dirs | 2 + debian/swisssurfer.doc-base.EX | 23 +++ debian/swisssurfer.install | 21 ++- debian/watch.ex | 23 +++ src/designer/makefile.am | 26 +-- src/languages.qrc.in | 8 +- src/qmake.pro.in | 10 +- src/version.cxx.in | 6 +- swisssurfer.spec.in | 28 ++-- 34 files changed, 952 insertions(+), 67 deletions(-) create mode 100644 debian/copyright create mode 100644 debian/cron.d.ex create mode 100644 debian/dirs create mode 100644 debian/emacsen-install.ex create mode 100644 debian/emacsen-remove.ex create mode 100644 debian/emacsen-startup.ex create mode 100644 debian/manpage.1.ex create mode 100644 debian/manpage.sgml.ex create mode 100644 debian/manpage.xml.ex create mode 100644 debian/menu create mode 100644 debian/menu.ex create mode 100644 debian/postinst.ex create mode 100644 debian/postrm.ex create mode 100644 debian/preinst.ex create mode 100644 debian/prerm.ex create mode 100644 debian/shlibs.local.ex create mode 100644 debian/swisssurfer.doc-base.EX create mode 100644 debian/watch.ex diff --git a/AUTHORS b/AUTHORS index e69de29..bd79912 100644 --- a/AUTHORS +++ b/AUTHORS @@ -0,0 +1 @@ +Marc Wäckerlin (http://marc.waeckerlin.org) diff --git a/ChangeLog b/ChangeLog index 6ab72d4..1593819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2015-03-13 16:30 marc + + * ChangeLog, ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, + ax_init_standard_project.m4, bootstrap.sh, configure.ac, debian, + debian/changelog.in, debian/compat, debian/control.in, + debian/docs, debian/rules, debian/swisssurfer-dev.dirs, + debian/swisssurfer-dev.install, debian/swisssurfer.dirs, + debian/swisssurfer.install, doc/doxyfile.in, doc/makefile.am, + examples, examples/makefile.am, makefile.am, src/makefile.am, + src/qbrowserlib/makefile.am, src/swisssurfer.pc.in, + test/makefile.am: «bootstrapped» with new build environment + +2015-03-13 10:18 marc + + * configure.ac, configure.in: renaming configure.in to configure.ac + 2015-03-08 19:16 marc * README, configure.in, debian/changelog.in, debian/control, diff --git a/README b/README index e2cd478..30b1a12 100644 --- a/README +++ b/README @@ -1,11 +1,5 @@ -Zum Konfigurieren muss der Pfad zur Installation des gepatchten Qts angegeben werden, z.B.: +SwissSurfer Light Weight Web Browser - ./bootstrap.sh && \ - QMAKE=/usr/local/Trolltech/Qt-4.6.3/bin/qmake ./configure && \ - make - -Start e.g. with: - -SWISSSIGNER='java -Xmx256M -Dorg.jpedal.jai=true -Dswing.aatext=true -Dch.abacus.swisssigner.incamail.certlogin=false -splash:swisssigner-splash.png -Dch.abacus.pkcs11.configuration=swisssigner-pkcs11.cfg -Duser.language=de -cp /home/marc/downloads/swisssigner/swisssigner.jar:/home/marc/downloads/swisssigner/bc.jar:bcmail.jar:/home/marc/downloads/swisssigner/bcpg.jar:/home/marc/downloads/swisssigner/bctsp.jar:/home/marc/downloads/swisssigner/exml.jar:/home/marc/downloads/swisssigner/itext.jar:/home/marc/downloads/swisssigner/jai_codec.jar:/home/marc/downloads/swisssigner/jai_core.jar:/home/marc/downloads/swisssigner/jai_imageio.jar:/home/marc/downloads/swisssigner/jdic.jar:/home/marc/downloads/swisssigner/jdic_native.jar:/home/marc/downloads/swisssigner/jdic_stub_unix.jar:/home/marc/downloads/swisssigner/jpedal.jar: ch.abacus.hotdog.SwissSigner locale=de document=%1 browser_bin=firefox keystores=pkcs11' - -src/swisssurfer --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten +A leight weight WebKit based Qt Webbroswer that supports PKCS#11 +hardware smartcard token, i.e. it supports the SuisseID. Formerly +delivered as SwissBrowser on SwissStick. diff --git a/bootstrap.sh b/bootstrap.sh index 14edcfe..22fa597 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -267,7 +267,7 @@ usr/include EOF fi to debian/rules < Wed, 07 Apr 2010 10:23:02 +0200 diff --git a/debian/control.in b/debian/control.in index 9605f1a..7f75545 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,18 +1,27 @@ Source: @PACKAGE_NAME@ +Section: web Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, libcppunit-dev, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools +Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, libcppunit-dev, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, libpcscxx-dev +Standards-Version: 3.8.1 +Homepage: https://dev.marc.waeckerlin.org/redmine/projects/swisssurfer -Package: @PACKAGE_NAME@ -Section: libs +Package: @PACKAGE_NAME@-dev +Provides: swissbrowser-dev +Conflicts: swissbrowser-dev +Replaces: swissbrowser-dev +Section: devel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: @DESCRIPTION@ +Depends: @PACKAGE_NAME@ (= ${binary:Version}) +Description: @PACKAGE_NAME@ - Development Package @README_DEB@ -Package: @PACKAGE_NAME@-dev -Section: libdevel +Package: @PACKAGE_NAME@ +Provides: swissbrowser +Conflicts: swissbrowser +Replaces: swissbrowser +Section: web Architecture: any -Depends: @PACKAGE_NAME@ (= ) -Description: @DESCRIPTION@ - Development Package +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: @PACKAGE_NAME@ @README_DEB@ diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..0f6876d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Marc Wäckerlin (SwissSign AG) on +Wed, 07 Apr 2010 10:23:02 +0200. + +It was downloaded from https://dev.swisssign.com/projects/swisssurfer +It was downloaded from https://dev.swisssign.com/projects/swisssurfer + +Upstream Author(s): + + Marc Wäckerlin (SwissSign AG) + +Copyright: + + Marc Wäckerlin (SwissSign AG) + +License: + + LGPL version 3 + +The Debian packaging is: + + Copyright (C) 2010 Marc Wäckerlin (SwissSign AG) + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff --git a/debian/cron.d.ex b/debian/cron.d.ex new file mode 100644 index 0000000..211a129 --- /dev/null +++ b/debian/cron.d.ex @@ -0,0 +1,4 @@ +# +# Regular cron jobs for the init package +# +0 4 * * * root [ -x /usr/bin/init_maintenance ] && /usr/bin/init_maintenance diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e69de29 diff --git a/debian/emacsen-install.ex b/debian/emacsen-install.ex new file mode 100644 index 0000000..270ae54 --- /dev/null +++ b/debian/emacsen-install.ex @@ -0,0 +1,45 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/init + +# Written by Jim Van Zandt , borrowing heavily +# from the install scripts for gettext by Santiago Vila +# and octave by Dirk Eddelbuettel . + +FLAVOR=$1 +PACKAGE=init + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /usr/sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 diff --git a/debian/emacsen-remove.ex b/debian/emacsen-remove.ex new file mode 100644 index 0000000..53656c9 --- /dev/null +++ b/debian/emacsen-remove.ex @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/init + +FLAVOR=$1 +PACKAGE=init + +if [ ${FLAVOR} != emacs ]; then + if test -x /usr/sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/init.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi diff --git a/debian/emacsen-startup.ex b/debian/emacsen-startup.ex new file mode 100644 index 0000000..58c1fae --- /dev/null +++ b/debian/emacsen-startup.ex @@ -0,0 +1,25 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50init.el +;; for the Debian init package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; The init package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(let ((package-dir (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/init"))) +;; If package-dir does not exist, the init package must have +;; removed but not purged, and we should skip the setup. + (when (file-directory-p package-dir) + (setq load-path (cons package-dir load-path)) + (autoload 'init-mode "init-mode" + "Major mode for editing init files." t) + (add-to-list 'auto-mode-alist '("\\.init$" . init-mode)))) + diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex new file mode 100644 index 0000000..a74da1f --- /dev/null +++ b/debian/manpage.1.ex @@ -0,0 +1,59 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH INIT SECTION "April 8, 2010" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +init \- program to do something +.SH SYNOPSIS +.B init +.RI [ options ] " files" ... +.br +.B bar +.RI [ options ] " files" ... +.SH DESCRIPTION +This manual page documents briefly the +.B init +and +.B bar +commands. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBinit\fP is a program that... +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.SH SEE ALSO +.BR bar (1), +.BR baz (1). +.br +The programs are documented fully by +.IR "The Rise and Fall of a Fooish Bar" , +available via the Info system. +.SH AUTHOR +init was written by . +.PP +This manual page was written by Marc Wäckerlin (SwissSign AG) , +for the Debian project (and may be used by others). diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex new file mode 100644 index 0000000..b7ee501 --- /dev/null +++ b/debian/manpage.sgml.ex @@ -0,0 +1,154 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.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. + + --> + + + FIRSTNAME"> + SURNAME"> + + April 8, 2010"> + + SECTION"> + marc.waeckerlin@tech.swisssign.com"> + + INIT"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + program to do something + + + + &dhpackage; + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; and bar + commands. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + Instead, it has documentation in the &gnu; + Info format; see below. + + &dhpackage; is a program that... + + + + OPTIONS + + These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a complete description, see the + Info files. + + + + + + + + Show summary of options. + + + + + + + + Show version of program. + + + + + + SEE ALSO + + bar (1), baz (1). + + The programs are documented fully by The Rise and + Fall of a Fooish Bar available via the + Info system. + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (and 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 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/manpage.xml.ex b/debian/manpage.xml.ex new file mode 100644 index 0000000..23b0a5f --- /dev/null +++ b/debian/manpage.xml.ex @@ -0,0 +1,291 @@ + +.
will be generated. You may view the +manual page with: nroff -man .
| less'. A typical entry +in a Makefile or Makefile.am is: + +DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" + +manpage.1: manpage.xml + $(XP) $(DB2MAN) $< + +The xsltproc binary is found in the xsltproc package. The XSL files are in +docbook-xsl. A description of the parameters you can use can be found in the +docbook-xsl-doc-* packages. 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 xsltproc and docbook-xsl in your Build-Depends control field. +Alternatively use the xmlto command/package. That will also automatically +pull in xsltproc and docbook-xsl. + +Notes for using docbook2x: docbook2x-man does not automatically create the +AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as + ... . + +To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections +read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be +found in the docbook-xsl-doc-html package. + +Validation can be done using: `xmllint -''-noout -''-valid manpage.xml` + +General documentation about man-pages and man-page-formatting: +man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ + +--> + + + + + + + + + + + + + +]> + + + + &dhtitle; + &dhpackage; + + + &dhfirstname; + &dhsurname; + Wrote this manpage for the Debian system. +
+ &dhemail; +
+ + + + 2007 + &dhusername; + + + This manual page was written for the Debian system + (and 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. + + + + &dhucpackage; + &dhsection; + + + &dhpackage; + program to do something + + + + &dhpackage; + + + + + + + + + this + + + + + + + + this + that + + + + + &dhpackage; + + + + + + + + + + + + + + + + + + + DESCRIPTION + This manual page documents briefly the + &dhpackage; and bar + commands. + This manual page was written for the Debian distribution + because the original program does not have a manual page. + Instead, it has documentation in the GNU + info + 1 + format; see below. + &dhpackage; is a program that... + + + OPTIONS + The program follows the usual GNU command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a complete description, see the + + info + 1 + files. + + + + + + + Does this and that. + + + + + + + Show summary of options. + + + + + + + Show version of program. + + + + + + FILES + + + /etc/foo.conf + + The system-wide configuration file to control the + behaviour of &dhpackage;. See + + foo.conf + 5 + for further details. + + + + ${HOME}/.foo.conf + + The per-user configuration file to control the + behaviour of &dhpackage;. See + + foo.conf + 5 + for further details. + + + + + + ENVIONMENT + + + FOO_CONF + + If used, the defined file is used as configuration + file (see also ). + + + + + + DIAGNOSTICS + The following diagnostics may be issued + on stderr: + + + Bad configuration file. Exiting. + + The configuration file seems to contain a broken configuration + line. Use the option, to get more info. + + + + + &dhpackage; provides some return codes, that can + be used in scripts: + + Code + Diagnostic + + 0 + Program exited successfully. + + + 1 + The configuration file seems to be broken. + + + + + + BUGS + The program is currently limited to only work + with the foobar library. + The upstreams BTS can be found + at . + + + SEE ALSO + + + bar + 1 + , + baz + 1 + , + foo.conf + 5 + + The programs are documented fully by The Rise and + Fall of a Fooish Bar available via the + info + 1 + system. + + + diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..b9ab4fc --- /dev/null +++ b/debian/menu @@ -0,0 +1,13 @@ +?package(swisssurfer):\ +?package(swisssurfer):\ + needs="X11"\ + hints="Lightweight,Fast,Small,Security,SSL,Cryptoki,Certificate"\ + section="Applications/Network/Web Browsing"\ + title="SwissSurfer"\ + title="SwissSurfer"\ + longtitle="SwissSurfer Internet Browser"\ + longtitle="SwissSurfer Internet Browser"\ + command="/usr/bin/swisssurfer"\ + command="/usr/bin/swisssurfer"\ + icon="/usr/share/swisssurfer/swisssurfer.xpm" + icon="/usr/share/swisssurfer/swisssurfer.xpm" diff --git a/debian/menu.ex b/debian/menu.ex new file mode 100644 index 0000000..3f387e8 --- /dev/null +++ b/debian/menu.ex @@ -0,0 +1,2 @@ +?package(init):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ + title="init" command="/usr/bin/init" diff --git a/debian/postinst.ex b/debian/postinst.ex new file mode 100644 index 0000000..2a7188b --- /dev/null +++ b/debian/postinst.ex @@ -0,0 +1,39 @@ +#!/bin/sh +# postinst script for init +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/postrm.ex b/debian/postrm.ex new file mode 100644 index 0000000..0850e9b --- /dev/null +++ b/debian/postrm.ex @@ -0,0 +1,37 @@ +#!/bin/sh +# postrm script for init +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/preinst.ex b/debian/preinst.ex new file mode 100644 index 0000000..70b142e --- /dev/null +++ b/debian/preinst.ex @@ -0,0 +1,35 @@ +#!/bin/sh +# preinst script for init +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/prerm.ex b/debian/prerm.ex new file mode 100644 index 0000000..aac0e70 --- /dev/null +++ b/debian/prerm.ex @@ -0,0 +1,38 @@ +#!/bin/sh +# prerm script for init +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 90d801b..741360d 100644 --- a/debian/rules +++ b/debian/rules @@ -1,2 +1,10 @@ +## @id $Id$ +# +# This file has been added by bootstrap.sh on Sat, 14 Mar 2015 09:48:31 +0100 +# Feel free to change it or even remove and rebuild it, up to your needs +# +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + %: dh diff --git a/debian/shlibs.local.ex b/debian/shlibs.local.ex new file mode 100644 index 0000000..2566e8d --- /dev/null +++ b/debian/shlibs.local.ex @@ -0,0 +1 @@ +libproxyface 1.0.34 proxyface (>> 1.0.34-0), proxyface (<< 1.0.34-99) diff --git a/debian/swisssurfer-dev.dirs b/debian/swisssurfer-dev.dirs index 4418816..995e528 100644 --- a/debian/swisssurfer-dev.dirs +++ b/debian/swisssurfer-dev.dirs @@ -1,2 +1,3 @@ usr/lib usr/include +usr/share diff --git a/debian/swisssurfer-dev.install b/debian/swisssurfer-dev.install index 3c996c8..5c30e62 100644 --- a/debian/swisssurfer-dev.install +++ b/debian/swisssurfer-dev.install @@ -1,6 +1,9 @@ +usr/share/doc/swisssurfer/html +usr/share/doc/swisssurfer/html usr/include/* -usr/lib/lib*.a +#usr/lib/lib*.a usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/lib/*.la -usr/share/pkgconfig/* +usr/share/qt4 +#usr/lib/*.la +#usr/lib/pkgconfig +#usr/share/pkgconfig diff --git a/debian/swisssurfer.dirs b/debian/swisssurfer.dirs index 6845771..79c81dd 100644 --- a/debian/swisssurfer.dirs +++ b/debian/swisssurfer.dirs @@ -1 +1,3 @@ usr/lib +usr/bin +usr/share diff --git a/debian/swisssurfer.doc-base.EX b/debian/swisssurfer.doc-base.EX new file mode 100644 index 0000000..0d3840a --- /dev/null +++ b/debian/swisssurfer.doc-base.EX @@ -0,0 +1,23 @@ +Document: swisssurfer +Document: swisssurfer +Title: Debian swisssurfer Manual +Title: Debian swisssurfer Manual +Author: +Abstract: This manual describes what swisssurfer is +Abstract: This manual describes what swisssurfer is + and how it can be used to + manage online manuals on Debian systems. +Section: unknown + +Format: debiandoc-sgml +Files: /usr/share/doc/proxyface/proxyface.sgml.gz + +Format: postscript +Files: /usr/share/doc/proxyface/proxyface.ps.gz + +Format: text +Files: /usr/share/doc/proxyface/proxyface.text.gz + +Format: HTML +Index: /usr/share/doc/proxyface/html/index.html +Files: /usr/share/doc/proxyface/html/*.html diff --git a/debian/swisssurfer.install b/debian/swisssurfer.install index bad9892..3225eef 100644 --- a/debian/swisssurfer.install +++ b/debian/swisssurfer.install @@ -1,2 +1,21 @@ -usr/bin/* +usr/bin/swisssurfer +usr/bin/swisssurfer +usr/share/applications/swisssurfer.desktop +usr/share/applications/swisssurfer.desktop +usr/share/swisssurfer/swisssurfer.xpm +usr/share/swisssurfer/swisssurfer.xpm +usr/share/swisssurfer/swisssurfer.png +usr/share/swisssurfer/swisssurfer.png +usr/share/doc/swisssurfer/AUTHORS +usr/share/doc/swisssurfer/AUTHORS +usr/share/doc/swisssurfer/NEWS +usr/share/doc/swisssurfer/NEWS +usr/share/doc/swisssurfer/README +usr/share/doc/swisssurfer/README +usr/share/doc/swisssurfer/COPYING +usr/share/doc/swisssurfer/COPYING +usr/share/doc/swisssurfer/INSTALL +usr/share/doc/swisssurfer/INSTALL +usr/share/doc/swisssurfer/ChangeLog +usr/share/doc/swisssurfer/ChangeLog usr/lib/lib*.so.* diff --git a/debian/watch.ex b/debian/watch.ex new file mode 100644 index 0000000..9e3713b --- /dev/null +++ b/debian/watch.ex @@ -0,0 +1,23 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# +#http://www.example.com/downloads.php proxyface-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/proxyface-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/proxyface-(.*)\.tar\.gz debian uupdate + +# Uncomment to find new files on sourceforge, for devscripts >= 2.9 +# http://sf.net/proxyface/proxyface-(.*)\.tar\.gz + +# Uncomment to find new files on GooglePages +# http://example.googlepages.com/foo.html proxyface-(.*)\.tar\.gz diff --git a/src/designer/makefile.am b/src/designer/makefile.am index f23fdd8..8a314cf 100644 --- a/src/designer/makefile.am +++ b/src/designer/makefile.am @@ -34,22 +34,22 @@ TARGETS = ${QMAKE_TARGET} QMAKE_MAKEFILE = ${QMAKE_TARGET:%=makefile.qmake.%} all: ${TARGETS} $ -#$(LANGS:%=@PACKAGENAME@_%.ts) +#$(LANGS:%=@PACKAGE_NAME@_%.ts) rebuild-ts: $(LANGS) ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} # ${LANGS}: ${ALL_SRC} -# -rm @PACKAGENAME@_$@.qm -# svn revert @PACKAGENAME@_$@.ts -# mv @PACKAGENAME@_$@.ts translation.old +# -rm @PACKAGE_NAME@_$@.qm +# svn revert @PACKAGE_NAME@_$@.ts +# mv @PACKAGE_NAME@_$@.ts translation.old # ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} -# mv @PACKAGENAME@_$@.ts translation.new -# echo '' > @PACKAGENAME@_$@.ts -# echo '' >> @PACKAGENAME@_$@.ts -# echo '' >> @PACKAGENAME@_$@.ts -# xqilla merge-translation.xquery >> @PACKAGENAME@_$@.ts -# echo '' >> @PACKAGENAME@_$@.ts +# mv @PACKAGE_NAME@_$@.ts translation.new +# echo '' > @PACKAGE_NAME@_$@.ts +# echo '' >> @PACKAGE_NAME@_$@.ts +# echo '' >> @PACKAGE_NAME@_$@.ts +# xqilla merge-translation.xquery >> @PACKAGE_NAME@_$@.ts +# echo '' >> @PACKAGE_NAME@_$@.ts # rm translation.old translation.new print: @@ -62,7 +62,7 @@ print: @echo "TARGETS=${TARGETS}" -# @PACKAGENAME@_%.qm: @srcdir@/@PACKAGENAME@_%.ts +# @PACKAGE_NAME@_%.qm: @srcdir@/@PACKAGE_NAME@_%.ts # ${LRELEASE} $< -qm $@ %.xpm: resources/%.png @@ -74,7 +74,7 @@ print: ${QMAKE_MAKEFILE}: ${QMAKE_PROJECT} ${ALL_SRC} ${QMAKE} -o $@ $< CONFIG+=${@:makefile.qmake.%=%} -# $(LANGS:%=@PACKAGENAME@_%.qm) +# $(LANGS:%=@PACKAGE_NAME@_%.qm) ${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} make -f makefile.qmake.$@ @@ -92,7 +92,7 @@ uninstall-local: clean-local: -rm -r ${QMAKE_TARGET:%=lib%*} -# $(LANGS:%=@PACKAGENAME@_%.qm) +# $(LANGS:%=@PACKAGE_NAME@_%.qm) CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} \ *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.dll \ ${QMAKE_TARGET:%=lib%*} diff --git a/src/languages.qrc.in b/src/languages.qrc.in index 57f0a61..3f91af1 100644 --- a/src/languages.qrc.in +++ b/src/languages.qrc.in @@ -1,8 +1,8 @@ - @PACKAGENAME@_de.qm - @PACKAGENAME@_fr.qm - @PACKAGENAME@_it.qm - @PACKAGENAME@_en.qm + @PACKAGE_NAME@_de.qm + @PACKAGE_NAME@_fr.qm + @PACKAGE_NAME@_it.qm + @PACKAGE_NAME@_en.qm diff --git a/src/qmake.pro.in b/src/qmake.pro.in index 12f3f7b..e3327e0 100644 --- a/src/qmake.pro.in +++ b/src/qmake.pro.in @@ -31,10 +31,10 @@ win32 { } ICON = swisssurfer.icns -TRANSLATIONS = @PACKAGENAME@_en.ts \ - @PACKAGENAME@_de.ts \ - @PACKAGENAME@_fr.ts \ - @PACKAGENAME@_it.ts +TRANSLATIONS = @PACKAGE_NAME@_en.ts \ + @PACKAGE_NAME@_de.ts \ + @PACKAGE_NAME@_fr.ts \ + @PACKAGE_NAME@_it.ts SOURCES = @srcdir@/main.cxx @@ -54,7 +54,7 @@ FORMS = @srcdir@/browser.ui \ RESOURCES = languages.qrc @srcdir@/resources.qrc -TARGET = @PACKAGENAME@ +TARGET = @PACKAGE_NAME@ CODECFORSRC = UTF-8 CODECFORTR = UTF-8 diff --git a/src/version.cxx.in b/src/version.cxx.in index 89d7fbf..cbc4dca 100644 --- a/src/version.cxx.in +++ b/src/version.cxx.in @@ -9,8 +9,8 @@ namespace xml { std::string version() { - return "@PACKAGENAME@-@VERSION@"; + return "@PACKAGE_NAME@-@VERSION@"; } - const std::string WHAT("#(@) @PACKAGENAME@-@VERSION@"); - const std::string IDENT("$Id: @PACKAGENAME@-@VERSION@ $"); + const std::string WHAT("#(@) @PACKAGE_NAME@-@VERSION@"); + const std::string IDENT("$Id: @PACKAGE_NAME@-@VERSION@ $"); } diff --git a/swisssurfer.spec.in b/swisssurfer.spec.in index a3e520a..4cb2d95 100644 --- a/swisssurfer.spec.in +++ b/swisssurfer.spec.in @@ -1,10 +1,10 @@ -Summary: @PACKAGENAME@ PKCS#11 aware WebKit Browser -Name: @PACKAGENAME@ +Summary: @PACKAGE_NAME@ PKCS#11 aware WebKit Browser +Name: @PACKAGE_NAME@ Version: @VERSION@ Release: 1 License: LGPL Group: Applications/Internet -URL: https://dev.swisssign.com/projects/@PACKAGENAME@ +URL: https://dev.swisssign.com/projects/@PACKAGE_NAME@ Source0: %{name}-%{version}.tar.gz BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -26,7 +26,7 @@ This package contains the program and shared libraries required at runtime. %setup -q CPPFLAGS="-std=c++0x -I/usr/include/pkcs11-helper-1.0" \ ./configure --prefix=/usr \ - --docdir=/usr/share/doc/packages/@PACKAGENAME@ \ + --docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \ --libdir=/usr/%_lib \ --with-qt-install-plugins=/usr/share/qt4/plugins/designer @@ -35,9 +35,9 @@ make %install DESTDIR=$RPM_BUILD_ROOT make install -rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/html -rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/COPYING -rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/INSTALL +rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGE_NAME@/html +rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGE_NAME@/COPYING +rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL rm $RPM_BUILD_ROOT/usr/share/doc/packages/swisssurfer/swisssurfer.spec %clean @@ -45,19 +45,19 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -/usr/bin/@PACKAGENAME@ -/usr/share/applications/@PACKAGENAME@.desktop +/usr/bin/@PACKAGE_NAME@ +/usr/share/applications/@PACKAGE_NAME@.desktop /usr/share/swisssurfer/swisssurfer.png /usr/share/swisssurfer/swisssurfer.xpm /usr/%_lib/lib*.so.* %doc -/usr/share/doc/packages/@PACKAGENAME@/AUTHORS -/usr/share/doc/packages/@PACKAGENAME@/ChangeLog -/usr/share/doc/packages/@PACKAGENAME@/NEWS -/usr/share/doc/packages/@PACKAGENAME@/README +/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS +/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog +/usr/share/doc/packages/@PACKAGE_NAME@/NEWS +/usr/share/doc/packages/@PACKAGE_NAME@/README %package devel -Summary: @PACKAGENAME@ PKCS#11 aware WebKit Browser (development files) +Summary: @PACKAGE_NAME@ PKCS#11 aware WebKit Browser (development files) Group: Development/Libraries/C++ %description devel