| d23cfa71 | 2014-10-19 09:43:29 | François Andriot |
RPM Packaging: update gtk3-tqt-engine |
||
|
M redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec R redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch R redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch |
||
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch
deleted file mode 100644
index 8c4b634..0000000
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.ORI 2013-07-07 15:07:12.912770044 +0200
-+++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am 2013-07-07 15:11:43.224706604 +0200
-@@ -55,6 +55,6 @@
- libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
-
--libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD)
-+libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) $(LIB_QT) $(LIB_TDEUI)
-
- libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch
deleted file mode 100644
index ce8bffe..0000000
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am 2013-07-07 15:16:58.922069997 +0200
-+++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.libsuffix 2013-07-07 15:23:35.272293968 +0200
-@@ -36,7 +36,7 @@
- $(srcdir)/tdegtk-baseengine.cpp \
- $(srcdir)/tdegtk-theme.cpp
-
--enginedir = $(GTK3_PREFIX)/lib/gtk-3.0/$(GTK3_VERSION)/theming-engines
-+enginedir = $(GTK3_PREFIX)/lib64/gtk-3.0/$(GTK3_VERSION)/theming-engines
- engine_LTLIBRARIES = libtdegtk.la
-
- libtdegtk_la_SOURCES = $(source_h) $(source_c)
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
index a9c42d8..31fd2e9 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
@@ -40,7 +40,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: gtk3-tqt-engine-14.0.0-libsuffix.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -50,7 +49,7 @@
BuildRequires: gettext
-%if 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7
BuildRequires: gtk3-devel
%else
BuildRequires: gtk+3.0-devel
@@ -60,7 +59,7 @@
GTK3 style engine which uses the active TDE style to draw its widgets
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
%debug_package
%endif
@@ -68,7 +67,7 @@
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if "%_lib" == "lib64"
-%patch1 -p1 -b .libsuffix
+%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g"
%endif
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
@@ -79,7 +78,6 @@
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
|
||
| 17d12266 | 2014-10-19 09:43:43 | François Andriot |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging |
||
|
M debian/lenny/applications/tde-guidance/debian/control M debian/lenny/tdevelop/debian/rules M debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install M debian/lenny/tdewebdev/debian/kxsldbg-trinity.install M debian/squeeze/applications/tde-guidance/debian/control M debian/squeeze/tdevelop/debian/rules M debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install M debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install M ubuntu/maverick/applications/tde-guidance/debian/control M ubuntu/maverick/tdevelop/debian/rules M ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install M ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install R debian/lenny/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install R debian/squeeze/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install R 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 a73a288..ea090d1 100644
--- a/debian/lenny/applications/tde-guidance/debian/control
+++ b/debian/lenny/applications/tde-guidance/debian/control
@@ -43,15 +43,3 @@
.
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 396df98..0000000
--- 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/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules
index fbc109e..d30e5a5 100755
--- a/debian/lenny/tdevelop/debian/rules
+++ b/debian/lenny/tdevelop/debian/rules
@@ -24,6 +24,7 @@
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 08ce28c..4b1da97 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/lenny/tdewebdev/debian/kxsldbg-trinity.install b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
index 28d1bba..d6c1b3a 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/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/applications/tde-guidance/debian/control b/debian/squeeze/applications/tde-guidance/debian/control
index a73a288..ea090d1 100644
--- a/debian/squeeze/applications/tde-guidance/debian/control
+++ b/debian/squeeze/applications/tde-guidance/debian/control
@@ -43,15 +43,3 @@
.
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 396df98..0000000
--- 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/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules
index c484f3f..20d310e 100755
--- a/debian/squeeze/tdevelop/debian/rules
+++ b/debian/squeeze/tdevelop/debian/rules
@@ -24,6 +24,7 @@
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 08ce28c..4b1da97 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/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install b/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install
index 28d1bba..d6c1b3a 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/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
** Diff limit reached (max: 250 lines) **
|
||
| 5d46a95d | 2014-10-19 11:03:29 | François Andriot |
OpenBSD: update R14 packages |
||
|
A openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR A openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST A openbsd/14.0.0/tdebase/pkg/DESCR A openbsd/14.0.0/tdebase/pkg/PFRAG.shared A openbsd/14.0.0/tdebase/pkg/PLIST A openbsd/14.0.0/tdemultimedia/Makefile A openbsd/14.0.0/tdemultimedia/pkg/DESCR A openbsd/14.0.0/tdemultimedia/pkg/PFRAG.shared A openbsd/14.0.0/tdemultimedia/pkg/PLIST M openbsd/14.0.0/Makefile M openbsd/14.0.0/dependencies/Makefile M openbsd/14.0.0/dependencies/arts/Makefile M openbsd/14.0.0/dependencies/dbus-1-tqt/Makefile M openbsd/14.0.0/dependencies/dbus-tqt/Makefile M openbsd/14.0.0/dependencies/libart-lgpl/Makefile M openbsd/14.0.0/dependencies/tqt3/Makefile M openbsd/14.0.0/dependencies/tqtinterface/Makefile M openbsd/14.0.0/tdebase/Makefile M openbsd/14.0.0/tdelibs/Makefile M openbsd/14.0.0/tdelibs/pkg/PLIST M openbsd/14.0.0/trinity.port.mk R openbsd/14.0.0/3rdparty/htdig/distinfo R openbsd/14.0.0/dependencies/arts/distinfo R openbsd/14.0.0/dependencies/dbus-1-tqt/distinfo R openbsd/14.0.0/dependencies/dbus-tqt/distinfo R openbsd/14.0.0/dependencies/libart-lgpl/distinfo R openbsd/14.0.0/dependencies/tqt3/distinfo R openbsd/14.0.0/dependencies/tqtinterface/distinfo R openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-devel R openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-main R openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-devel R openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-main R openbsd/14.0.0/tdebase/distinfo R openbsd/14.0.0/tdebase/pkg/DESCR-konsole R openbsd/14.0.0/tdebase/pkg/DESCR-main R openbsd/14.0.0/tdebase/pkg/DESCR-tdm R openbsd/14.0.0/tdebase/pkg/DESCR.tdeio-pim-plugins R openbsd/14.0.0/tdebase/pkg/PFRAG.shared-main R openbsd/14.0.0/tdebase/pkg/PLIST-konsole R openbsd/14.0.0/tdebase/pkg/PLIST-main R openbsd/14.0.0/tdebase/pkg/PLIST-tdeio-pim-plugins R openbsd/14.0.0/tdebase/pkg/PLIST-tdm R openbsd/14.0.0/tdelibs/distinfo |
||
** Diff limit reached (max: 250 lines) ** |
||