designer widgets removed - has completely changed in qt5
This commit is contained in:
		
							
								
								
									
										12
									
								
								ChangeLog
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								ChangeLog
									
									
									
									
									
								
							| @@ -1,3 +1,15 @@ | ||||
| 2015-07-13 18:48  marc | ||||
|  | ||||
| 	* configure.ac: pcsclite fails in precise | ||||
|  | ||||
| 2015-07-13 18:14  marc | ||||
|  | ||||
| 	* debian/control.in: needs pcsclite to build | ||||
|  | ||||
| 2015-07-13 17:25  marc | ||||
|  | ||||
| 	* ChangeLog, configure.ac: needs pkcs11 | ||||
|  | ||||
| 2015-05-10 16:30  marc | ||||
|  | ||||
| 	* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, | ||||
|   | ||||
							
								
								
									
										129
									
								
								ax_check_qt.m4
									
									
									
									
									
								
							
							
						
						
									
										129
									
								
								ax_check_qt.m4
									
									
									
									
									
								
							| @@ -1,16 +1,16 @@ | ||||
| # SYNOPSIS | ||||
| # | ||||
| #   Check if a module exists: | ||||
| #     AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules]) | ||||
| #     AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules]) | ||||
| # | ||||
| #   Abort if a module does not exist: | ||||
| #     AX_CXX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules]) | ||||
| #     AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules]) | ||||
| # | ||||
| # DESCRIPTIONS | ||||
| # | ||||
| #    qt_prefix | ||||
| # | ||||
| #      Each call to AX_CXX_CHECK_QT should have a different prefix | ||||
| #      Each call to AX_CHECK_QT should have a different prefix | ||||
| #      value (with a few exceptions discussed later on). This value, | ||||
| #      usually provided in uppercase, is used as prefix to the | ||||
| #      variables holding the compiler flags and libraries reported by | ||||
| @@ -38,24 +38,31 @@ | ||||
|  | ||||
|  | ||||
| AC_DEFUN([AX_CXX_QT_TOOL], [ | ||||
|   PKG_PROG_PKG_CONFIG | ||||
|   if test -z "$HAVE_$1"; then | ||||
|     HAVE_$1=1 | ||||
|     AC_MSG_CHECKING([for $2]) | ||||
|     AC_ARG_VAR([$1], [path to Qt tool $2]) | ||||
|     $1=${$1:-$(pkg-config --variable=$2_location Qt5Core)} | ||||
|     $1=${$1:-$(pkg-config --variable=host_bins Qt5Core)/$2} | ||||
|     $1=${$1:-$(pkg-config --variable=$2_location QtCore)} | ||||
|     $1=${$1:-$(pkg-config --variable=host_bins QtCore)/$2} | ||||
|     $1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)} | ||||
|     $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5} | ||||
|     $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2} | ||||
|     $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)} | ||||
|     $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2} | ||||
|     $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2-qt4} | ||||
|     if ! which "${$1%% *}" > /dev/null; then | ||||
|       if which "$2" > /dev/null; then | ||||
|       if which "$2-qt5" > /dev/null; then | ||||
|         $1=$2-qt5 | ||||
|       elif which "$2" > /dev/null; then | ||||
|         $1=$2 | ||||
|       elif which "$2-qt4" > /dev/null; then | ||||
|         $1=$2-qt4 | ||||
|       else | ||||
|         HAVE_$1=0 | ||||
|         $1="" | ||||
|       fi | ||||
|     fi | ||||
|     AC_SUBST($1) | ||||
|     AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) | ||||
|     AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) | ||||
|     if test $HAVE_$1 -eq 1; then | ||||
|       AC_MSG_RESULT([$$1]) | ||||
|     else | ||||
| @@ -73,24 +80,6 @@ AC_DEFUN([AX_CXX_QT_TOOLS], [ | ||||
|   AX_CXX_QT_TOOL(LRELEASE, lrelease) | ||||
| ]) | ||||
|  | ||||
| AC_DEFUN([AX_CHECK_VALID_FLAG], [ | ||||
|   AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) | ||||
|   save_cxxflags="$CXXFLAGS" | ||||
|   newflag="no" | ||||
|   for test_flag in $1; do | ||||
|     CXXFLAGS+=" ${test_flag}" | ||||
|     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ | ||||
|       newflag="$test_flag" | ||||
|       AM_CXXFLAGS+=" ${test_flag}" | ||||
|       CXXFLAGS="$save_cxxflags" | ||||
|       break; | ||||
|     ]) | ||||
|     CXXFLAGS="$save_cxxflags" | ||||
|   done | ||||
|   AC_SUBST(AM_CXXFLAGS) | ||||
|   AC_MSG_RESULT([$newflag]) | ||||
| ]) | ||||
|  | ||||
| AC_DEFUN([AX_CHECK_QT], [ | ||||
|   qt_modules="$2" | ||||
|   qt_modules_optional="$3" | ||||
| @@ -100,28 +89,20 @@ AC_DEFUN([AX_CHECK_QT], [ | ||||
|   PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [ | ||||
|     HAVE_$1=1 | ||||
|     AC_DEFINE([HAVE_$1]) | ||||
|     AM_CPPFLAGS+=" ${[$1]5_CFLAGS}" | ||||
|     QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core) | ||||
|     QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins | ||||
|     CPPFLAGS+=" ${[$1]5_CFLAGS}" | ||||
|     MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" | ||||
|     AM_CXXFLAGS+=" ${[$1]5_CFLAGS}" | ||||
|     CXXFLAGS+=" ${[$1]5_CFLAGS}" | ||||
|     LIBS+=" ${[$1]5_LIBS}" | ||||
|     modules=${qt_modules//Qt/Qt5} | ||||
|     if test -z "$PKG_REQUIREMENTS"; then | ||||
|       PKG_REQUIREMENTS="${modules// /, }" | ||||
|     else | ||||
|       PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }" | ||||
|     fi | ||||
|     PKG_REQUIREMENTS+=" ${qt_modules//Qt/Qt5}" | ||||
|     if test -n "${qt_modules_optional}"; then | ||||
|       PKG_CHECK_MODULES([$1]5_OPTIONAL, [${qt_modules_optional//Qt/Qt5}], [ | ||||
|         AM_CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" | ||||
|         CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" | ||||
|         MOC_FLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" | ||||
|         AM_CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" | ||||
|         CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" | ||||
|         LIBS+=" ${[$1]5_OPTIONAL_LIBS}" | ||||
|         modules=${qt_modules_optional//Qt/Qt5} | ||||
|         if test -z "$PKG_REQUIREMENTS"; then | ||||
|           PKG_REQUIREMENTS="${modules// /, }" | ||||
|         else | ||||
|           PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }" | ||||
|         fi | ||||
|         PKG_REQUIREMENTS+=" ${qt_modules_optional//Qt/Qt5}" | ||||
|       ], [ | ||||
|         AC_MSG_NOTICE([Not found: ${qt_modules_optional//Qt/Qt5}]) | ||||
|       ]) | ||||
| @@ -130,41 +111,41 @@ AC_DEFUN([AX_CHECK_QT], [ | ||||
|     PKG_CHECK_MODULES([$1], [${qt_modules}], [ | ||||
|       HAVE_$1=1 | ||||
|       AC_DEFINE([HAVE_$1]) | ||||
|       AM_CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|       QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore) | ||||
|       QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins | ||||
|       CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|       MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" | ||||
|       AM_CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|       CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|       LIBS+=" ${$1_LIBS}" | ||||
|       modules=${qt_modules} | ||||
|       if test -z "$PKG_REQUIREMENTS"; then | ||||
|         PKG_REQUIREMENTS="${modules// /, }" | ||||
|       else | ||||
|         PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }" | ||||
|       fi | ||||
|       PKG_REQUIREMENTS+=" ${qt_modules}" | ||||
|       if test -n "$3"; then | ||||
|         PKG_CHECK_MODULES($1_OPTIONAL, [${qt_modules_optional}], [ | ||||
|           AM_CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}" | ||||
|           CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}" | ||||
|           MOC_FLAGS+=" ${$1_OPTIONAL_CFLAGS}" | ||||
|           AM_CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}" | ||||
|           CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}" | ||||
|           LIBS+=" ${$1_OPTIONAL_LIBS}" | ||||
|           modules=${qt_modules_optional} | ||||
|           if test -z "$PKG_REQUIREMENTS"; then | ||||
|             PKG_REQUIREMENTS="${modules// /, }" | ||||
|           else | ||||
|             PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }" | ||||
|           fi | ||||
|           PKG_REQUIREMENTS+=" ${qt_modules_optional}" | ||||
|         ], [ | ||||
|           AC_MSG_NOTICE([Not found: ${qt_modules_optional}]) | ||||
|         ]) | ||||
|       fi | ||||
|     ], [HAVE_$1=0]) | ||||
|   ]) | ||||
|   AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) | ||||
|   AX_CHECK_VALID_FLAG([-fPIC -fPIE], [position independent code flag]) | ||||
|   AC_SUBST(AM_CPPFLAGS) | ||||
|   AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) | ||||
|   AX_CHECK_VALID_CXX_FLAG([-fPIC -fPIE], [position independent code flag]) | ||||
|   if test "${MINGW}" != "no"; then | ||||
|     AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) | ||||
|   fi | ||||
|   AC_SUBST(QTDIR) | ||||
|   AC_SUBST(QT_PLUGIN_PATH) | ||||
|   AC_SUBST(CPPFLAGS) | ||||
|   AC_SUBST(MOC_FLAGS) | ||||
|   AC_SUBST(AM_CXXFLAGS) | ||||
|   AC_SUBST(CXXFLAGS) | ||||
|   AC_SUBST(PKG_REQUIREMENTS) | ||||
|   AX_ADDITIONAL_QT_RULES_HACK=' | ||||
|  | ||||
| LANGUAGE_FILE_BASE ?= translations | ||||
|  | ||||
| ui_%.hxx: %.ui | ||||
| 	$(UIC) -o [$][@] $< | ||||
|  | ||||
| @@ -172,19 +153,31 @@ moc_%.cxx: %.hxx | ||||
| 	$(MOC) $(MOC_FLAGS) -o [$][@] $< | ||||
|  | ||||
| qrc_%.cxx: %.qrc | ||||
| 	$(RCC) -o [$][@] $<' | ||||
| 	$(RCC) -o [$][@] -name ${<:%.qrc=%} $< | ||||
|   AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK) | ||||
| ]) | ||||
|  | ||||
| #%.qrc: % | ||||
| #	cwd=$$(pwd) && cd $< && $(RCC) -project -o $${cwd}/[$][@] | ||||
|  | ||||
| %.qm: %.ts | ||||
| 	${LRELEASE} $< -qm [$][@] | ||||
|  | ||||
| #%.ts: ${LANGUAGE_FILES} | ||||
| #	${LUPDATE} -no-obsolete \ | ||||
| #	           -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \ | ||||
| #	           -ts [$][@] $< | ||||
|  | ||||
| ']) | ||||
|  | ||||
| # SYNOPSIS | ||||
| # | ||||
| #   AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules]) | ||||
| #   AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules]) | ||||
| # | ||||
| # DESCRIPTIONS | ||||
| # | ||||
| #    qt_prefix | ||||
| # | ||||
| #      Each call to AX_CXX_CHECK_QT should have a different prefix | ||||
| #      Each call to AX_CHECK_QT should have a different prefix | ||||
| #      value (with a few exceptions discussed later on). This value, | ||||
| #      usually provided in uppercase, is used as prefix to the | ||||
| #      variables holding the compiler flags and libraries reported by | ||||
| @@ -222,5 +215,5 @@ AC_DEFUN([AX_REQUIRE_QT], [ | ||||
| #     AX_QT_NO_KEYWORDS | ||||
|  | ||||
| AC_DEFUN([AX_QT_NO_KEYWORDS], [ | ||||
|   AM_CPPFLAGS+=" -DQT_NO_KEYWORDS" | ||||
|   CPPFLAGS+=" -DQT_NO_KEYWORDS" | ||||
| ]) | ||||
|   | ||||
| @@ -3,45 +3,44 @@ | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
| ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 | ||||
|  | ||||
| # m4_esyscmd_s does not exist on centos 5 and 6 | ||||
| m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))]) | ||||
|  | ||||
| # define least version number from subversion's revision number: | ||||
| # it is taken modulo 256 due to a bug on Apple's MacOSX | ||||
| m4_define(x_least, m4_esyscmd_s( | ||||
| m4_define(x_least, mrw_esyscmd_s([ | ||||
|   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" | ||||
|   for path in . .. ../..; do | ||||
|     if svn info $path 2>&1 > /dev/null; then | ||||
|       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||
|       (cd $path && svn2cl) | ||||
|       break; | ||||
|     fi | ||||
|   done | ||||
|   # Mac does not support LEAST > 255 | ||||
|   echo $ECHO_N $(($SVN_REVISION%256)) | ||||
| )) | ||||
| ])) | ||||
| # define version number from subversion's revision number: | ||||
| # it is taken modulo 256 due to a bug on Apple's MacOSX | ||||
| # add to x_minor if revision number is > 256 | ||||
| m4_define(x_minor_fixed, m4_esyscmd_s( | ||||
| m4_define(x_minor_diff, mrw_esyscmd_s([ | ||||
|   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" | ||||
|   for path in . .. ../..; do | ||||
|     if svn info $path 2>&1 > /dev/null; then | ||||
|       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||
|       (cd $path && svn2cl) | ||||
|       break; | ||||
|     fi | ||||
|     fi; | ||||
|   done | ||||
|   # Mac does not support LEAST > 255 | ||||
|   echo $ECHO_N $((x_minor+$SVN_REVISION/256)) | ||||
| )) | ||||
|   echo $ECHO_N $(($SVN_REVISION/256)) | ||||
| ])) | ||||
| # setup version number | ||||
| m4_define(x_version, m4_esyscmd_s( | ||||
|   echo $ECHO_N x_major.x_minor_fixed.x_least | ||||
| )) | ||||
| m4_define(x_version, [x_major.m4_eval(x_minor+x_minor_diff).x_least]) | ||||
|  | ||||
| ## bugreport mail address is taken from <user@host> in first line of AUTHORS | ||||
| m4_define(x_bugreport, m4_esyscmd_s( | ||||
| m4_define(x_bugreport, mrw_esyscmd_s([ | ||||
|   head -1 AUTHORS | \ | ||||
|     sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp' | ||||
| )) | ||||
| ])) | ||||
|  | ||||
| m4_include(ax_check_qt.m4) | ||||
|  | ||||
| @@ -68,7 +67,7 @@ dnl refers to ${prefix}.  Thus we have to use `eval' twice. | ||||
| #     $3 = filename of makefile.in | ||||
| AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ | ||||
|   sh_add_makefile_target_dep() { | ||||
|     sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}" | ||||
|     sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}" | ||||
|     if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then | ||||
|         echo "${1}: ${2}" >> "${srcdir}/${3}" | ||||
|     fi | ||||
| @@ -84,7 +83,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ | ||||
| #     $1 = variable name | ||||
| AC_DEFUN([AX_SUBST], [ | ||||
|   AC_SUBST([$1]) | ||||
|   tmp_var=$(echo "${$1}" | awk 1 ORS='\\n') | ||||
|   tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,') | ||||
|   tmp_var=${tmp_var//\"/\\\"} | ||||
|   tmp_var=${tmp_var//\'/\'\"\'\"\'} | ||||
|   tmp_var=${tmp_var//#/\\#} | ||||
| @@ -108,7 +107,15 @@ AC_DEFUN([AX_SUBST], [ | ||||
| # | ||||
| # configures the basic environment | ||||
| AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ | ||||
|   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME}'" | ||||
|   MINGW=no | ||||
|   MAC=no | ||||
|   case $host in | ||||
|     *mingw*) MINGW=yes;; | ||||
|     *darwin* | *rhapsody* | *macosx*) MAC=yes;; | ||||
|   esac | ||||
|   AM_CONDITIONAL(MINGW, test "$MINGW" = "yes") | ||||
|   AM_CONDITIONAL(MAC, test "$MAC" = "yes") | ||||
|   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'" | ||||
|   AX_SUBST(NUMBERS) | ||||
|   AX_SUBST(HOME) | ||||
|   README=$(tail -n +3 README) | ||||
| @@ -124,7 +131,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ | ||||
|   AX_SUBST(DISTRO) | ||||
|   BUILD_NUMBER=${BUILD_NUMBER:-1} | ||||
|   AX_SUBST(BUILD_NUMBER) | ||||
|   BUILD_DATE=$(LANG= date +"%a, %d %B %Y %H:%M:%S %z") | ||||
|   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z") | ||||
|   AX_SUBST(BUILD_DATE) | ||||
|   if test -f "${PROJECT_NAME}-logo.png"; then | ||||
|      PROJECT_LOGO="${PROJECT_NAME}-logo.png" | ||||
| @@ -134,14 +141,29 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ | ||||
|      PROJECT_ICON="${PROJECT_NAME}-icon.png" | ||||
|   fi | ||||
|   AX_SUBST(PROJECT_ICON) | ||||
|  | ||||
|   AC_ARG_ENABLE(pedantic, | ||||
|     [AS_HELP_STRING([--enable-pedantic], | ||||
|                     [enable all warnings and checks, abort on warnings])], | ||||
|     [have_pedantic="$enableval"; test "$enableval" = "yes" &&  \ | ||||
|        AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"]) | ||||
|   dnl problem in libs: -Wshadow -Wcast-qual | ||||
|   dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) | ||||
|   AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes") | ||||
|   if test "$have_pedantic" == "yes"; then | ||||
|     AC_MSG_NOTICE([Pedantic compile mode enabled! | ||||
|      - all warnings for GNU g++ are enabled | ||||
|      - all warnings result in an error | ||||
|      - doxygen warnings are treated as error too]); fi | ||||
|  | ||||
|   AC_CONFIG_FILES([makefile]) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) | ||||
|   test -f makefile.in && sed -i '1iEXTRA_DIST = ' makefile.in | ||||
|   test -f makefile.in && cat >> makefile.in <<EOF | ||||
| #### Begin: Appended by $0 | ||||
| EXTRA_DIST = bootstrap.sh | ||||
| doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog | ||||
| EXTRA_DIST += bootstrap.sh | ||||
| clean-standard-project-targets: | ||||
| 	-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION} | ||||
| 	-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz | ||||
| @@ -167,42 +189,29 @@ AC_DEFUN([AX_USE_CXX], [ | ||||
|   AM_CPPFLAGS+=' -I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}' | ||||
|   AM_LDFLAGS+=' -L ${top_srcdir}/src -L ${top_builddir}/src' | ||||
|  | ||||
|   # Get rid of that stupid -O2 -g opions! | ||||
|   CXXFLAGS="${CXXFLAGS:-}" | ||||
|   # Get rid of those stupid -g -O2 options! | ||||
|   CXXFLAGS="${CXXFLAGS//-g -O2/}" | ||||
|   CFLAGS="${CFLAGS//-g -O2/}" | ||||
|  | ||||
| # pass compile flags to make distcheck | ||||
|   AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" | ||||
|   AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS) | ||||
|  | ||||
|   AC_ARG_ENABLE(pedantic, | ||||
|     [AS_HELP_STRING([--enable-pedantic], | ||||
|                     [enable all warnings and checks, abort on warnings])], | ||||
|     [have_pedantic="$enableval"; test "$enableval" = "yes" &&  \ | ||||
|        AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"]) | ||||
|   dnl problem in libs: -Wshadow -Wcast-qual | ||||
|   dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) | ||||
|   AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes") | ||||
|   if test "$have_pedantic" == "yes"; then | ||||
|     AC_MSG_NOTICE([Pedantic compile mode enabled! | ||||
|      - all warnings for GNU g++ are enabled | ||||
|      - all warnings result in an error | ||||
|      - doxygen warnings are treated as error too]); fi | ||||
|  | ||||
|   MINGW32=no | ||||
|   MAC=no | ||||
|   case $host_os in | ||||
|     *mingw32*) MINGW32=yes;; | ||||
|     *darwin* | *rhapsody* | *macosx*) MAC=yes;; | ||||
|   esac | ||||
|   AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes") | ||||
|   AM_CONDITIONAL(MAC, test "$MAC" = "yes") | ||||
|    | ||||
|   AC_SUBST(AM_CXXFLAGS) | ||||
|   AC_SUBST(AM_CPPFLAGS) | ||||
|   AC_SUBST(AM_LDFLAGS) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cxx-targets], [src/makefile.in]) | ||||
|   test -f src/makefile.in && cat >> src/makefile.in <<EOF | ||||
| #### Begin: Appended by $0 | ||||
| %.app: % | ||||
| 	-rm -r [\$][@] | ||||
| 	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install | ||||
| 	QTDIR="\${QTDIR}" \ | ||||
| 	QT_PLUGINS="\${QT_PLUGINS}" \ | ||||
| 	QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \ | ||||
| 	  \${top_builddir}/mac-create-app-bundle.sh \ | ||||
| 	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix} | ||||
|  | ||||
| maintainer-clean-cxx-targets: | ||||
| 	-rm makefile.in | ||||
| #### End: $0 | ||||
| @@ -239,12 +248,24 @@ maintainer-clean-example-targets: | ||||
| EOF | ||||
| ]) | ||||
|  | ||||
| # use this in configure.ac to support HTML data for webservers | ||||
| AC_DEFUN([AX_BUILD_HTML], [ | ||||
|   AC_CONFIG_FILES([html/makefile]) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-html-targets], [html/makefile.in]) | ||||
|   test -f html/makefile.in && cat >> html/makefile.in <<EOF | ||||
| #### Begin: Appended by $0 | ||||
| maintainer-clean-html-targets: | ||||
| 	-rm makefile.in | ||||
| #### End: $0 | ||||
| EOF | ||||
| ]) | ||||
|  | ||||
| # use this in configure.ac to support C++ libraries | ||||
| AC_DEFUN([AX_USE_LIBTOOL], [ | ||||
|   # libtool versioning | ||||
|   LIB_MAJOR=m4_eval(x_major+x_minor) | ||||
|   LIB_MAJOR=m4_eval(x_major+x_minor+x_minor_diff) | ||||
|   LIB_MINOR=x_least | ||||
|   LIB_LEAST=x_minor_fixed | ||||
|   LIB_LEAST=m4_eval(x_minor+x_minor_diff) | ||||
|   LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}" | ||||
|   AM_LDFLAGS="-version-info ${LIB_VERSION}" | ||||
|   AC_SUBST(AM_LDFLAGS) | ||||
| @@ -290,14 +311,16 @@ EOF | ||||
|  | ||||
| # use this in configure.ac to support RPM packages | ||||
| AC_DEFUN([AX_USE_RPM_PACKAGING], [ | ||||
| #  m4_include(ax_rpm_rules.m4) | ||||
|   AC_CONFIG_FILES([${PACKAGE_NAME}.spec]) | ||||
|   #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-debian-targets], [makefile.in]) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [rpm], [makefile.in]) | ||||
|   #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in]) | ||||
|   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-rpm-targets], [makefile.in]) | ||||
|   test -f makefile.in && cat >> makefile.in <<EOF | ||||
| #### Begin: Appended by $0 | ||||
| EXTRA_DIST += \${PACKAGE_NAME}.spec.in | ||||
| rpm: dist | ||||
| 	rpmbuild -ba --define "_topdir \$(pwd)" --define "_sourcedir \$(pwd)" \${PACKAGE_NAME}.spec | ||||
| 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec | ||||
| distclean-rpm-targets: | ||||
| 	-rm \${PACKAGE_NAME}.spec | ||||
| #### End: $0 | ||||
| EOF | ||||
| ]) | ||||
| @@ -343,7 +366,7 @@ doc: doxyfile | ||||
| clean-documentation: | ||||
| 	-rm doxygen.errors @PDF_DOC@ | ||||
| distclean-documentation: | ||||
| 	-rm -r html latex | ||||
| 	-rm -r html | ||||
| 	-rm  @PACKAGE_NAME@.doxytag | ||||
| maintainer-clean-documentation: | ||||
| 	-rm makefile.in | ||||
| @@ -353,7 +376,7 @@ install-data-documentation: | ||||
| 	cp -r html \$(DESTDIR)\${docdir}/ | ||||
| uninstall-documentation: | ||||
| 	-chmod -R u+w \$(DESTDIR)\${docdir} | ||||
| 	-rm -rf \$(DESTDIR)\${docdir}/* | ||||
| 	-rm -rf \$(DESTDIR)\${docdir}/html | ||||
| #### End: $0 | ||||
| EOF | ||||
| ]) | ||||
| @@ -361,7 +384,7 @@ EOF | ||||
| # require a specific package, with fallback: test for a header | ||||
| #  - parameter: | ||||
| #     $1 = unique id (no special characters) | ||||
| #     $2 = module name | ||||
| #     $2 = module name (optional, if different from id) | ||||
| #     $3 = a header file to find (optional) | ||||
| #     $4 = alternative module names (space separated, optional) | ||||
| # | ||||
| @@ -372,92 +395,88 @@ EOF | ||||
| # fails if not found | ||||
| AC_DEFUN([AX_PKG_REQUIRE], [ | ||||
|   PKG_PROG_PKG_CONFIG | ||||
|   $1_found=no | ||||
|   secondpar="m4_default([$2], [$1])" | ||||
|   PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ | ||||
|     if test -n "$3"; then | ||||
|       $1_found=0; | ||||
|       for p in ${$1_CFLAGS}; do | ||||
|         if test -e ${p#-I}/$3; then | ||||
|           $1_found=1 | ||||
|           break | ||||
|         fi | ||||
|       done | ||||
|       if test ${$1_found} -eq 0; then | ||||
|         for p in /usr/include ${$1_CFLAGS}; do | ||||
|           $1_file=$(find ${p#-I} -name $3) | ||||
|           if test -e "${$1_file}"; then | ||||
|             AC_MSG_NOTICE([Header file $3 found in sub path as ${$1_file}]) | ||||
|             $1_CFLAGS="${$1_CFLAGS} -I${$1_file%/$3}" | ||||
|             $1_found=1 | ||||
|             break | ||||
|           fi | ||||
|         done | ||||
|       fi | ||||
|       if test ${$1_found} -eq 0; then | ||||
|         AC_MSG_WARN([Header file $3 not found in $1_CFLAGS = ${$1_CFLAGS}]) | ||||
|       fi | ||||
|     fi | ||||
|     AM_CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|     AM_CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|     LIBS+=" ${$1_LIBS}" | ||||
|     if test -z "$PKG_REQUIREMENTS"; then | ||||
|       PKG_REQUIREMENTS="m4_default([$2], [$1])" | ||||
|     else | ||||
|       PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, m4_default([$2], [$1])" | ||||
|     fi | ||||
|     $1_found=$secondpar | ||||
|     PKG_REQUIREMENTS+=" $secondpar" | ||||
|   ], [ | ||||
|     AC_MSG_WARN([Recommended package m4_default([$2], [$1]) for feature $1 not installed]) | ||||
|     if test -n "$4"; then | ||||
|       AC_MSG_WARN([Recommended package $secondpar for feature $1 not installed, trying $4]) | ||||
|       for pkg in $4; do | ||||
|         PKG_CHECK_MODULES([$1], [$pkg], [ | ||||
|           if test -n "$3"; then | ||||
|             $1_found=0; | ||||
|             for p in ${$1_CFLAGS}; do | ||||
|               if test -e ${p#-I}/$3; then | ||||
|                 $1_found=1 | ||||
|                 break | ||||
|               fi | ||||
|             done | ||||
|             if test ${$1_found} -eq 0; then | ||||
|               for p in /usr/include ${$1_CFLAGS}; do | ||||
|                 $1_file=$(find ${p#-I} -name $3) | ||||
|                 if test -e ${$1_file}; then | ||||
| 		  AC_MSG_NOTICE([Header file $3 found in sub path as ${$1_file}]) | ||||
|                   $1_CFLAGS="${$1_CFLAGS} -I${$1_file%/$3}" | ||||
|                   $1_found=1 | ||||
|                   break | ||||
|                 fi | ||||
|               done | ||||
|             fi | ||||
|             if test ${$1_found} -eq 0; then | ||||
|               AC_MSG_WARN([Header file $3 not found in $1_CFLAGS = ${$1_CFLAGS}]) | ||||
|             fi | ||||
|           fi | ||||
|           AM_CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|           AM_CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|           LIBS+=" ${$1_LIBS}" | ||||
|           if test -z "$PKG_REQUIREMENTS"; then | ||||
|             PKG_REQUIREMENTS="$pkg" | ||||
|           else | ||||
|             PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, $pkg" | ||||
|           fi | ||||
|           PKG_REQUIREMENTS+=" $pkg" | ||||
|           $1_found=$pkg | ||||
|           break; | ||||
|         ], [ | ||||
|           AC_MSG_WARN([Recommended package $pkg for feature $1 not installed]) | ||||
|         ]) | ||||
|       done | ||||
|     fi | ||||
|   ]) | ||||
|   AC_SUBST(AM_CPPFLAGS) | ||||
|   AC_SUBST(AM_CXXFLAGS) | ||||
|   AC_SUBST(CPPFLAGS) | ||||
|   AC_SUBST(CXXFLAGS) | ||||
|   AC_SUBST(PKG_REQUIREMENTS) | ||||
|   if test -n "$3"; then | ||||
|     if test "${$1_found}" = "no"; then | ||||
|       tmp_package="yes" | ||||
|     else | ||||
|       tmp_package=${$1_found} | ||||
|     fi | ||||
|     $1_found=no | ||||
|     old_CPPFLAGS=${CPPFLAGS} | ||||
|     CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}" | ||||
|     AC_CHECK_HEADER([$3], [ | ||||
|       $1_found=${tmp_package} | ||||
|     ], [ | ||||
|       AC_MSG_ERROR([Required header $3 for feature $1 not found]) | ||||
|       for x in ${$1_CFLAGS}; do | ||||
|         AC_MSG_NOTICE([search for $3 in ${x[#]-I}]) | ||||
|         for f in $(find ${x[#]-I} -name "$3" 2> /dev/null); do | ||||
|           if test -f "$f"; then | ||||
|             $1_found=${tmp_package} | ||||
|             $1_CFLAGS+=" -I${f%/*}" | ||||
|             AC_MSG_NOTICE([added path ${f%/*}]) | ||||
|             break; | ||||
|           fi | ||||
|         done | ||||
|         if test "${$1_found}" != "no"; then | ||||
|           break; | ||||
|         fi | ||||
|       done | ||||
|       if test "${$1_found}" = "no"; then | ||||
|         tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package) | ||||
|         for x in ${tmp_includedir}; do | ||||
|           AC_MSG_NOTICE([search for $3 in $x]) | ||||
|           for f in $(find ${x} -name "$3" 2> /dev/null); do | ||||
|             if test -f "$f"; then | ||||
|               $1_found=${tmp_package} | ||||
|               $1_CFLAGS+=" -I${f%/*}" | ||||
|               AC_MSG_NOTICE([added path ${f%/*}]) | ||||
|               break; | ||||
|             fi | ||||
|           done | ||||
|           if test "${$1_found}" != "no"; then | ||||
|             break; | ||||
|           fi | ||||
|         done | ||||
|       fi | ||||
|     ]) | ||||
|     CPPFLAGS=${old_CPPFLAGS} | ||||
|   fi | ||||
|   if test "${$1_found}" = "no"; then | ||||
|     if test -n "$3"; then | ||||
|       if test -n "$4"; then | ||||
|         AC_MSG_ERROR([Feature $1 not found, need header $3 in modules $secondpar or $4]) | ||||
|       else | ||||
|         AC_MSG_ERROR([Feature $1 not found, need header $3 in module $secondpar]) | ||||
|       fi | ||||
|     else | ||||
|       AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) | ||||
|     fi | ||||
|   fi | ||||
|   CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|   CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|   LIBS+=" ${$1_LIBS}" | ||||
| ]) | ||||
|  | ||||
| # check if a specific package exists | ||||
| @@ -472,8 +491,8 @@ AC_DEFUN([AX_PKG_CHECK], [ | ||||
|   PKG_PROG_PKG_CONFIG | ||||
|   PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ | ||||
|     HAVE_$1=1 | ||||
|     AM_CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|     AM_CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|     CPPFLAGS+=" ${$1_CFLAGS}" | ||||
|     CXXFLAGS+=" ${$1_CFLAGS}" | ||||
|     LIBS+=" ${$1_LIBS}" | ||||
|     if test -z "$PKG_REQUIREMENTS"; then | ||||
|       PKG_REQUIREMENTS="m4_default([$2], [$1])" | ||||
| @@ -483,9 +502,126 @@ AC_DEFUN([AX_PKG_CHECK], [ | ||||
|   ], [ | ||||
|     HAVE_$1=0 | ||||
|   ]) | ||||
|   AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) | ||||
|   AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) | ||||
|   AC_SUBST(HAVE_$1) | ||||
|   AC_SUBST(AM_CPPFLAGS) | ||||
|   AC_SUBST(AM_CXXFLAGS) | ||||
|   AC_SUBST(CPPFLAGS) | ||||
|   AC_SUBST(CXXFLAGS) | ||||
|   AC_SUBST(PKG_REQUIREMENTS) | ||||
| ]) | ||||
|  | ||||
| # make sure, a specific header exists | ||||
| # - parameter: | ||||
| #    $1 = header name | ||||
| AC_DEFUN([AX_REQUIRE_HEADER], [ | ||||
|   AC_CHECK_HEADER($1, [], [ | ||||
|     if test -n "$2"; then | ||||
|       found=0 | ||||
|       for d in $2; do | ||||
|         if test -f "${d}/$1"; then | ||||
|           AC_MSG_NOTICE([found file ${d}/$1]) | ||||
|           CPPFLAGS+=" -I${d}" | ||||
|           found=1 | ||||
|           break; | ||||
|         else | ||||
|           AC_MSG_NOTICE([not found file ${d}/$1]) | ||||
|         fi | ||||
|       done | ||||
|     fi | ||||
|     if test $found -eq 0; then | ||||
|       AC_MSG_ERROR([Header $1 not found]) | ||||
|     fi | ||||
|     ], []) | ||||
|   ], []) | ||||
| ]) | ||||
|  | ||||
| # Check within a list of CPP-Flags for the first that is usable and | ||||
| # configure it | ||||
| #  - parameter: | ||||
| #     $1 = white-space separated list of alternative flags | ||||
| #     $2 = module name (optional, if different from id) | ||||
| AC_DEFUN([AX_CHECK_VALID_CPP_FLAG], [ | ||||
|   AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) | ||||
|   save_cppflags="$CPPFLAGS" | ||||
|   newflag="no" | ||||
|   for test_flag in $1; do | ||||
|     CPPFLAGS+=" ${test_flag}" | ||||
|     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ | ||||
|       newflag="$test_flag" | ||||
|       CPPFLAGS="$save_cppflags" | ||||
|       CPPFLAGS+=" ${test_flag}" | ||||
|       break; | ||||
|     ]) | ||||
|     CPPFLAGS="$save_cppflags" | ||||
|   done | ||||
|   AC_SUBST(CPPFLAGS) | ||||
|   AC_MSG_RESULT([$newflag in $CPPFLAGS]) | ||||
| ]) | ||||
|  | ||||
| # Check within a list of CXX-Flags for the first that is usable and | ||||
| # configure it | ||||
| #  - parameter: | ||||
| #     $1 = white-space separated list of alternative flags | ||||
| #     $2 = module name (optional, if different from id) | ||||
| AC_DEFUN([AX_CHECK_VALID_CXX_FLAG], [ | ||||
|   AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) | ||||
|   save_cxxflags="$CXXFLAGS" | ||||
|   newflag="no" | ||||
|   for test_flag in $1; do | ||||
|     CXXFLAGS+=" ${test_flag}" | ||||
|     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ | ||||
|       newflag="$test_flag" | ||||
|       CXXFLAGS="$save_cxxflags" | ||||
|       CXXFLAGS+=" ${test_flag}" | ||||
|       break; | ||||
|     ]) | ||||
|     CXXFLAGS="$save_cxxflags" | ||||
|   done | ||||
|   AC_SUBST(CXXFLAGS) | ||||
|   AC_MSG_RESULT([$newflag in $CXXFLAGS]) | ||||
| ]) | ||||
|  | ||||
| # Check within a list of C-Flags for the first that is usable and | ||||
| # configure it | ||||
| #  - parameter: | ||||
| #     $1 = white-space separated list of alternative flags | ||||
| #     $2 = module name (optional, if different from id) | ||||
| AC_DEFUN([AX_CHECK_VALID_C_FLAG], [ | ||||
|   AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) | ||||
|   save_cflags="$CFLAGS" | ||||
|   newflag="no" | ||||
|   for test_flag in $1; do | ||||
|     CFLAGS+=" ${test_flag}" | ||||
|     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ | ||||
|       newflag="$test_flag" | ||||
|       CFLAGS="$save_cflags" | ||||
|       CFLAGS+=" ${test_flag}" | ||||
|       break; | ||||
|     ]) | ||||
|     CFLAGS="$save_cflags" | ||||
|   done | ||||
|   AC_SUBST(CFLAGS) | ||||
|   AC_MSG_RESULT([$newflag in $CFLAGS]) | ||||
| ]) | ||||
|  | ||||
| # Check within a list of LD-Flags for the first that is usable and | ||||
| # configure it | ||||
| #  - parameter: | ||||
| #     $1 = white-space separated list of alternative flags | ||||
| #     $2 = module name (optional, if different from id) | ||||
| AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [ | ||||
|   AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) | ||||
|   save_ldflags="$LDFLAGS" | ||||
|   newflag="no" | ||||
|   for test_flag in $1; do | ||||
|     LDFLAGS+=" ${test_flag}" | ||||
|     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ | ||||
|       newflag="$test_flag" | ||||
|       LDFLAGS="$save_ldflags" | ||||
|       LDFLAGS+=" ${test_flag}" | ||||
|       break; | ||||
|     ]) | ||||
|     LDFLAGS="$save_ldflags" | ||||
|   done | ||||
|   AC_SUBST(LDFLAGS) | ||||
|   AC_MSG_RESULT([$newflag in $LDFLAGS]) | ||||
| ]) | ||||
|   | ||||
							
								
								
									
										286
									
								
								bootstrap.sh
									
									
									
									
									
								
							
							
						
						
									
										286
									
								
								bootstrap.sh
									
									
									
									
									
								
							| @@ -17,9 +17,9 @@ | ||||
| MY_NAME=${0##*/} | ||||
| PROJECT_PATH=$(pwd) | ||||
| DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/} | ||||
|  | ||||
| configure=0 | ||||
| build=0 | ||||
| buildtarget="distcheck" | ||||
| overwrite=0 | ||||
| rebuild=0 | ||||
| rebuildfiles=() | ||||
| @@ -27,6 +27,7 @@ while test $# -gt 0; do | ||||
|     case "$1" in | ||||
|         (--configure|-c) configure=1;; | ||||
|         (--build|-b) configure=1; build=1;; | ||||
|         (--target|-t) shift; configure=1; build=1; buildtarget="$1";; | ||||
|         (--overwrite|-o) overwrite=1;; | ||||
|         (--rebuild|-r) rebuild=1;; | ||||
|         (--rebuild-file|-f) shift; rebuildfiles+=("$1");; | ||||
| @@ -41,7 +42,8 @@ SYNOPSIS | ||||
| OPTIONS | ||||
|  | ||||
|   --configure, -c            call ./configure after initialization | ||||
|   --build, -c                build, also call ./configure && make | ||||
|   --build, -b                build, also call ./configure && make distcheck | ||||
|   --target, -t <target>      same as -b, but specify target instead of distcheck | ||||
|   --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros) | ||||
|   --rebuild, -r              force rebuild of generated files, even if modified | ||||
|   --rebuild-file, -f <file>  rebild specific file (can be added multiple times) | ||||
| @@ -101,12 +103,17 @@ GENERATED FILES | ||||
|     * ax_init_standard_project.m4 - auxiliary macro definition file | ||||
|     * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file | ||||
|     * ax_check_qt.m4 - auxiliary macro definition file | ||||
|     * resolve-debbuilddeps.sh - script to install debian package dependencies | ||||
|     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle | ||||
|     * AUTHORS - replace your name in AUTHORS before first run | ||||
|     * NEWS - empty file add your project's news | ||||
|     * README - add project description (first line is header, followed by an empty line) | ||||
|     * configure.ac - global configuration file template | ||||
|     * makefile.am - global makefile template | ||||
|     * src/makefile.am - if you enabled AX_USE_CXX | ||||
|     * src/version.hxx - if you enabled AX_USE_CXX | ||||
|     * src/version.cxx - if you enabled AX_USE_CXX | ||||
|     * html/makefile.am - if you enabled AX_BUILD_HTML | ||||
|     * scripts/makefile.in - if you enabled AX_USE_SCRIPTS | ||||
|     * doc/makefile.am - if you enabled AX_USE_DOXYGEN | ||||
|     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN | ||||
| @@ -121,6 +128,7 @@ GENERATED FILES | ||||
|     * debian/${DEFAULT_PROJECT_NAME}-dev.dirs - if you enabled AX_USE_DEBIAN_PACKAGING | ||||
|     * debian/rules - if you enabled AX_USE_DEBIAN_PACKAGING | ||||
|     * debian/compat - if you enabled AX_USE_DEBIAN_PACKAGING | ||||
|     * ${DEFAULT_PROJECT_NAME}.spec.in - if you enable AX_USE_RPM_PACKAGING | ||||
|     * src/${DEFAULT_PROJECT_NAME}.pc.in - if you enabled AX_USE_LIBTOOL | ||||
|  | ||||
| REBUILDING FILES | ||||
| @@ -144,9 +152,11 @@ FILES TO EDIT | ||||
|  | ||||
|   The following files normally require editing: | ||||
|     * AUTHORS | ||||
|     * NEWS | ||||
|     * README | ||||
|     * configure.ac | ||||
|     * src/makefile.am | ||||
|     * html/makefile.am | ||||
|     * test/makefile.am | ||||
|     * examples/makefile.am | ||||
|  | ||||
| @@ -156,19 +166,23 @@ FILE DEPENDENCIES | ||||
|   configuration a dependent, i.e.: | ||||
|  | ||||
|     * test/makefile.am depends on AX_USE_LIBTOOL | ||||
|     * html/makefile.am depends on AX_BUILD_HTML | ||||
|     * doc/doxyfile.in depends on AX_BUILD_EXAMPLES | ||||
|     * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT, | ||||
|       AX_CXX_QT, AX_CXX_CHECK_QT, AX_USE_LIBTOOL | ||||
|       AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL | ||||
|     * debian/${DEFAULT_PROJECT_NAME}.install depends on AX_USE_LIBTOOL | ||||
|     * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL | ||||
|     * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL | ||||
|     * debian/${DEFAULT_PROJECT_NAME}-dev.dirs depends on AX_USE_LIBTOOL | ||||
|     * ${DEFAULT_PROJECT_NAME}.spec.in depends on AX_USE_RPM_PACKAGING, | ||||
|       AX_USE_LIBTOOL, AX_CHECK_QT, AX_REQUIRE_QT, AX_CXX_QT, AX_USE_CPPUNIT | ||||
|  | ||||
| FILES | ||||
|  | ||||
|   * AUTHORS:      First line is the main author and used in Debian and RPM | ||||
|                   packaging, so there must be a GPG key that matches | ||||
|                   to this line. | ||||
|   * NEWS:         File to add project news. | ||||
|   * README:       First line is a short description of your project, then an | ||||
|                   empty line must follow. All remaining lines are a | ||||
|                   long description of your project. this information | ||||
| @@ -189,7 +203,7 @@ FILES | ||||
|       * Enable Scripts: AX_USE_SCRIPTS | ||||
|       * Enable Doxygen documentation generation: AX_USE_DOXYGEN | ||||
|       * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING | ||||
|       * Not yet implemented: AX_USE_RPM_PACKAGING | ||||
|       * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING | ||||
|       * Enable C++ testing using CppUnit: AX_USE_CPPUNIT | ||||
|       * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES | ||||
|       * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4) | ||||
| @@ -266,7 +280,8 @@ run() { | ||||
| } | ||||
|  | ||||
| testtag() { | ||||
|     egrep -q '^ *'"$1" configure.ac | ||||
|     local IFS="|" | ||||
|     egrep -q '^ *'"($*)" configure.ac | ||||
| } | ||||
|  | ||||
| contains() { | ||||
| @@ -295,7 +310,7 @@ to() { | ||||
|         mode="u=rw,g=rw,o=r" | ||||
|         case "$1" in | ||||
|             (--condition) shift # test for a tag, abort if not set | ||||
|                 if ! testtag "$1" configure.ac; then | ||||
|                 if ! testtag "$1"; then | ||||
|                     return | ||||
|                 fi;; | ||||
|             (--mode) shift # test for a tag, abort if not set | ||||
| @@ -304,7 +319,7 @@ to() { | ||||
|         esac | ||||
|         shift; | ||||
|     done | ||||
|     if checkfile "$1" && test $rebuild -eq 0 \ | ||||
|     if checkfile "$1" && test $rebuild -eq 0 -o "$1" = "configure.ac" \ | ||||
|         && ! contains "$1" "${rebuildfiles[@]}"; then | ||||
|         # file already exists and must not be rebuilt | ||||
|         return 1 | ||||
| @@ -371,6 +386,8 @@ copy ${MY_NAME} | ||||
| copy ax_init_standard_project.m4 | ||||
| copy ax_cxx_compile_stdcxx_11.m4 | ||||
| copy ax_check_qt.m4 | ||||
| copy resolve-debbuilddeps.sh | ||||
| copy mac-create-app-bundle.sh | ||||
| AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1) | ||||
| if test -z "${AUTHOR}"; then | ||||
|     AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>" | ||||
| @@ -378,13 +395,21 @@ fi | ||||
| to AUTHORS <<EOF && notice "please edit AUTHORS" | ||||
| $AUTHOR | ||||
| EOF | ||||
| to NEWS <<EOF && notice "please edit NEWS" | ||||
| $(date) created ${DEFAULT_PROJECT_NAME} | ||||
| EOF | ||||
| to README <<EOF && notice "please edit README" | ||||
| ${DEFAULT_PROJECT_NAME} | ||||
|  | ||||
| add description for ${DEFAULT_PROJECT_NAME} | ||||
| EOF | ||||
| to configure.ac <<EOF && \ | ||||
|     ( notice "please edit configure.ac, then rerun $0"; exit 0 ) | ||||
| ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name | ||||
| m4_define(x_major, 0) # project's major version | ||||
| m4_define(x_minor, 0) # project's minor version | ||||
| m4_include(ax_init_standard_project.m4) | ||||
| AC_INIT(x_package_name, x_version, x_package_name) | ||||
| AC_INIT(x_package_name, x_version, x_bugreport, x_package_name) | ||||
| AM_INIT_AUTOMAKE([1.9 tar-pax]) | ||||
| AX_INIT_STANDARD_PROJECT | ||||
|  | ||||
| @@ -397,16 +422,92 @@ AX_INIT_STANDARD_PROJECT | ||||
| #AX_USE_RPM_PACKAGING | ||||
| #AX_USE_CPPUNIT | ||||
| #AX_BUILD_EXAMPLES | ||||
| #AX_BUILD_HTML | ||||
|  | ||||
| # qt features, uncomment, what you need: | ||||
| #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) | ||||
| #AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) | ||||
| #AX_QT_NO_KEYWORDS | ||||
|  | ||||
| # create output | ||||
| AC_OUTPUT | ||||
| EOF | ||||
| PACKAGE_NAME=$(sed -n 's/.*m4_define *( *x_package_name *, *\([^ ]*\) *).*/\1/p' configure.ac) | ||||
| echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_CXX src/makefile.am | ||||
| if ! testtag "AX_CHECK_QT" configure.ac && \ | ||||
|    ! testtag "AX_REQUIRE_QT" configure.ac; then | ||||
|     echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \ | ||||
|         to --condition AX_USE_CXX src/makefile.am | ||||
| else | ||||
|     to --condition AX_USE_CXX src/makefile.am <<EOF | ||||
| ${HEADER}bin_PROGRAMS = ${PACKAGE_NAME} | ||||
|  | ||||
| ## required to enable the translation feature | ||||
| LANGUAGE_FILE_BASE = ${PACKAGE_NAME} | ||||
|  | ||||
| ## list here the Qt plugins your project depends on | ||||
| ## required to build Mac OS-X app-bundle | ||||
| QT_PLUGINS = iconengines imageformats platforms | ||||
|  | ||||
| #### enable if you deliver a KDE/Gnome desktop file | ||||
| #applicationsdir = ${datarootdir}/applications | ||||
| #dist_applications_DATA = ${PACKAGE_NAME}.desktop | ||||
|  | ||||
| #### enable (ev. instead of bin_PROGRAMS) if you build a library | ||||
| #lib_LTLIBRARIES = ${PACKAGE_NAME}.la | ||||
| #${PACKAGE_NAME}_la_SOURCES = libmain.cxx version.cxx | ||||
| ## noop to prevent: | ||||
| ## «src/makefile.am: error: object 'version.\$(OBJEXT)' created both with | ||||
| ## libtool and without» | ||||
| #${PACKAGE_NAME}_la_CXXFLAGS = \$(AM_CXXFLAGS) | ||||
|  | ||||
| ## list headers that are required for build, but that are not installed | ||||
| noinst_HEADERS = version.hxx | ||||
|  | ||||
| ## list all %.hxx files with Q_OBJECT as moc_%.cxx | ||||
| ${PACKAGE_NAME//-/_}_MOCFILES = moc_${PACKAGE_NAME}.cxx | ||||
|  | ||||
| ## list all %.ui files as ui_%.hxx | ||||
| ${PACKAGE_NAME//-/_}_UIFILES = ui_${PACKAGE_NAME}.hxx | ||||
|  | ||||
| ## list all %.qrc resource files as qrc_%.cxx | ||||
| ## note: if there exists a directory %, the file %.qrc is generated from that | ||||
| ${PACKAGE_NAME//-/_}_RESOURCES = qrc_languages.cxx qrc_resources.cxx | ||||
|  | ||||
| ## list all final translation files, list all supported languages here | ||||
| ${PACKAGE_NAME//-/_}_TRANSLATIONS = \${LANGUAGE_FILE_BASE}_en.qm	\\ | ||||
|      \${LANGUAGE_FILE_BASE}_de.qm \\ | ||||
|      \${LANGUAGE_FILE_BASE}_fr.qm \\ | ||||
|      \${LANGUAGE_FILE_BASE}_it.qm | ||||
|  | ||||
| ## list all C++ files that need translation | ||||
| ${PACKAGE_NAME//-/_}_TR_FILES = main.cxx version.cxx | ||||
|  | ||||
| ## automatic assembly, no need to change | ||||
| ${PACKAGE_NAME//-/_}_SOURCES = ${swisssign_pin_entry_TR_FILES} ${BUILT_SOURCES} | ||||
|  | ||||
| ## automatic assembly, no need to change | ||||
| BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \ | ||||
|                 \${${PACKAGE_NAME//-/_}_UIFILES} \ | ||||
|                 \${${PACKAGE_NAME//-/_}_TRANSLATIONS} \ | ||||
|                 \${${PACKAGE_NAME//-/_}_RESOURCES} | ||||
|  | ||||
| ## automatic assembly, no need to change | ||||
| EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \ | ||||
|                 \${${PACKAGE_NAME//-/_}_UIFILES:ui_%.hxx=%.ui} | ||||
|  | ||||
| ## automatic assembly, no need to change | ||||
| ## except: adapt the pre-delivered qt_%.qm list (language files you copy from qt | ||||
| EXTRA_DIST = \${EXTRA_DIST_TR} \ | ||||
|              \${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx:%.qrc} \ | ||||
|              \${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \ | ||||
|              qt_de.qm qt_fr.qm | ||||
|  | ||||
| ## automatic assembly, no need to change | ||||
| LANGUAGE_FILES = \${EXTRA_DIST_TR} \${${PACKAGE_NAME//-/_}_TR_FILES} | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
| EOF | ||||
| fi | ||||
| to --condition AX_USE_CXX src/version.hxx <<EOF | ||||
| /*! @file | ||||
|  | ||||
| @@ -487,22 +588,30 @@ EOF | ||||
| echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am | ||||
| echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am | ||||
| to --condition AX_USE_CPPUNIT test/makefile.am <<EOF | ||||
| ${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src | ||||
| AM_LDFLAGS = -L${top_builddir}/src/.libs | ||||
| LDADD = -l${PACKAGE_NAME} | ||||
| ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src | ||||
| AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs | ||||
| LDADD = -l${PACKAGE_NAME#lib} | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
| EOF | ||||
| to --condition AX_BUILD_EXAMPLES examples/makefile.am <<EOF | ||||
| ${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src | ||||
| AM_LDFLAGS = -L${top_builddir}/src/.libs | ||||
| LDADD = -l${PACKAGE_NAME} | ||||
| ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src | ||||
| AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs | ||||
| LDADD = -l${PACKAGE_NAME#lib} | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
| EOF | ||||
| if testtag AX_USE_DOXYGEN && \ | ||||
|     ( ! checkfile doc/doxyfile.in || \ | ||||
|       contains doc/doxyfile.in "${rebuildfiles[@]}" ); then | ||||
| to --condition AX_BUILD_HTML html/makefile.am <<EOF | ||||
| ${HEADER}EXTRA_DIST = \${www_DATA} | ||||
|  | ||||
| wwwdir = \${pkgdatadir}/html | ||||
| www_DATA =  | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
| EOF | ||||
| if testtag AX_USE_DOXYGEN; then | ||||
|     if ! checkfile doc/doxyfile.in || \ | ||||
|         contains doc/doxyfile.in "${rebuildfiles[@]}"; then | ||||
|         run doxygen -g doc/doxyfile.in | ||||
|         if test $exists -eq 0; then | ||||
|             run svn add doc/doxyfile.in | ||||
| @@ -541,11 +650,13 @@ if testtag AX_USE_DOXYGEN && \ | ||||
|         if testtag AX_USE_SCRIPTS; then | ||||
|             doxyadd INPUT "@top_srcdir@/scripts" | ||||
|         fi | ||||
|         if testtag AX_BUILD_HTML; then | ||||
|             doxyadd INPUT "@top_srcdir@/html" | ||||
|         fi | ||||
|         if testtag AX_USE_CPPUNIT; then | ||||
|             doxyadd INPUT "@top_srcdir@/test" | ||||
|         fi | ||||
|     doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js' | ||||
|     doxyadd FILE_PATTERNS *.wt | ||||
|         doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt' | ||||
|         doxyreplace RECURSIVE YES | ||||
|         doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*" | ||||
|         if testtag AX_BUILD_EXAMPLES; then | ||||
| @@ -572,6 +683,7 @@ if testtag AX_USE_DOXYGEN && \ | ||||
|         doxyreplace DOT_IMAGE_FORMAT svg | ||||
|         doxyreplace INTERACTIVE_SVG YES | ||||
|         doxyreplace DOT_TRANSPARENT YES | ||||
|     fi | ||||
| fi | ||||
| if testtag AX_USE_DEBIAN_PACKAGING; then | ||||
|     checkdir debian | ||||
| @@ -586,10 +698,11 @@ EOF | ||||
| Source: @PACKAGE_NAME@ | ||||
| Priority: extra | ||||
| Maintainer: @AUTHOR@ | ||||
| Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi) | ||||
| Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi) | ||||
|  | ||||
| Package: @PACKAGE_NAME@ | ||||
| $(if testtag AX_USE_LIBTOOL; then echo "Section: libs"; fi)Architecture: any | ||||
| Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi) | ||||
| Architecture: any | ||||
| Depends: \${shlibs:Depends}, \${misc:Depends} | ||||
| Description: @DESCRIPTION@ | ||||
| @README_DEB@ | ||||
| @@ -618,6 +731,7 @@ usr/lib/lib*.a | ||||
| usr/lib/lib*.so | ||||
| usr/lib/pkgconfig/* | ||||
| usr/lib/*.la | ||||
| usr/share/${PACKAGE_NAME} | ||||
| usr/share/doc/${PACKAGE_NAME}/html | ||||
| EOF | ||||
|     to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF | ||||
| @@ -626,13 +740,131 @@ ${HEADER}%: | ||||
| EOF | ||||
|     echo 7 | to debian/compat | ||||
| fi | ||||
| to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF | ||||
| Summary: @DESCRIPTION@ | ||||
| Name: @PACKAGE_NAME@ | ||||
| Version: @VERSION@ | ||||
| Release: @BUILD_NUMBER@%{?dist} | ||||
| License: LGPL | ||||
| Group: $(if testtag AX_USE_LIBTOOL; then | ||||
|   echo Development/Libraries/C++; | ||||
| else | ||||
|   echo Applications/...; | ||||
| fi) | ||||
| Source0: %{name}-%{version}.tar.gz | ||||
| BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root | ||||
| BuildRequires: gnupg, subversion, automake, autoconf$( | ||||
|     if testtag AX_USE_DOXYGEN; then | ||||
|       echo -n ", doxygen"; | ||||
|     fi) | ||||
| %if 0%{?fedora} != 20 | ||||
| $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi) | ||||
| %endif | ||||
| %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} | ||||
| BuildRequires: pkgconfig, redhat-lsb$( | ||||
|     if testtag AX_USE_CPPUNIT; then | ||||
|       echo -n ", cppunit-devel"; | ||||
|     fi) | ||||
| %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} ) | ||||
| $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi) | ||||
| $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi) | ||||
| %else | ||||
| $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt-devel"; fi) | ||||
| %endif | ||||
| %else%if 0%{?suse_version} || 0%{?sles_version} | ||||
| BuildRequires: pkg-config, lsb-release$( | ||||
|     if testtag AX_USE_CPPUNIT; then | ||||
|       echo -n ", libcppunit-devel"; | ||||
|     fi) | ||||
| %if 0%{?suse_version} < 1200 ||  0%{?sles_version} < 1200 | ||||
| $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi) | ||||
| %else | ||||
| $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi) | ||||
| %endif | ||||
| %endif%endif | ||||
|  | ||||
| %description | ||||
| @README@ | ||||
| $(if testtag AX_USE_LIBTOOL; then | ||||
| echo | ||||
| echo This package contains only the shared libraries required at runtime. | ||||
| fi) | ||||
|  | ||||
|  | ||||
| %prep | ||||
| %setup -q | ||||
| ./configure --prefix=/usr \\ | ||||
|             --sysconfdir=/etc \\ | ||||
|             --docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \\ | ||||
|             --libdir=/usr/%_lib | ||||
|  | ||||
| %build | ||||
| make | ||||
|  | ||||
| %install | ||||
| DESTDIR=\$RPM_BUILD_ROOT make install | ||||
|  | ||||
| %clean | ||||
| rm -rf \$RPM_BUILD_ROOT | ||||
|  | ||||
| %files | ||||
| %defattr(-,root,root,-) | ||||
| $(if testtag AX_USE_LIBTOOL; then | ||||
| echo '/usr/%_lib/@PACKAGE_NAME@.so.*' | ||||
| else | ||||
| echo '/usr/bin/*' | ||||
| fi) | ||||
| %doc | ||||
| $(if testtag AX_USE_LIBTOOL; then | ||||
|   cat <<EOF2 | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/COPYING | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/INSTALL | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/NEWS | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/README | ||||
| EOF2 | ||||
| else | ||||
|   echo '/usr/share/*' | ||||
| fi) | ||||
|  | ||||
| $(if testtag AX_USE_LIBTOOL; then | ||||
| cat <<EOF2 | ||||
| %package devel | ||||
| Summary: @DESCRIPTION@ | ||||
| Group: Development/Libraries/C++ | ||||
| Requires: @PACKAGE_NAME@ = @VERSION@ | ||||
|  | ||||
| %description devel | ||||
| @README@ | ||||
|  | ||||
| This Package contains all files required for developement. | ||||
|  | ||||
| %files devel | ||||
| %defattr(-,root,root,-) | ||||
| /usr/%_lib/@PACKAGE_NAME@.so | ||||
| /usr/%_lib/@PACKAGE_NAME@.a | ||||
| /usr/%_lib/@PACKAGE_NAME@.la | ||||
| /usr/%_lib/pkgconfig | ||||
| /usr/include/* | ||||
| %doc | ||||
| /usr/share/@PACKAGE_NAME@ | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/html | ||||
| EOF2 | ||||
| fi) | ||||
|  | ||||
| %changelog | ||||
|  | ||||
| EOF | ||||
| SUBDIRS="" | ||||
| for d in src test scripts doc examples; do | ||||
| for d in src test scripts doc examples html; do | ||||
|     test -d $d && SUBDIRS="${SUBDIRS} $d" | ||||
| done | ||||
| to makefile.am<<EOF | ||||
| ${HEADER}SUBDIRS =${SUBDIRS} | ||||
|  | ||||
| doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
| EOF | ||||
| to --condition AX_USE_LIBTOOL src/${PACKAGE_NAME}.pc.in <<EOF | ||||
| @@ -640,11 +872,12 @@ ${HEADER}prefix=@prefix@ | ||||
| exec_prefix=@exec_prefix@ | ||||
| libdir=\${exec_prefix}/lib | ||||
| includedir=\${prefix}/include | ||||
| translationsdir=@datadir@/@PACKAGE_NAME@/translations | ||||
|  | ||||
| Name: @PACKAGE_NAME@ | ||||
| Description: @DESCRIPTION@ | ||||
| Version: @VERSION@ | ||||
| Libs: -L\${libdir} -l@PACKAGE_NAME@ @LDFLAGS@ | ||||
| Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@ | ||||
| Cflags: -I\${includedir} @CPPFLAGS@ | ||||
| Requires: @PKG_REQUIREMENTS@ | ||||
| EOF | ||||
| @@ -655,8 +888,9 @@ if test -f makefile; then | ||||
| fi | ||||
|  | ||||
| #### Bootstrap Before Configure #### | ||||
| run --no-check svn2cl | ||||
| run aclocal | ||||
| run libtoolize --force | ||||
| if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi | ||||
| run automake -a | ||||
| run autoconf | ||||
|  | ||||
| @@ -667,5 +901,5 @@ fi | ||||
|  | ||||
| #### Run Make If User Requires #### | ||||
| if test "$build" -eq 1; then | ||||
|     make | ||||
|     make $buildtarget | ||||
| fi | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|  | ||||
| m4_define(x_package_name, swisssurfer) # project's name | ||||
| m4_define(x_major, 1) # project's major version | ||||
| m4_define(x_minor, 2) # project's minor version | ||||
| m4_define(x_minor, 9) # project's minor version | ||||
| m4_include(ax_init_standard_project.m4) | ||||
| AC_INIT(x_package_name, x_major.x_minor.x_least, x_bugreport, x_package_name) | ||||
| AM_INIT_AUTOMAKE([1.9 tar-pax]) | ||||
| @@ -39,7 +39,7 @@ AC_ARG_ENABLE(pkcs11-download, | ||||
|    fi | ||||
|   ]) | ||||
|  | ||||
| AX_REQUIRE_QT([QT], [QtCore QtNetwork QtWebKit QtDesigner], | ||||
| AX_REQUIRE_QT([QT], [QtCore QtNetwork QtWebKit], | ||||
|                     [QtWidgets QtWebKitWidgets QtPrintSupport]) | ||||
| AX_QT_NO_KEYWORDS | ||||
|  | ||||
| @@ -50,7 +50,7 @@ AX_PKG_REQUIRE([libpcscxx]) | ||||
| AX_PKG_REQUIRE([proxyface]) | ||||
| AX_PKG_REQUIRE([mrwcxx], [mrw-c++]) | ||||
|  | ||||
| AC_CONFIG_FILES([src/qbrowserlib/makefile src/designer/makefile]) | ||||
| AC_CONFIG_FILES([src/qbrowserlib/makefile]) #src/designer/makefile | ||||
|  | ||||
| # create output | ||||
| AC_OUTPUT | ||||
|   | ||||
							
								
								
									
										28
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							| @@ -1,26 +1,18 @@ | ||||
| Source: @PACKAGE_NAME@ | ||||
| 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, libpcscxx-dev, qttools5-dev | libqt4-dev, libpcsclite-dev | ||||
| Standards-Version: 3.8.1 | ||||
| Homepage: https://dev.marc.waeckerlin.org/redmine/projects/swisssurfer | ||||
|  | ||||
| Package: @PACKAGE_NAME@-dev | ||||
| Provides: swissbrowser-dev | ||||
| Conflicts: swissbrowser-dev | ||||
| Replaces: swissbrowser-dev | ||||
| Section: devel | ||||
| Architecture: any | ||||
| Depends: @PACKAGE_NAME@ (= ${binary:Version}) | ||||
| Description: @PACKAGE_NAME@ - Development Package | ||||
| @README_DEB@ | ||||
| Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, mscgen, qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools | ||||
|  | ||||
| Package: @PACKAGE_NAME@ | ||||
| Provides: swissbrowser | ||||
| Conflicts: swissbrowser | ||||
| Replaces: swissbrowser | ||||
| Section: web | ||||
| Section: libs | ||||
| Architecture: any | ||||
| Depends: ${shlibs:Depends}, ${misc:Depends} | ||||
| Description: @PACKAGE_NAME@ | ||||
| Description: @DESCRIPTION@ | ||||
| @README_DEB@ | ||||
|  | ||||
| Package: @PACKAGE_NAME@-dev | ||||
| Section: libdevel | ||||
| Architecture: any | ||||
| Depends: @PACKAGE_NAME@ (= ${binary:Version}) | ||||
| Description: @DESCRIPTION@ - Development Package | ||||
| @README_DEB@ | ||||
|   | ||||
							
								
								
									
										27
									
								
								debian/copyright
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										27
									
								
								debian/copyright
									
									
									
									
										vendored
									
									
								
							| @@ -1,27 +0,0 @@ | ||||
| This package was debianized by Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com> 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) <marc.waeckerlin@tech.swisssign.com> | ||||
|  | ||||
| Copyright: | ||||
|  | ||||
|     Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com> | ||||
|  | ||||
| License: | ||||
|  | ||||
|     LGPL version 3 | ||||
|  | ||||
| The Debian packaging is: | ||||
|  | ||||
|     Copyright (C) 2010 Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com> | ||||
|  | ||||
| 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. | ||||
							
								
								
									
										4
									
								
								debian/cron.d.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/cron.d.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,4 +0,0 @@ | ||||
| # | ||||
| # Regular cron jobs for the init package | ||||
| # | ||||
| 0 4	* * *	root	[ -x /usr/bin/init_maintenance ] && /usr/bin/init_maintenance | ||||
							
								
								
									
										0
									
								
								debian/dirs
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								debian/dirs
									
									
									
									
										vendored
									
									
								
							
							
								
								
									
										45
									
								
								debian/emacsen-install.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										45
									
								
								debian/emacsen-install.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,45 +0,0 @@ | ||||
| #! /bin/sh -e | ||||
| # /usr/lib/emacsen-common/packages/install/init | ||||
|  | ||||
| # Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily | ||||
| # from the install scripts for gettext by Santiago Vila | ||||
| # <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>. | ||||
|  | ||||
| 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 | ||||
							
								
								
									
										15
									
								
								debian/emacsen-remove.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								debian/emacsen-remove.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,15 +0,0 @@ | ||||
| #!/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 | ||||
							
								
								
									
										25
									
								
								debian/emacsen-startup.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								debian/emacsen-startup.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,25 +0,0 @@ | ||||
| ;; -*-emacs-lisp-*- | ||||
| ;; | ||||
| ;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50init.el | ||||
| ;; for the Debian init package | ||||
| ;; | ||||
| ;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at> | ||||
| ;; Modified by Dirk Eddelbuettel <edd@debian.org> | ||||
| ;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org> | ||||
|  | ||||
| ;; 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)))) | ||||
|  | ||||
							
								
								
									
										59
									
								
								debian/manpage.1.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										59
									
								
								debian/manpage.1.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,59 +0,0 @@ | ||||
| .\"                                      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 <n>    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<whatever>\fP and | ||||
| .\" \fI<whatever>\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 <upstream author>. | ||||
| .PP | ||||
| This manual page was written by Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>, | ||||
| for the Debian project (and may be used by others). | ||||
							
								
								
									
										154
									
								
								debian/manpage.sgml.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										154
									
								
								debian/manpage.sgml.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,154 +0,0 @@ | ||||
| <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ | ||||
|  | ||||
| <!-- Process this file with docbook-to-man to generate an nroff manual | ||||
|      page: `docbook-to-man manpage.sgml > 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. | ||||
|  | ||||
|   --> | ||||
|  | ||||
|   <!-- Fill in your name for FIRSTNAME and SURNAME. --> | ||||
|   <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> | ||||
|   <!ENTITY dhsurname   "<surname>SURNAME</surname>"> | ||||
|   <!-- Please adjust the date whenever revising the manpage. --> | ||||
|   <!ENTITY dhdate      "<date>April  8, 2010</date>"> | ||||
|   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are | ||||
|        allowed: see man(7), man(1). --> | ||||
|   <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>"> | ||||
|   <!ENTITY dhemail     "<email>marc.waeckerlin@tech.swisssign.com</email>"> | ||||
|   <!ENTITY dhusername  "Marc Wäckerlin (SwissSign AG)"> | ||||
|   <!ENTITY dhucpackage "<refentrytitle>INIT</refentrytitle>"> | ||||
|   <!ENTITY dhpackage   "init"> | ||||
|  | ||||
|   <!ENTITY debian      "<productname>Debian</productname>"> | ||||
|   <!ENTITY gnu         "<acronym>GNU</acronym>"> | ||||
|   <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>"> | ||||
| ]> | ||||
|  | ||||
| <refentry> | ||||
|   <refentryinfo> | ||||
|     <address> | ||||
|       &dhemail; | ||||
|     </address> | ||||
|     <author> | ||||
|       &dhfirstname; | ||||
|       &dhsurname; | ||||
|     </author> | ||||
|     <copyright> | ||||
|       <year>2003</year> | ||||
|       <holder>&dhusername;</holder> | ||||
|     </copyright> | ||||
|     &dhdate; | ||||
|   </refentryinfo> | ||||
|   <refmeta> | ||||
|     &dhucpackage; | ||||
|  | ||||
|     &dhsection; | ||||
|   </refmeta> | ||||
|   <refnamediv> | ||||
|     <refname>&dhpackage;</refname> | ||||
|  | ||||
|     <refpurpose>program to do something</refpurpose> | ||||
|   </refnamediv> | ||||
|   <refsynopsisdiv> | ||||
|     <cmdsynopsis> | ||||
|       <command>&dhpackage;</command> | ||||
|  | ||||
|       <arg><option>-e <replaceable>this</replaceable></option></arg> | ||||
|  | ||||
|       <arg><option>--example <replaceable>that</replaceable></option></arg> | ||||
|     </cmdsynopsis> | ||||
|   </refsynopsisdiv> | ||||
|   <refsect1> | ||||
|     <title>DESCRIPTION</title> | ||||
|  | ||||
|     <para>This manual page documents briefly the | ||||
|       <command>&dhpackage;</command> and <command>bar</command> | ||||
|       commands.</para> | ||||
|  | ||||
|     <para>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; | ||||
|       <application>Info</application> format; see below.</para> | ||||
|  | ||||
|     <para><command>&dhpackage;</command> is a program that...</para> | ||||
|  | ||||
|   </refsect1> | ||||
|   <refsect1> | ||||
|     <title>OPTIONS</title> | ||||
|  | ||||
|     <para>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 | ||||
|       <application>Info</application> files.</para> | ||||
|  | ||||
|     <variablelist> | ||||
|       <varlistentry> | ||||
|         <term><option>-h</option> | ||||
|           <option>--help</option> | ||||
|         </term> | ||||
|         <listitem> | ||||
|           <para>Show summary of options.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|       <varlistentry> | ||||
|         <term><option>-v</option> | ||||
|           <option>--version</option> | ||||
|         </term> | ||||
|         <listitem> | ||||
|           <para>Show version of program.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|     </variablelist> | ||||
|   </refsect1> | ||||
|   <refsect1> | ||||
|     <title>SEE ALSO</title> | ||||
|  | ||||
|     <para>bar (1), baz (1).</para> | ||||
|  | ||||
|     <para>The programs are documented fully by <citetitle>The Rise and | ||||
|       Fall of a Fooish Bar</citetitle> available via the | ||||
|       <application>Info</application> system.</para> | ||||
|   </refsect1> | ||||
|   <refsect1> | ||||
|     <title>AUTHOR</title> | ||||
|  | ||||
|     <para>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. | ||||
|     </para> | ||||
|     <para> | ||||
|       On Debian systems, the complete text of the GNU General Public | ||||
|       License can be found in /usr/share/common-licenses/GPL. | ||||
|     </para> | ||||
|  | ||||
|   </refsect1> | ||||
| </refentry> | ||||
|  | ||||
| <!-- Keep this comment at the end of the file | ||||
| Local variables: | ||||
| mode: sgml | ||||
| sgml-omittag:t | ||||
| sgml-shorttag:t | ||||
| sgml-minimize-attributes:nil | ||||
| sgml-always-quote-attributes:t | ||||
| sgml-indent-step:2 | ||||
| sgml-indent-data:t | ||||
| sgml-parent-document:nil | ||||
| sgml-default-dtd-file:nil | ||||
| sgml-exposed-tags:nil | ||||
| sgml-local-catalogs:nil | ||||
| sgml-local-ecat-files:nil | ||||
| End: | ||||
| --> | ||||
							
								
								
									
										291
									
								
								debian/manpage.xml.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										291
									
								
								debian/manpage.xml.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,291 +0,0 @@ | ||||
