From bb1e02c097fa27c54e1723cf1640fd9abf8c2e80 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 18 Oct 2014 23:07:35 +0900 Subject: Fixed generation of TDevelop API documentation in Debian/Ubuntu distros. This relates to bug 1859. Signed-off-by: Michele Calgaro --- debian/lenny/tdevelop/debian/rules | 1 + debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install | 2 +- debian/squeeze/tdevelop/debian/rules | 1 + debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install | 2 +- ubuntu/maverick/tdevelop/debian/rules | 1 + ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules index fbc109e36..d30e5a50a 100755 --- a/debian/lenny/tdevelop/debian/rules +++ b/debian/lenny/tdevelop/debian/rules @@ -24,6 +24,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ PACKAGES_WITH_LIBS := tdevelop-trinity +DEB_KDE_APIDOX := yes DEB_KDE_ENABLE_FINAL := DEB_INSTALL_DOCS_tdevelop = AUTHORS DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install b/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install index 08ce28c39..4b1da9772 100644 --- a/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install +++ b/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop -#debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/appwizard.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/kscribblefiles.png diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules index c484f3f2c..20d310e1c 100755 --- a/debian/squeeze/tdevelop/debian/rules +++ b/debian/squeeze/tdevelop/debian/rules @@ -24,6 +24,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ PACKAGES_WITH_LIBS := tdevelop-trinity +DEB_KDE_APIDOX := yes DEB_KDE_ENABLE_FINAL := DEB_INSTALL_DOCS_tdevelop = AUTHORS DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install index 08ce28c39..4b1da9772 100644 --- a/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install +++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop -#debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/appwizard.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/kscribblefiles.png diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules index c484f3f2c..20d310e1c 100755 --- a/ubuntu/maverick/tdevelop/debian/rules +++ b/ubuntu/maverick/tdevelop/debian/rules @@ -24,6 +24,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ PACKAGES_WITH_LIBS := tdevelop-trinity +DEB_KDE_APIDOX := yes DEB_KDE_ENABLE_FINAL := DEB_INSTALL_DOCS_tdevelop = AUTHORS DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install index 08ce28c39..4b1da9772 100644 --- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install +++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop -#debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/appwizard.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/kscribblefiles.png -- cgit v1.2.3 From 7c94b170cf00eaf2e5122bfab9da6c87dd11cf50 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 19 Oct 2014 15:59:23 +0900 Subject: Fixed tdewebdev FTBFS in Debian/Ubuntu distros. Signed-off-by: Michele Calgaro --- debian/lenny/tdewebdev/debian/kxsldbg-trinity.install | 8 ++++---- debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install | 8 ++++---- ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install index 28d1bba41..d6c1b3a1f 100644 --- a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install +++ b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install @@ -16,18 +16,18 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop diff --git a/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install b/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install index 28d1bba41..d6c1b3a1f 100644 --- a/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install +++ b/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install @@ -16,18 +16,18 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install index 28d1bba41..d6c1b3a1f 100644 --- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install +++ b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install @@ -16,18 +16,18 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop -- cgit v1.2.3 From b1361757f171325c83ff6f39e0331928921e1a7f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 19 Oct 2014 22:50:07 +0900 Subject: Fixed tde-guidance FTBFS on Debian/Ubuntu caused by removal of powermanager module in commit faf34a76. Signed-off-by: Michele Calgaro --- debian/lenny/applications/tde-guidance/debian/control | 12 ------------ .../debian/tde-guidance-powermanager-trinity.install | 13 ------------- debian/squeeze/applications/tde-guidance/debian/control | 12 ------------ .../debian/tde-guidance-powermanager-trinity.install | 13 ------------- ubuntu/maverick/applications/tde-guidance/debian/control | 12 ------------ .../debian/tde-guidance-powermanager-trinity.install | 13 ------------- 6 files changed, 75 deletions(-) delete mode 100644 debian/lenny/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install delete mode 100644 debian/squeeze/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install delete mode 100644 ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install diff --git a/debian/lenny/applications/tde-guidance/debian/control b/debian/lenny/applications/tde-guidance/debian/control index a73a28862..ea090d194 100644 --- a/debian/lenny/applications/tde-guidance/debian/control +++ b/debian/lenny/applications/tde-guidance/debian/control @@ -43,15 +43,3 @@ Description: collection of system administration tools for GNU/Linux [Trinity] . Homepage: http://www.simonzone.com/software/guidance -Package: tde-guidance-powermanager-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5) -Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0~) -Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0~) -Conflicts: guidance-power-manager, kde-guidance-powermanager -Provides: ${python:Provides} -Description: HAL based power manager applet [Trinity] - A power management applet to indicate battery levels and perform hibernate or - suspend using HAL. - . - Homepage: http://www.simonzone.com/software/guidance diff --git a/debian/lenny/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install b/debian/lenny/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install deleted file mode 100644 index 396df988c..000000000 --- a/debian/lenny/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install +++ /dev/null @@ -1,13 +0,0 @@ -opt/trinity/bin/guidance-power-manager -opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png -opt/trinity/share/apps/guidance/pics/ac-adapter.png -opt/trinity/share/apps/guidance/pics/battery*.png -opt/trinity/share/apps/guidance/pics/processor.png -opt/trinity/share/autostart/guidance-power-manager.desktop -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance_power_manager_ui.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/notify.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanage.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/gpmhelper.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanager_ui.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/tooltip.py diff --git a/debian/squeeze/applications/tde-guidance/debian/control b/debian/squeeze/applications/tde-guidance/debian/control index a73a28862..ea090d194 100644 --- a/debian/squeeze/applications/tde-guidance/debian/control +++ b/debian/squeeze/applications/tde-guidance/debian/control @@ -43,15 +43,3 @@ Description: collection of system administration tools for GNU/Linux [Trinity] . Homepage: http://www.simonzone.com/software/guidance -Package: tde-guidance-powermanager-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5) -Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0~) -Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0~) -Conflicts: guidance-power-manager, kde-guidance-powermanager -Provides: ${python:Provides} -Description: HAL based power manager applet [Trinity] - A power management applet to indicate battery levels and perform hibernate or - suspend using HAL. - . - Homepage: http://www.simonzone.com/software/guidance diff --git a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install b/debian/squeeze/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install deleted file mode 100644 index 396df988c..000000000 --- a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install +++ /dev/null @@ -1,13 +0,0 @@ -opt/trinity/bin/guidance-power-manager -opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png -opt/trinity/share/apps/guidance/pics/ac-adapter.png -opt/trinity/share/apps/guidance/pics/battery*.png -opt/trinity/share/apps/guidance/pics/processor.png -opt/trinity/share/autostart/guidance-power-manager.desktop -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance_power_manager_ui.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/notify.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanage.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/gpmhelper.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanager_ui.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/tooltip.py diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 2432c6f80..f6807b694 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -43,15 +43,3 @@ Description: collection of system administration tools for GNU/Linux [Trinity] . Homepage: http://www.simonzone.com/software/guidance -Package: tde-guidance-powermanager-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5) -Replaces: kde-guidance-powermanager-kde3 (<< 4:14.0.0~), kde-guidance-powermanager-trinity (<< 4:14.0.0~) -Breaks: kde-guidance-powermanager-kde3 (<< 4:14.0.0~), kde-guidance-powermanager-trinity (<< 4:14.0.0~) -Conflicts: guidance-power-manager, kde-guidance-powermanager -Provides: ${python:Provides} -Description: HAL based power manager applet [Trinity] - A power management applet to indicate battery levels and perform hibernate or - suspend using HAL. - . - Homepage: http://www.simonzone.com/software/guidance diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install deleted file mode 100644 index 396df988c..000000000 --- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install +++ /dev/null @@ -1,13 +0,0 @@ -opt/trinity/bin/guidance-power-manager -opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png -opt/trinity/share/apps/guidance/pics/ac-adapter.png -opt/trinity/share/apps/guidance/pics/battery*.png -opt/trinity/share/apps/guidance/pics/processor.png -opt/trinity/share/autostart/guidance-power-manager.desktop -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance_power_manager_ui.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/notify.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanage.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/gpmhelper.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanager_ui.py -opt/trinity/share/python-support/tde-guidance-powermanager-trinity/tooltip.py -- cgit v1.2.3