mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-11 07:44:12 +02:00
43840c7824
Various test fixes while at it, including running the Qt tests. Closes: https://bugs.gentoo.org/944830 Closes: https://bugs.gentoo.org/947109 Closes: https://bugs.gentoo.org/952180 Signed-off-by: Sam James <sam@gentoo.org>
124 lines
5 KiB
Diff
124 lines
5 KiB
Diff
--- a/common/configure
|
|
+++ b/common/configure
|
|
@@ -178,7 +178,7 @@
|
|
|
|
printf "all:\tbuild\n\n" >> ${MAKEFILE}
|
|
|
|
-printf "build:\ttranslate compress\n" >> ${MAKEFILE}
|
|
+printf "build:\ttranslate\n" >> ${MAKEFILE}
|
|
|
|
printf "clean:\n" >> ${MAKEFILE}
|
|
printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
|
|
@@ -207,33 +207,11 @@
|
|
addUninstallDir "/share/backintime"
|
|
addNewline
|
|
|
|
-addComment "documentation"
|
|
-addInstallDir "/share/doc/backintime-common"
|
|
-addInstallFile "../AUTHORS" "/share/doc/backintime-common"
|
|
-addInstallFile "../README.md" "/share/doc/backintime-common"
|
|
-addInstallFile "../FAQ.md" "/share/doc/backintime-common"
|
|
-addInstallFile "../TRANSLATIONS" "/share/doc/backintime-common"
|
|
-addInstallFile "../CHANGES" "/share/doc/backintime-common"
|
|
-addInstallFile "../LICENSE" "/share/doc/backintime-common"
|
|
-addInstallDir "/share/doc/backintime-common/LICENSES"
|
|
-addInstallFiles "../LICENSES/*" "/share/doc/backintime-common/LICENSES"
|
|
-addNewline
|
|
-
|
|
-addComment "config and user-callback examples"
|
|
-addInstallDir "/share/doc/backintime-common/examples"
|
|
-addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
|
|
-addInstallFile "config-example-ssh.gz" "/share/doc/backintime-common/examples"
|
|
-addInstallDir "/share/doc/backintime-common/user-callback-examples"
|
|
-addInstallFiles "../doc/user-callback-examples/user-callback.*" "/share/doc/backintime-common/user-callback-examples"
|
|
-addUninstallDir "/share/doc/backintime-common"
|
|
-addUninstallDir "/share/doc"
|
|
-addNewline
|
|
-
|
|
addComment "man"
|
|
addInstallDir "/share/man/man1"
|
|
-addInstallFile "man/C/backintime.1.gz" "/share/man/man1"
|
|
-addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
|
|
-addInstallFile "man/C/backintime-config.1.gz" "/share/man/man1"
|
|
+addInstallFile "man/C/backintime.1" "/share/man/man1"
|
|
+addInstallFile "man/C/backintime-askpass.1" "/share/man/man1"
|
|
+addInstallFile "man/C/backintime-config.1" "/share/man/man1"
|
|
addUninstallDir "/share/man"
|
|
addNewline
|
|
|
|
@@ -257,15 +235,6 @@
|
|
addUninstallDir "/share/bash-completion"
|
|
addNewline
|
|
|
|
-# compress
|
|
-printf "compress:\n" >> ${MAKEFILE}
|
|
-printf "\t# Man pages\n" >> ${MAKEFILE}
|
|
-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
|
|
-
|
|
-printf "\t# Config-examples\n" >> ${MAKEFILE}
|
|
-printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
|
|
-printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
|
|
-
|
|
# translate
|
|
printf "translate:\t$mos\n\n" >> ${MAKEFILE}
|
|
|
|
--- a/qt/configure
|
|
+++ b/qt/configure
|
|
@@ -154,7 +154,7 @@
|
|
|
|
printf "all:\tbuild\n\n" >> ${MAKEFILE}
|
|
|
|
-printf "build:\tcompress\n\n" >> ${MAKEFILE}
|
|
+printf "build:\n\n" >> ${MAKEFILE}
|
|
|
|
printf "clean:\n" >> ${MAKEFILE}
|
|
printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
|
|
@@ -165,7 +165,6 @@
|
|
|
|
# Migration
|
|
printf "\t# Clean-up installed old files that were renamed or moved in later BiT versions\n" >> ${MAKEFILE}
|
|
-printf "\trm -f \$(DEST)/etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
|
|
printf "\trm -f \$(DEST)/share/backintime/plugins/qt4plugin.py\n" >> ${MAKEFILE}
|
|
addNewline
|
|
|
|
@@ -217,18 +216,6 @@
|
|
addUninstallDir "/share/polkit-1"
|
|
addNewline
|
|
|
|
-addComment "documentation"
|
|
-addInstallDir "/share/doc/backintime-qt"
|
|
-addInstallFile "../AUTHORS" "/share/doc/backintime-qt"
|
|
-addInstallFile "../README.md" "/share/doc/backintime-qt"
|
|
-addInstallFile "../FAQ.md" "/share/doc/backintime-qt"
|
|
-addInstallFile "../TRANSLATIONS" "/share/doc/backintime-qt"
|
|
-addInstallFile "../CHANGES" "/share/doc/backintime-qt"
|
|
-addInstallFile "../LICENSE" "/share/doc/backintime-qt"
|
|
-addInstallDir "/share/doc/backintime-qt/LICENSES"
|
|
-addInstallFiles "../LICENSES/*" "/share/doc/backintime-qt/LICENSES"
|
|
-addNewline
|
|
-
|
|
addComment ".desktop"
|
|
addInstallDir "/share/applications"
|
|
addInstallFiles "*.desktop" "/share/applications"
|
|
@@ -236,7 +223,7 @@
|
|
|
|
addComment "man"
|
|
addInstallDir "/share/man/man1"
|
|
-addInstallFile "man/C/backintime-qt.1.gz" "/share/man/man1"
|
|
+addInstallFile "man/C/backintime-qt.1" "/share/man/man1"
|
|
addUninstallDir "/share/man"
|
|
addNewline
|
|
|
|
@@ -251,11 +238,6 @@
|
|
addUninstallDir "/share"
|
|
addNewline
|
|
|
|
-#compress
|
|
-printf "compress:\n" >> ${MAKEFILE}
|
|
-printf "\t# Man pages\n" >> ${MAKEFILE}
|
|
-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
|
|
-
|
|
# Uninstall
|
|
printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
|
|
printf "uninstall_files:\n" >> ${MAKEFILE}
|
|
|