| <?xml version='1.0' encoding='UTF-8'?> | ||||
| <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" | ||||
| "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ | ||||
|  | ||||
| <!-- | ||||
|  | ||||
| `xsltproc -''-nonet \ | ||||
|           -''-param man.charmap.use.subset "0" \ | ||||
|           -''-param make.year.ranges "1" \ | ||||
|           -''-param make.single.year.ranges "1" \ | ||||
|           /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \ | ||||
|           manpage.xml' | ||||
|  | ||||
| A manual page <package>.<section> will be generated. You may view the | ||||
| manual page with: nroff -man <package>.<section> | 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 | ||||
| <refsect1> ... </refsect1>. | ||||
|  | ||||
| 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/ | ||||
|  | ||||
| --> | ||||
|  | ||||
|   <!-- Fill in your name for FIRSTNAME and SURNAME. --> | ||||
|   <!ENTITY dhfirstname "FIRSTNAME"> | ||||
|   <!ENTITY dhsurname   "SURNAME"> | ||||
|   <!-- dhusername could also be set to "&firstname; &surname;". --> | ||||
|   <!ENTITY dhusername  "Marc Wäckerlin (SwissSign AG)"> | ||||
|   <!ENTITY dhemail     "marc.waeckerlin@tech.swisssign.com"> | ||||
|   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are | ||||
|        allowed: see man(7), man(1) and | ||||
|        http://www.tldp.org/HOWTO/Man-Page/q2.html. --> | ||||
|   <!ENTITY dhsection   "SECTION"> | ||||
|   <!-- TITLE should be something like "User commands" or similar (see | ||||
|        http://www.tldp.org/HOWTO/Man-Page/q2.html). --> | ||||
|   <!ENTITY dhtitle     "init User Manual"> | ||||
|   <!ENTITY dhucpackage "INIT"> | ||||
|   <!ENTITY dhpackage   "init"> | ||||
| ]> | ||||
|  | ||||
| <refentry> | ||||
|   <refentryinfo> | ||||
|     <title>&dhtitle;</title> | ||||
|     <productname>&dhpackage;</productname> | ||||
|     <authorgroup> | ||||
|       <author> | ||||
|        <firstname>&dhfirstname;</firstname> | ||||
|         <surname>&dhsurname;</surname> | ||||
|         <contrib>Wrote this manpage for the Debian system.</contrib> | ||||
|         <address> | ||||
|           <email>&dhemail;</email> | ||||
|         </address> | ||||
|       </author> | ||||
|     </authorgroup> | ||||
|     <copyright> | ||||
|       <year>2007</year> | ||||
|       <holder>&dhusername;</holder> | ||||
|     </copyright> | ||||
|     <legalnotice> | ||||
|       <para>This manual page was written for the Debian system | ||||
|         (and may be used by others).</para> | ||||
|       <para>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.</para> | ||||
|       <para>On Debian systems, the complete text of the GNU General Public | ||||
|         License can be found in | ||||
|         <filename>/usr/share/common-licenses/GPL</filename>.</para> | ||||
|     </legalnotice> | ||||
|   </refentryinfo> | ||||
|   <refmeta> | ||||
|     <refentrytitle>&dhucpackage;</refentrytitle> | ||||
|     <manvolnum>&dhsection;</manvolnum> | ||||
|   </refmeta> | ||||
|   <refnamediv> | ||||
|     <refname>&dhpackage;</refname> | ||||
|     <refpurpose>program to do something</refpurpose> | ||||
|   </refnamediv> | ||||
|   <refsynopsisdiv> | ||||
|     <cmdsynopsis> | ||||
|       <command>&dhpackage;</command> | ||||
|       <!-- These are several examples, how syntaxes could look --> | ||||
|       <arg choice="plain"><option>-e <replaceable>this</replaceable></option></arg> | ||||
|       <arg choice="opt"><option>--example=<parameter>that</parameter></option></arg> | ||||
|       <arg choice="opt"> | ||||
|         <group choice="req"> | ||||
|           <arg choice="plain"><option>-e</option></arg> | ||||
|           <arg choice="plain"><option>--example</option></arg> | ||||
|         </group> | ||||
|         <replaceable class="option">this</replaceable> | ||||
|       </arg> | ||||
|       <arg choice="opt"> | ||||
|         <group choice="req"> | ||||
|           <arg choice="plain"><option>-e</option></arg> | ||||
|           <arg choice="plain"><option>--example</option></arg> | ||||
|         </group> | ||||
|         <group choice="req"> | ||||
|           <arg choice="plain"><replaceable>this</replaceable></arg> | ||||
|           <arg choice="plain"><replaceable>that</replaceable></arg> | ||||
|         </group> | ||||
|       </arg> | ||||
|     </cmdsynopsis> | ||||
|     <cmdsynopsis> | ||||
|       <command>&dhpackage;</command> | ||||
|       <!-- Normally the help and version options make the programs stop | ||||
|            right after outputting the requested information. --> | ||||
|       <group choice="opt"> | ||||
|         <arg choice="plain"> | ||||
|           <group choice="req"> | ||||
|             <arg choice="plain"><option>-h</option></arg> | ||||
|             <arg choice="plain"><option>--help</option></arg> | ||||
|           </group> | ||||
|         </arg> | ||||
|         <arg choice="plain"> | ||||
|           <group choice="req"> | ||||
|             <arg choice="plain"><option>-v</option></arg> | ||||
|             <arg choice="plain"><option>--version</option></arg> | ||||
|           </group> | ||||
|         </arg> | ||||
|       </group> | ||||
|     </cmdsynopsis> | ||||
|   </refsynopsisdiv> | ||||
|   <refsect1 id="description"> | ||||
|     <title>DESCRIPTION</title> | ||||
|     <para>This manual page documents briefly the | ||||
|       <command>&dhpackage;</command> and <command>bar</command> | ||||
|       commands.</para> | ||||
|     <para>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 <citerefentry> | ||||
|         <refentrytitle>info</refentrytitle> | ||||
|         <manvolnum>1</manvolnum> | ||||
|       </citerefentry> format; see below.</para> | ||||
|     <para><command>&dhpackage;</command> is a program that...</para> | ||||
|   </refsect1> | ||||
|   <refsect1 id="options"> | ||||
|     <title>OPTIONS</title> | ||||
|     <para>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 | ||||
|       <citerefentry> | ||||
|         <refentrytitle>info</refentrytitle> | ||||
|         <manvolnum>1</manvolnum> | ||||
|       </citerefentry> files.</para> | ||||
|     <variablelist> | ||||
|       <!-- Use the variablelist.term.separator and the | ||||
|            variablelist.term.break.after parameters to | ||||
|            control the term elements. --> | ||||
|       <varlistentry> | ||||
|         <term><option>-e <replaceable>this</replaceable></option></term> | ||||
|         <term><option>--example=<replaceable>that</replaceable></option></term> | ||||
|         <listitem> | ||||
|           <para>Does this and that.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|       <varlistentry> | ||||
|         <term><option>-h</option></term> | ||||
|         <term><option>--help</option></term> | ||||
|         <listitem> | ||||
|           <para>Show summary of options.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|       <varlistentry> | ||||
|         <term><option>-v</option></term> | ||||
|         <term><option>--version</option></term> | ||||
|         <listitem> | ||||
|           <para>Show version of program.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|     </variablelist> | ||||
|   </refsect1> | ||||
|   <refsect1 id="files"> | ||||
|     <title>FILES</title> | ||||
|     <variablelist> | ||||
|       <varlistentry> | ||||
|         <term><filename>/etc/foo.conf</filename></term> | ||||
|         <listitem> | ||||
|           <para>The system-wide configuration file to control the | ||||
|             behaviour of <application>&dhpackage;</application>. See | ||||
|             <citerefentry> | ||||
|               <refentrytitle>foo.conf</refentrytitle> | ||||
|               <manvolnum>5</manvolnum> | ||||
|             </citerefentry> for further details.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|       <varlistentry> | ||||
|         <term><filename>${HOME}/.foo.conf</filename></term> | ||||
|         <listitem> | ||||
|           <para>The per-user configuration file to control the | ||||
|              behaviour of <application>&dhpackage;</application>. See | ||||
|              <citerefentry> | ||||
|                <refentrytitle>foo.conf</refentrytitle> | ||||
|                <manvolnum>5</manvolnum> | ||||
|              </citerefentry> for further details.</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|     </variablelist> | ||||
|   </refsect1> | ||||
|   <refsect1 id="environment"> | ||||
|     <title>ENVIONMENT</title> | ||||
|     <variablelist> | ||||
|       <varlistentry> | ||||
|         <term><envar>FOO_CONF</envar></term> | ||||
|         <listitem> | ||||
|           <para>If used, the defined file is used as configuration | ||||
|             file (see also <xref linkend="files"/>).</para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|     </variablelist> | ||||
|   </refsect1> | ||||
|   <refsect1 id="diagnostics"> | ||||
|     <title>DIAGNOSTICS</title> | ||||
|     <para>The following diagnostics may be issued | ||||
|       on <filename class="devicefile">stderr</filename>:</para> | ||||
|     <variablelist> | ||||
|       <varlistentry> | ||||
|         <term><errortext>Bad configuration file. Exiting.</errortext></term> | ||||
|         <listitem> | ||||
|           <para>The configuration file seems to contain a broken configuration | ||||
|             line. Use the <option>--verbose</option> option, to get more info. | ||||
|           </para> | ||||
|         </listitem> | ||||
|       </varlistentry> | ||||
|     </variablelist> | ||||
|     <para><command>&dhpackage;</command> provides some return codes, that can | ||||
|       be used in scripts:</para> | ||||
|     <segmentedlist> | ||||
|       <segtitle>Code</segtitle> | ||||
|       <segtitle>Diagnostic</segtitle> | ||||
|       <seglistitem> | ||||
|         <seg><errorcode>0</errorcode></seg> | ||||
|         <seg>Program exited successfully.</seg> | ||||
|       </seglistitem> | ||||
|       <seglistitem> | ||||
|         <seg><errorcode>1</errorcode></seg> | ||||
|         <seg>The configuration file seems to be broken.</seg> | ||||
|       </seglistitem> | ||||
|     </segmentedlist> | ||||
|   </refsect1> | ||||
|   <refsect1 id="bugs"> | ||||
|     <!-- Or use this section to tell about upstream BTS. --> | ||||
|     <title>BUGS</title> | ||||
|     <para>The program is currently limited to only work | ||||
|       with the <package>foobar</package> library.</para> | ||||
|     <para>The upstreams <acronym>BTS</acronym> can be found | ||||
|       at <ulink url="http://bugzilla.foo.tld"/>.</para> | ||||
|   </refsect1> | ||||
|   <refsect1 id="see_also"> | ||||
|     <title>SEE ALSO</title> | ||||
|     <!-- In alpabetical order. --> | ||||
|     <para><citerefentry> | ||||
|         <refentrytitle>bar</refentrytitle> | ||||
|         <manvolnum>1</manvolnum> | ||||
|       </citerefentry>, <citerefentry> | ||||
|         <refentrytitle>baz</refentrytitle> | ||||
|         <manvolnum>1</manvolnum> | ||||
|       </citerefentry>, <citerefentry> | ||||
|         <refentrytitle>foo.conf</refentrytitle> | ||||
|         <manvolnum>5</manvolnum> | ||||
|       </citerefentry></para> | ||||
|     <para>The programs are documented fully by <citetitle>The Rise and | ||||
|       Fall of a Fooish Bar</citetitle> available via the <citerefentry> | ||||
|         <refentrytitle>info</refentrytitle> | ||||
|         <manvolnum>1</manvolnum> | ||||
|       </citerefentry> system.</para> | ||||
|   </refsect1> | ||||
| </refentry> | ||||
|  | ||||
							
								
								
									
										13
									
								
								debian/menu
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								debian/menu
									
									
									
									
										vendored
									
									
								
							| @@ -1,13 +0,0 @@ | ||||
| ?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" | ||||
							
								
								
									
										2
									
								
								debian/menu.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/menu.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,2 +0,0 @@ | ||||
| ?package(init):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ | ||||
|   title="init" command="/usr/bin/init" | ||||
							
								
								
									
										39
									
								
								debian/postinst.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										39
									
								
								debian/postinst.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,39 +0,0 @@ | ||||
| #!/bin/sh | ||||
| # postinst script for init | ||||
| # | ||||
| # see: dh_installdeb(1) | ||||
|  | ||||
| set -e | ||||
|  | ||||
| # summary of how this script can be called: | ||||
| #        * <postinst> `configure' <most-recently-configured-version> | ||||
| #        * <old-postinst> `abort-upgrade' <new version> | ||||
| #        * <conflictor's-postinst> `abort-remove' `in-favour' <package> | ||||
| #          <new-version> | ||||
| #        * <postinst> `abort-remove' | ||||
| #        * <deconfigured's-postinst> `abort-deconfigure' `in-favour' | ||||
| #          <failed-install-package> <version> `removing' | ||||
| #          <conflicting-package> <version> | ||||
| # 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 | ||||
							
								
								
									
										37
									
								
								debian/postrm.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										37
									
								
								debian/postrm.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,37 +0,0 @@ | ||||
| #!/bin/sh | ||||
| # postrm script for init | ||||
| # | ||||
| # see: dh_installdeb(1) | ||||
|  | ||||
| set -e | ||||
|  | ||||
| # summary of how this script can be called: | ||||
| #        * <postrm> `remove' | ||||
| #        * <postrm> `purge' | ||||
| #        * <old-postrm> `upgrade' <new-version> | ||||
| #        * <new-postrm> `failed-upgrade' <old-version> | ||||
| #        * <new-postrm> `abort-install' | ||||
| #        * <new-postrm> `abort-install' <old-version> | ||||
| #        * <new-postrm> `abort-upgrade' <old-version> | ||||
| #        * <disappearer's-postrm> `disappear' <overwriter> | ||||
| #          <overwriter-version> | ||||
| # 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 | ||||
							
								
								
									
										35
									
								
								debian/preinst.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										35
									
								
								debian/preinst.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,35 +0,0 @@ | ||||
| #!/bin/sh | ||||
| # preinst script for init | ||||
| # | ||||
| # see: dh_installdeb(1) | ||||
|  | ||||
| set -e | ||||
|  | ||||
| # summary of how this script can be called: | ||||
| #        * <new-preinst> `install' | ||||
| #        * <new-preinst> `install' <old-version> | ||||
| #        * <new-preinst> `upgrade' <old-version> | ||||
| #        * <old-preinst> `abort-upgrade' <new-version> | ||||
| # 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 | ||||
							
								
								
									
										38
									
								
								debian/prerm.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										38
									
								
								debian/prerm.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,38 +0,0 @@ | ||||
| #!/bin/sh | ||||
| # prerm script for init | ||||
| # | ||||
| # see: dh_installdeb(1) | ||||
|  | ||||
| set -e | ||||
|  | ||||
| # summary of how this script can be called: | ||||
| #        * <prerm> `remove' | ||||
| #        * <old-prerm> `upgrade' <new-version> | ||||
| #        * <new-prerm> `failed-upgrade' <old-version> | ||||
| #        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> | ||||
| #        * <deconfigured's-prerm> `deconfigure' `in-favour' | ||||
| #          <package-being-installed> <version> `removing' | ||||
| #          <conflicting-package> <version> | ||||
| # 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 | ||||
							
								
								
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| ## @id $Id$ | ||||
| # | ||||
| # This file has been added by bootstrap.sh on Sat, 09 May 2015 08:50:06 +0200 | ||||
| # This file has been added by bootstrap.sh on Wed, 09 September 2015 10:12:16 +0200 | ||||
| # Feel free to change it or even remove and rebuild it, up to your needs | ||||
| # | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
|   | ||||
							
								
								
									
										1
									
								
								debian/shlibs.local.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/shlibs.local.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1 +0,0 @@ | ||||
| libproxyface 1.0.34 proxyface (>> 1.0.34-0), proxyface (<< 1.0.34-99) | ||||
							
								
								
									
										3
									
								
								debian/swisssurfer-dev.dirs
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								debian/swisssurfer-dev.dirs
									
									
									
									
										vendored
									
									
								
							| @@ -1,3 +0,0 @@ | ||||
| usr/lib | ||||
| usr/include | ||||
| usr/share | ||||
							
								
								
									
										1
									
								
								debian/swisssurfer-dev.install
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/swisssurfer-dev.install
									
									
									
									
										vendored
									
									
								
							| @@ -3,4 +3,5 @@ usr/lib/lib*.a | ||||
| usr/lib/lib*.so | ||||
| usr/lib/pkgconfig/* | ||||
| usr/lib/*.la | ||||
| usr/share/swisssurfer | ||||
| usr/share/doc/swisssurfer/html | ||||
|   | ||||
							
								
								
									
										3
									
								
								debian/swisssurfer.dirs
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								debian/swisssurfer.dirs
									
									
									
									
										vendored
									
									
								
							| @@ -1,3 +0,0 @@ | ||||
| usr/lib | ||||
| usr/bin | ||||
| usr/share | ||||
							
								
								
									
										23
									
								
								debian/swisssurfer.doc-base.EX
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										23
									
								
								debian/swisssurfer.doc-base.EX
									
									
									
									
										vendored
									
									
								
							| @@ -1,23 +0,0 @@ | ||||
| Document: swisssurfer | ||||
| Document: swisssurfer | ||||
| Title: Debian swisssurfer Manual | ||||
| Title: Debian swisssurfer Manual | ||||
| Author: <insert document author here> | ||||
| 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 | ||||
							
								
								
									
										23
									
								
								debian/watch.ex
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										23
									
								
								debian/watch.ex
									
									
									
									
										vendored
									
									
								
							| @@ -1,23 +0,0 @@ | ||||
| # 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 | ||||
| # <Webpage URL> <string match> | ||||
| #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 | ||||
| @@ -6,12 +6,15 @@ | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
| ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 | ||||
|  | ||||
| noinst_PROGRAM = filewatch | ||||
|  | ||||
| filewatch_SOURCES = filewatch.cxx  filewatch.hxx | ||||
|  | ||||
| AM_CPPFLAGS = -I@top_srcdir@/src -I_srcdir@/src/qbrowserlib | ||||
| AM_LDFLAGS = -L@top_builddir@/src/.libs | ||||
| LDADD = -lswisssurfer | ||||
|  | ||||
| noinst_PROGRAMS = filewatch | ||||
|  | ||||
| filewatch_MOCFILES = moc_filewatch.cxx | ||||
| filewatch_SOURCES = filewatch.cxx ${filewatch_MOCFILES} | ||||
| filewatch_LDADD = @top_builddir@/src/qbrowserlib/libqbrowserlib.la | ||||
|  | ||||
| BUILT_SOURCES = ${filewatch_MOCFILES} | ||||
| EXTRA_DIST = filewatch.hxx | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
|   | ||||
							
								
								
									
										103
									
								
								mac-create-app-bundle.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										103
									
								
								mac-create-app-bundle.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,103 @@ | ||||
| #!/bin/bash -ex | ||||
|  | ||||
| ## @id $Id$ | ||||
| ## | ||||
| ## Create Mac OS-X App Bundle from built file | ||||
| ## | ||||
| ## Parameters: | ||||
| ##  $1: name of the app-target | ||||
| ##  $2: name of the project | ||||
| ##  $3: installation source | ||||
| ## | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
| ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 | ||||
|  | ||||
| if test "$(uname -s)" != "Darwin"; then | ||||
|     echo "**** ERROR: run on Mac OS-X: $0" | ||||
|     exit 1 | ||||
| fi | ||||
| test -n "$1" | ||||
| test -n "$2" | ||||
| test -d "$3" | ||||
| target="$(pwd)/${1}/Contents/MacOS" | ||||
|  | ||||
| # Step 1: create and fill app directory structure | ||||
| mkdir -p ${1}/Contents/{Resources,MacOS} | ||||
| ! test -d ${3}/bin || \ | ||||
|      find ${3}/bin -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \; | ||||
| executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1) | ||||
| ! test -d ${3}/lib || \ | ||||
|     find ${3}/lib -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \; | ||||
| ! test -d ${3}/share/${2} || \ | ||||
|     find ${3}/share/${2} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; | ||||
| ! test -d ${3}/share/${2} || rmdir ${3}/share/${2} | ||||
| ! test -d ${3}/share || \ | ||||
|     find ${3}/share -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; | ||||
| ! test -d ${3}/bin || rmdir ${3}/bin | ||||
| ! test -d ${3}/lib || rmdir ${3}/lib | ||||
| ! test -d ${3}/share || rmdir ${3}/share | ||||
| ! test -d ${3} || \ | ||||
|     find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; | ||||
| ! test -d ${3} || rmdir ${3} | ||||
| ! test -d ${1}/tmp || rm -r ${1}/tmp | ||||
|  | ||||
| # Step 2: copy qt plugins, if necessary | ||||
| for f in ${QT_PLUGINS}; do | ||||
|     test -d ${target}/${f} \ | ||||
|         || cp -r ${QT_PLUGIN_PATH}/${f} ${target}/${f} \ | ||||
|         || exit 1 | ||||
| done | ||||
|  | ||||
| # Step 3: resolve all library dependencies | ||||
| found=1 | ||||
| oldpath="$(pwd)" | ||||
| while [ $found -ne 0 ]; do | ||||
|     found=0 | ||||
|     cd "${target}" | ||||
|     for file in $(find . -type f); do | ||||
|         for lib in $(otool -L ${file} | tail -n +2 \ | ||||
|             | egrep '/opt/local/|'"${HOME}" \ | ||||
|             | grep -v $file | awk '{print $1}'); do | ||||
|             found=1 | ||||
|             test -f ${lib##*/} \ | ||||
|                 || ( \ | ||||
|                 cp ${lib} . \ | ||||
|                 && chmod u+w ${lib##*/} \ | ||||
|                 ) \ | ||||
|                 || exit 1 | ||||
|             install_name_tool -change ${lib} \ | ||||
|                 @executable_path/${lib##*/} ${file} \ | ||||
|                 || exit 1 | ||||
|         done | ||||
|     done | ||||
| done | ||||
| cd ${oldpath} | ||||
|  | ||||
| # Step 4: if necessary, install qt_menu.nib | ||||
| if test -n "${QTDIR}"; then | ||||
|     MENU_NIB=$(find ${QTDIR} -name .svn -prune -o -name qt_menu.nib -print \ | ||||
|                | head -1) | ||||
|     if test -e "${MENU_NIB}"; then | ||||
|         rsync -r "${MENU_NIB}" ${1}/Contents/Resources/ | ||||
|         test -d ${1}/Contents/Resources/qt_menu.nib | ||||
|     fi | ||||
| fi | ||||
|  | ||||
| # Step 5: copy or create info.plist | ||||
| infoplist=$(find ${1}/Contents/Resources -name Info.plist) | ||||
| if test -f "${infoplist}"; then | ||||
|     mv "${infoplist}" ${1}/Contents/Info.plist | ||||
| else | ||||
|     cat > ${1}/Contents/Info.plist <<EOF | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||||
| <plist version="1.0"> | ||||
|   <dict> | ||||
|     <key>CFBundleIdentifier</key> | ||||
|     <string>${2}</string> | ||||
|     <key>CFBundleExecutable</key> | ||||
|     <string>${executablefile##/}</string> | ||||
|   </dict> | ||||
| </plist> | ||||
| EOF | ||||
| fi | ||||
							
								
								
									
										44
									
								
								resolve-debbuilddeps.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										44
									
								
								resolve-debbuilddeps.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,44 @@ | ||||
| #! /bin/bash -ex | ||||
|  | ||||
| ## @id $Id$ | ||||
|  | ||||
| ## Resolve Debian Build Dependencies | ||||
| ## Installs all the required packages | ||||
| ## Call: ./resolve-builddeps 'name of build schroot' | ||||
| ## e.g. call: ./resolve-builddeps trusty_amd64 | ||||
|  | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
| ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 | ||||
|  | ||||
| SCHROOTNAME="$1" | ||||
|  | ||||
| sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control | ||||
|  | ||||
| if test -n "${SCHROOTNAME}"; then | ||||
|   DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) | ||||
| else | ||||
|   DEPS=$(dpkg-checkbuilddeps 2>&1 || true) | ||||
| fi | ||||
| DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') | ||||
|  | ||||
| for pa in ${DEPS}; do | ||||
|     success=0 | ||||
|     for p in $(echo "${pa}" | sed 's,|, ,g'); do | ||||
|         if test -n "${SCHROOTNAME}"; then | ||||
|             if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install ${p}; then | ||||
|                 success=1 | ||||
|                 break; | ||||
|             fi | ||||
|         else | ||||
|             if sudo apt-get -y install ${p}; then | ||||
|                 success=1 | ||||
|                 break; | ||||
|             fi | ||||
|         fi | ||||
|     done | ||||
|     if test ${success} -eq 0; then | ||||
|         echo "**** Error: Installation Failed: ${pa}" | ||||
|     fi | ||||
| done | ||||
|  | ||||
| echo "**** Success: All Dependencies Resolved" | ||||
| @@ -6,7 +6,7 @@ | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
| ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 | ||||
|  | ||||
| SUBDIRS = qbrowserlib designer | ||||
| SUBDIRS = qbrowserlib #designer | ||||
|  | ||||
| bin_PROGRAMS = swisssurfer | ||||
| swisssurfer_MOCFILES = moc_authentication.cxx moc_certificate.cxx	\ | ||||
|   | ||||
| @@ -12,7 +12,6 @@ | ||||
|  | ||||
| #include <QtWebKit> | ||||
| #include <QWebView> | ||||
| #include <QDesignerExportWidget> | ||||
|  | ||||
| #include <memory> | ||||
|  | ||||
|   | ||||
| @@ -1,64 +1,69 @@ | ||||
| Summary: @PACKAGE_NAME@ PKCS#11 aware WebKit Browser | ||||
| Summary: @DESCRIPTION@ | ||||
| Name: @PACKAGE_NAME@ | ||||
| Version: @VERSION@ | ||||
| Release: 1 | ||||
| Release: @BUILD_NUMBER@%{?dist} | ||||
| License: LGPL | ||||
| Group: Applications/Internet | ||||
| URL: https://dev.swisssign.com/projects/@PACKAGE_NAME@ | ||||
| Group: Development/Libraries/C++ | ||||
| Source0: %{name}-%{version}.tar.gz | ||||
| BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make | ||||
| BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root | ||||
| Conflicts: swisssurfer | ||||
| Provides: swisssurfer | ||||
| Obsoletes: swisssurfer | ||||
| %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} | ||||
| BuildRequires: cppunit-devel qt-devel | ||||
| BuildRequires: gnupg, subversion, automake, autoconf, doxygen | ||||
| %if 0%{?fedora} != 20 | ||||
| BuildRequires: graphviz | ||||
| %endif | ||||
| %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} | ||||
| BuildRequires: pkgconfig, redhat-lsb | ||||
| %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} ) | ||||
| BuildRequires: mscgen | ||||
| BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel | ||||
| %else | ||||
| BuildRequires: qt-devel | ||||
| %endif | ||||
| %else%if 0%{?suse_version} || 0%{?sles_version} | ||||
| BuildRequires: libcppunit-devel libqt4-devel | ||||
| BuildRequires: pkg-config, lsb-release | ||||
| %if 0%{?suse_version} < 1200 ||  0%{?sles_version} < 1200 | ||||
| BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel | ||||
| %else | ||||
| BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel | ||||
| %endif | ||||
| %endif%endif | ||||
|  | ||||
| %description | ||||
| @README@ | ||||
|  | ||||
| This package contains the program and shared libraries required at runtime. | ||||
| This package contains only the shared libraries required at runtime. | ||||
|  | ||||
|  | ||||
| %prep | ||||
| %setup -q | ||||
| CPPFLAGS="-std=c++0x -I/usr/include/pkcs11-helper-1.0" \ | ||||
|     ./configure --prefix=/usr \ | ||||
| ./configure --prefix=/usr \ | ||||
|             --sysconfdir=/etc \ | ||||
|             --docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \ | ||||
|             --libdir=/usr/%_lib \ | ||||
|             --with-qt-install-plugins=/usr/share/qt4/plugins/designer | ||||
|             --libdir=/usr/%_lib | ||||
|  | ||||
| %build | ||||
| make | ||||
|  | ||||
| %install | ||||
| DESTDIR=$RPM_BUILD_ROOT make 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 | ||||
| rm -rf $RPM_BUILD_ROOT | ||||
|  | ||||
| %files | ||||
| %defattr(-,root,root,-) | ||||
| /usr/bin/@PACKAGE_NAME@ | ||||
| /usr/share/applications/@PACKAGE_NAME@.desktop | ||||
| /usr/share/swisssurfer/swisssurfer.png | ||||
| /usr/share/swisssurfer/swisssurfer.xpm | ||||
| /usr/%_lib/lib*.so.* | ||||
| /usr/%_lib/@PACKAGE_NAME@.so.* | ||||
| %doc | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/COPYING | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/INSTALL | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/NEWS | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/README | ||||
|  | ||||
| %package devel | ||||
| Summary: @PACKAGE_NAME@ PKCS#11 aware WebKit Browser (development files) | ||||
| Summary: @DESCRIPTION@ | ||||
| Group: Development/Libraries/C++ | ||||
| Requires: @PACKAGE_NAME@ = @VERSION@ | ||||
|  | ||||
| %description devel | ||||
| @README@ | ||||
| @@ -67,8 +72,14 @@ This Package contains all files required for developement. | ||||
|  | ||||
| %files devel | ||||
| %defattr(-,root,root,-) | ||||
| /usr/share/qt4 | ||||
| /usr/%_lib/lib*.so | ||||
| /usr/include | ||||
| /usr/%_lib/@PACKAGE_NAME@.so | ||||
| /usr/%_lib/@PACKAGE_NAME@.a | ||||
| /usr/%_lib/@PACKAGE_NAME@.la | ||||
| /usr/%_lib/pkgconfig | ||||
| /usr/include/* | ||||
| %doc | ||||
| /usr/share/@PACKAGE_NAME@ | ||||
| /usr/share/doc/packages/@PACKAGE_NAME@/html | ||||
|  | ||||
| %changelog | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user