From dd1b9be2bb5a07477f83925f5b568f696fc4ad23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 23 Oct 2012 01:59:21 +0200 Subject: Fix locolor icons conflict with tdeartwork on Debian and Ubuntu --- ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install | 4 ++-- ubuntu/precise/tdesdk/debian/kbabel-trinity.install | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install b/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install index 2ab92dddd..3ffd7717e 100644 --- a/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install +++ b/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install @@ -14,8 +14,8 @@ debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/*.docbook -debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png -debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png +#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png +#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ktimemon.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ktimemon.png kicker-applets/kolourpicker/TODO /opt/trinity/share/doc/kicker-applets/kolourpicker diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install index 09e1b6dd7..4bafa51f0 100644 --- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install +++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install @@ -82,10 +82,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/catalogmanager.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kbabel.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kbabeldict.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/catalogmanager.png -debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabel.png +#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabel.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabeldict.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png -debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png +#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png debian/tmp/opt/trinity/share/services/dbsearchengine.desktop debian/tmp/opt/trinity/share/services/kfile_po.desktop -- cgit v1.2.1 From 8c65bc40c6ab7da5aab6e5817faa6993cd66f2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 26 Oct 2012 13:27:50 +0200 Subject: Fix tdenetwork build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Removed unnecessary files installed into doc Include files moved to default location Fix unwanted rename icon with automake --- .../tdenetwork/debian/cdbs/debian-qt-kde.mk | 8 +- ubuntu/precise/tdenetwork/debian/cdbs/kde.mk | 4 +- .../tdenetwork/debian/knewsticker-trinity.install | 1 - .../tdenetwork/debian/kopete-trinity.install | 10 +- .../precise/tdenetwork/debian/kppp-trinity.install | 3 - .../precise/tdenetwork/debian/krdc-trinity.install | 9 -- .../precise/tdenetwork/debian/krfb-trinity.install | 8 -- .../debian/tdenetwork-trinity-dev.install | 128 ++++++++++----------- 8 files changed, 78 insertions(+), 93 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk index d135c4257..d87d86c21 100644 --- a/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/user/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/tdenetwork/debian/cdbs/kde.mk b/ubuntu/precise/tdenetwork/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdenetwork/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdenetwork/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install b/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install index aa7f056d8..43560f7e5 100644 --- a/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install @@ -9,7 +9,6 @@ debian/tmp/opt/trinity/share/apps/kconf_update/knewsticker.upd debian/tmp/opt/trinity/share/apps/kconf_update/knt-0.1-0.2.pl debian/tmp/opt/trinity/share/apps/kicker/applets/knewsticker.desktop debian/tmp/opt/trinity/share/apps/knewsticker/eventsrc -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/TODO debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/about-icon.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/checknews-icon.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/common diff --git a/ubuntu/precise/tdenetwork/debian/kopete-trinity.install b/ubuntu/precise/tdenetwork/debian/kopete-trinity.install index a359ae82f..f6ad9caa2 100644 --- a/ubuntu/precise/tdenetwork/debian/kopete-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/kopete-trinity.install @@ -1,9 +1,9 @@ debian/tmp/opt/trinity/bin/kopete debian/tmp/opt/trinity/bin/kopete_latexconvert.sh -debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h -debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h +debian/tmp/opt/trinity/include/kopete/kopetepicture.h +debian/tmp/opt/trinity/include/kopete/kopeteprefs.h +debian/tmp/opt/trinity/include/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/trinity/include/kopete/webcamwidget.h debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update @@ -351,7 +351,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/webcamreceive.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/webcamsend.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_aim.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_gadu.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_http/ws.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_http-ws.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_icq.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_irc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/jabber_gateway_msn.png diff --git a/ubuntu/precise/tdenetwork/debian/kppp-trinity.install b/ubuntu/precise/tdenetwork/debian/kppp-trinity.install index 74e95cd57..bfebdd004 100644 --- a/ubuntu/precise/tdenetwork/debian/kppp-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/kppp-trinity.install @@ -496,7 +496,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/accounting.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/callback.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/chap.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/costsgraphs.fig debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/costsgraphs.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/dialog-setup.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/getting-online.docbook @@ -515,14 +514,12 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-config.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-device-tab.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-dialler-tab.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-faq.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp.faq.question debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-graph-tab.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-misc-tab.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-modem-tab.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-wizard.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/security.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/tricks.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/ttyS-cua.txt debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/wizard.docbook debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kppp.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kppp.png diff --git a/ubuntu/precise/tdenetwork/debian/krdc-trinity.install b/ubuntu/precise/tdenetwork/debian/krdc-trinity.install index af9f4674c..744023447 100644 --- a/ubuntu/precise/tdenetwork/debian/krdc-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/krdc-trinity.install @@ -7,27 +7,18 @@ debian/tmp/opt/trinity/share/apps/krdc/pics/pindown.png debian/tmp/opt/trinity/share/apps/krdc/pics/pinup.png debian/tmp/opt/trinity/share/apps/krdc/pics/pointcursor.png debian/tmp/opt/trinity/share/apps/krdc/pics/pointcursormask.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/authentication.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/authentication.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/close.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/krdc_window.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/krdc_window.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_profilestab.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_profilestab.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_rdpdefaultstab.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_rdpdefaultstab.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_vncdefaultstab.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_vncdefaultstab.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_connectionspeed.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_connectionspeed.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_nobrowse.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_nobrowse.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_vncentry.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_vncentry.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/window_fullscreen.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/window_nofullscreen.png diff --git a/ubuntu/precise/tdenetwork/debian/krfb-trinity.install b/ubuntu/precise/tdenetwork/debian/krfb-trinity.install index eb49ef238..618ff882d 100644 --- a/ubuntu/precise/tdenetwork/debian/krfb-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/krfb-trinity.install @@ -12,23 +12,15 @@ debian/tmp/opt/trinity/share/apps/krfb/pics/connection-side-image.png debian/tmp/opt/trinity/share/apps/krfb/pics/eyes-closed24.png debian/tmp/opt/trinity/share/apps/krfb/pics/eyes-open24.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_access.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_access.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_network.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_network.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_session.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_session.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/connection.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/connection.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/email_invitation.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/email_invitation.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/invitation_management.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/invitation_management.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/personal_invitation.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/personal_invitation.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/screenshot.eps debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/screenshot.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/krfb.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/krfb.png diff --git a/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install index 4915aaa12..e1ce52d78 100644 --- a/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install +++ b/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h -debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h -debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h -debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h -debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h -debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h -debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h -debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h -debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h -debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h -debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h -debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h -debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h -debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h -debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h -debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h -debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h -debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h -debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h -debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h -debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h -debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h -debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h -debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h -debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h -debian/tmp/opt/trinity/include/tde/rss/article.h -debian/tmp/opt/trinity/include/tde/rss/document.h -debian/tmp/opt/trinity/include/tde/rss/global.h -debian/tmp/opt/trinity/include/tde/rss/image.h -debian/tmp/opt/trinity/include/tde/rss/librss.h -debian/tmp/opt/trinity/include/tde/rss/loader.h -debian/tmp/opt/trinity/include/tde/rss/textinput.h +debian/tmp/opt/trinity/include/kopete/kabcpersistence.h +debian/tmp/opt/trinity/include/kopete/kopete_export.h +debian/tmp/opt/trinity/include/kopete/kopeteaccount.h +debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h +debian/tmp/opt/trinity/include/kopete/kopeteaway.h +debian/tmp/opt/trinity/include/kopete/kopeteawayaction.h +debian/tmp/opt/trinity/include/kopete/kopeteawaydialog.h +debian/tmp/opt/trinity/include/kopete/kopeteblacklister.h +debian/tmp/opt/trinity/include/kopete/kopetechatsession.h +debian/tmp/opt/trinity/include/kopete/kopetechatsessionmanager.h +debian/tmp/opt/trinity/include/kopete/kopetecommandhandler.h +debian/tmp/opt/trinity/include/kopete/kopetecontact.h +debian/tmp/opt/trinity/include/kopete/kopetecontactlist.h +debian/tmp/opt/trinity/include/kopete/kopetecontactlistelement.h +debian/tmp/opt/trinity/include/kopete/kopetecontactproperty.h +debian/tmp/opt/trinity/include/kopete/kopeteeventpresentation.h +debian/tmp/opt/trinity/include/kopete/kopeteglobal.h +debian/tmp/opt/trinity/include/kopete/kopetegroup.h +debian/tmp/opt/trinity/include/kopete/kopetemessage.h +debian/tmp/opt/trinity/include/kopete/kopetemessageevent.h +debian/tmp/opt/trinity/include/kopete/kopetemessagehandler.h +debian/tmp/opt/trinity/include/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/trinity/include/kopete/kopetemetacontact.h +debian/tmp/opt/trinity/include/kopete/kopetemimetypehandler.h +debian/tmp/opt/trinity/include/kopete/kopetenotifydataobject.h +debian/tmp/opt/trinity/include/kopete/kopeteonlinestatus.h +debian/tmp/opt/trinity/include/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/trinity/include/kopete/kopetepassword.h +debian/tmp/opt/trinity/include/kopete/kopetepasswordedaccount.h +debian/tmp/opt/trinity/include/kopete/kopeteplugin.h +debian/tmp/opt/trinity/include/kopete/kopeteprotocol.h +debian/tmp/opt/trinity/include/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/trinity/include/kopete/kopetetask.h +debian/tmp/opt/trinity/include/kopete/kopetetransfermanager.h +debian/tmp/opt/trinity/include/kopete/kopeteuiglobal.h +debian/tmp/opt/trinity/include/kopete/kopeteversion.h +debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h +debian/tmp/opt/trinity/include/kopete/ui/accountselector.h +debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h +debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h +debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h +debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/trinity/include/kopete/ui/kopetecontactaction.h +debian/tmp/opt/trinity/include/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/trinity/include/kopete/ui/kopetelistview.h +debian/tmp/opt/trinity/include/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/trinity/include/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/trinity/include/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/trinity/include/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/trinity/include/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/trinity/include/kopete/ui/kopetestdaction.h +debian/tmp/opt/trinity/include/kopete/ui/kopeteview.h +debian/tmp/opt/trinity/include/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/trinity/include/kopete/ui/userinfodialog.h +debian/tmp/opt/trinity/include/rss/article.h +debian/tmp/opt/trinity/include/rss/document.h +debian/tmp/opt/trinity/include/rss/global.h +debian/tmp/opt/trinity/include/rss/image.h +debian/tmp/opt/trinity/include/rss/librss.h +debian/tmp/opt/trinity/include/rss/loader.h +debian/tmp/opt/trinity/include/rss/textinput.h debian/tmp/opt/trinity/lib/libtdeinit_kdict.la debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la debian/tmp/opt/trinity/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la debian/tmp/opt/trinity/lib/libkopete_videodevice.so debian/tmp/opt/trinity/lib/librss.la debian/tmp/opt/trinity/lib/librss.so -debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h +debian/tmp/opt/trinity/include/kopete/kopetepluginmanager.h -- cgit v1.2.1 From 52bda05be177c2fdadea6a653756ecf01cf3607c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 27 Oct 2012 01:54:48 +0200 Subject: Fix tdenetwork include files location on Debian and Ubuntu This solves FTBFS caused by previous commit --- ubuntu/precise/tdenetwork/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdenetwork/debian/rules b/ubuntu/precise/tdenetwork/debian/rules index 419a19915..bab6267ec 100755 --- a/ubuntu/precise/tdenetwork/debian/rules +++ b/ubuntu/precise/tdenetwork/debian/rules @@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -- cgit v1.2.1 From 3949ac7f7a2a0b669e511a326949562dfa1ea67b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Nov 2012 12:22:02 -0600 Subject: Add packaging files for libtdeldap to Debian and Ubuntu --- .../precise/libraries/libtdeldap/debian/changelog | 5 ++++ ubuntu/precise/libraries/libtdeldap/debian/compat | 1 + ubuntu/precise/libraries/libtdeldap/debian/control | 12 +++++++++ .../precise/libraries/libtdeldap/debian/copyright | 31 ++++++++++++++++++++++ ubuntu/precise/libraries/libtdeldap/debian/rules | 24 +++++++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 ubuntu/precise/libraries/libtdeldap/debian/changelog create mode 100644 ubuntu/precise/libraries/libtdeldap/debian/compat create mode 100644 ubuntu/precise/libraries/libtdeldap/debian/control create mode 100644 ubuntu/precise/libraries/libtdeldap/debian/copyright create mode 100755 ubuntu/precise/libraries/libtdeldap/debian/rules (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/libraries/libtdeldap/debian/changelog b/ubuntu/precise/libraries/libtdeldap/debian/changelog new file mode 100644 index 000000000..9160ca885 --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/changelog @@ -0,0 +1,5 @@ +libtdeldap-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 diff --git a/ubuntu/precise/libraries/libtdeldap/debian/compat b/ubuntu/precise/libraries/libtdeldap/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/precise/libraries/libtdeldap/debian/control b/ubuntu/precise/libraries/libtdeldap/debian/control new file mode 100644 index 000000000..6734be8c9 --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/control @@ -0,0 +1,12 @@ +Source: libtdeldap-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: libtdeldap-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Description: LDAP interface library for TDE + LDAP interface library for TDE management modules. diff --git a/ubuntu/precise/libraries/libtdeldap/debian/copyright b/ubuntu/precise/libraries/libtdeldap/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson + +copyright (C) 2012 Timothy Pearson + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson and +is licensed under the GPL, see above. + diff --git a/ubuntu/precise/libraries/libtdeldap/debian/rules b/ubuntu/precise/libraries/libtdeldap/debian/rules new file mode 100755 index 000000000..242fb2c84 --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap -- cgit v1.2.1 From a80a4af1d2bd8d3d986597cf1ecc21e806131bec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Nov 2012 19:52:22 -0600 Subject: Add kerberostray packaging to Debian and Ubuntu --- .../applications/kerberostray/debian/changelog | 5 ++++ .../applications/kerberostray/debian/compat | 1 + .../applications/kerberostray/debian/control | 13 +++++++++ .../applications/kerberostray/debian/copyright | 31 ++++++++++++++++++++++ .../precise/applications/kerberostray/debian/rules | 24 +++++++++++++++++ 5 files changed, 74 insertions(+) create mode 100644 ubuntu/precise/applications/kerberostray/debian/changelog create mode 100644 ubuntu/precise/applications/kerberostray/debian/compat create mode 100644 ubuntu/precise/applications/kerberostray/debian/control create mode 100644 ubuntu/precise/applications/kerberostray/debian/copyright create mode 100755 ubuntu/precise/applications/kerberostray/debian/rules (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/applications/kerberostray/debian/changelog b/ubuntu/precise/applications/kerberostray/debian/changelog new file mode 100644 index 000000000..51d49f821 --- /dev/null +++ b/ubuntu/precise/applications/kerberostray/debian/changelog @@ -0,0 +1,5 @@ +kerberostray-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 diff --git a/ubuntu/precise/applications/kerberostray/debian/compat b/ubuntu/precise/applications/kerberostray/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/precise/applications/kerberostray/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/precise/applications/kerberostray/debian/control b/ubuntu/precise/applications/kerberostray/debian/control new file mode 100644 index 000000000..9db3879aa --- /dev/null +++ b/ubuntu/precise/applications/kerberostray/debian/control @@ -0,0 +1,13 @@ +Source: kerberostray-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Raphaël Pinson +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libtdeldap-trinity, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kerberostray-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Description: Kerberos ticket manager + Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets diff --git a/ubuntu/precise/applications/kerberostray/debian/copyright b/ubuntu/precise/applications/kerberostray/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/ubuntu/precise/applications/kerberostray/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson + +copyright (C) 2012 Timothy Pearson + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson and +is licensed under the GPL, see above. + diff --git a/ubuntu/precise/applications/kerberostray/debian/rules b/ubuntu/precise/applications/kerberostray/debian/rules new file mode 100755 index 000000000..242fb2c84 --- /dev/null +++ b/ubuntu/precise/applications/kerberostray/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap -- cgit v1.2.1 From d2a2dd9e1d3fc429ff480c5740d169a3be688d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 8 Nov 2012 03:09:02 +0100 Subject: Fix tdesdk build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Removed unnecessary file installed into doc Include files moved to default location --- ubuntu/precise/tdesdk/debian/cdbs/debian-qt-kde.mk | 8 +++-- ubuntu/precise/tdesdk/debian/cdbs/kde.mk | 4 ++- .../tdesdk/debian/kbabel-trinity-dev.install | 42 +++++++++++----------- .../precise/tdesdk/debian/kbabel-trinity.install | 2 +- .../precise/tdesdk/debian/kmtrace-trinity.install | 2 +- ubuntu/precise/tdesdk/debian/kspy-trinity.install | 2 +- .../tdesdk/debian/kunittest-trinity.install | 2 +- .../debian/libcvsservice-trinity-dev.install | 6 ++-- ubuntu/precise/tdesdk/debian/rules | 2 +- .../tdesdk/debian/tdesdk-misc-trinity.install | 2 +- 10 files changed, 39 insertions(+), 33 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdesdk/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/precise/tdesdk/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdesdk/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/tdesdk/debian/cdbs/kde.mk b/ubuntu/precise/tdesdk/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdesdk/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdesdk/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity-dev.install b/ubuntu/precise/tdesdk/debian/kbabel-trinity-dev.install index ace31ea6a..4c2720936 100644 --- a/ubuntu/precise/tdesdk/debian/kbabel-trinity-dev.install +++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/tde/kbabel/catalog.h -debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/tde/kbabel/itempart.h -debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/kbabel/catalog.h +debian/tmp/opt/trinity/include/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/kbabel/catalogview.h +debian/tmp/opt/trinity/include/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/kbabel/editcmd.h +debian/tmp/opt/trinity/include/kbabel/findoptions.h +debian/tmp/opt/trinity/include/kbabel/itempart.h +debian/tmp/opt/trinity/include/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/kbabel/kbproject.h +debian/tmp/opt/trinity/include/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/kbabel/poinfo.h +debian/tmp/opt/trinity/include/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/kbabel/searchengine.h +debian/tmp/opt/trinity/include/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install index 4bafa51f0..bfe62dc3a 100644 --- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install +++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/catalogmanager.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabel.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabeldict.png diff --git a/ubuntu/precise/tdesdk/debian/kmtrace-trinity.install b/ubuntu/precise/tdesdk/debian/kmtrace-trinity.install index 35b5af1a5..a163246b9 100644 --- a/ubuntu/precise/tdesdk/debian/kmtrace-trinity.install +++ b/ubuntu/precise/tdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/tde/ktrace.h +debian/tmp/opt/trinity/include/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/ubuntu/precise/tdesdk/debian/kspy-trinity.install b/ubuntu/precise/tdesdk/debian/kspy-trinity.install index fc17ede2c..12523ee90 100644 --- a/ubuntu/precise/tdesdk/debian/kspy-trinity.install +++ b/ubuntu/precise/tdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/tde/kspy.h +debian/tmp/opt/trinity/include/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/ubuntu/precise/tdesdk/debian/kunittest-trinity.install b/ubuntu/precise/tdesdk/debian/kunittest-trinity.install index e183f0e74..bf4cf0b5a 100644 --- a/ubuntu/precise/tdesdk/debian/kunittest-trinity.install +++ b/ubuntu/precise/tdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/ubuntu/precise/tdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/precise/tdesdk/debian/libcvsservice-trinity-dev.install index 566e0b7a1..f946c882f 100644 --- a/ubuntu/precise/tdesdk/debian/libcvsservice-trinity-dev.install +++ b/ubuntu/precise/tdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/tde/cvsjob_stub.h -debian/tmp/opt/trinity/include/tde/cvsservice_stub.h -debian/tmp/opt/trinity/include/tde/repository_stub.h +debian/tmp/opt/trinity/include/cvsjob_stub.h +debian/tmp/opt/trinity/include/cvsservice_stub.h +debian/tmp/opt/trinity/include/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la diff --git a/ubuntu/precise/tdesdk/debian/rules b/ubuntu/precise/tdesdk/debian/rules index c80f0a85d..3675e531a 100755 --- a/ubuntu/precise/tdesdk/debian/rules +++ b/ubuntu/precise/tdesdk/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install index c479e9735..9fbde2ecd 100644 --- a/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install +++ b/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/tde/kprofilemethod.h +debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so -- cgit v1.2.1 From aa81bdb85ec4d62b998e126feada5e0cb013a10a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 13 Nov 2012 21:09:57 -0600 Subject: Add gtk3-tqt-engine packaging for Debian and Ubuntu --- .../applications/gtk3-tqt-engine/debian/changelog | 5 ++++ .../applications/gtk3-tqt-engine/debian/compat | 1 + .../applications/gtk3-tqt-engine/debian/control | 13 +++++++++ .../applications/gtk3-tqt-engine/debian/copyright | 31 ++++++++++++++++++++++ .../applications/gtk3-tqt-engine/debian/rules | 24 +++++++++++++++++ 5 files changed, 74 insertions(+) create mode 100644 ubuntu/precise/applications/gtk3-tqt-engine/debian/changelog create mode 100644 ubuntu/precise/applications/gtk3-tqt-engine/debian/compat create mode 100644 ubuntu/precise/applications/gtk3-tqt-engine/debian/control create mode 100644 ubuntu/precise/applications/gtk3-tqt-engine/debian/copyright create mode 100755 ubuntu/precise/applications/gtk3-tqt-engine/debian/rules (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/applications/gtk3-tqt-engine/debian/changelog b/ubuntu/precise/applications/gtk3-tqt-engine/debian/changelog new file mode 100644 index 000000000..2875ac9d0 --- /dev/null +++ b/ubuntu/precise/applications/gtk3-tqt-engine/debian/changelog @@ -0,0 +1,5 @@ +gtk3-tqt-engine-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 diff --git a/ubuntu/precise/applications/gtk3-tqt-engine/debian/compat b/ubuntu/precise/applications/gtk3-tqt-engine/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/precise/applications/gtk3-tqt-engine/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/precise/applications/gtk3-tqt-engine/debian/control b/ubuntu/precise/applications/gtk3-tqt-engine/debian/control new file mode 100644 index 000000000..aac15191f --- /dev/null +++ b/ubuntu/precise/applications/gtk3-tqt-engine/debian/control @@ -0,0 +1,13 @@ +Source: gtk3-tqt-engine-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Raphaël Pinson +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: gtk3-tqt-engine-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GTK3 theme engine for TDE + GTK3 style engine which uses the active TDE style to draw its widgets diff --git a/ubuntu/precise/applications/gtk3-tqt-engine/debian/copyright b/ubuntu/precise/applications/gtk3-tqt-engine/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/ubuntu/precise/applications/gtk3-tqt-engine/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson + +copyright (C) 2012 Timothy Pearson + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson and +is licensed under the GPL, see above. + diff --git a/ubuntu/precise/applications/gtk3-tqt-engine/debian/rules b/ubuntu/precise/applications/gtk3-tqt-engine/debian/rules new file mode 100755 index 000000000..242fb2c84 --- /dev/null +++ b/ubuntu/precise/applications/gtk3-tqt-engine/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap -- cgit v1.2.1 From 9701c2bc1ac693fcfe1aa2ad6010b52c2a4dce62 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 14 Nov 2012 13:33:47 -0600 Subject: Remove obsolete launchpad-integration requirement from tdelibs packaging --- ubuntu/precise/tdebase/debian/control.in | 3 +-- ubuntu/precise/tdelibs/debian/control | 3 +-- ubuntu/precise/tdelibs/debian/control.in | 3 +-- .../debian/patches/kubuntu_64_rosetta_translation.diff | 11 ----------- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdebase/debian/control.in b/ubuntu/precise/tdebase/debian/control.in index 7a229ecba..8194486c3 100644 --- a/ubuntu/precise/tdebase/debian/control.in +++ b/ubuntu/precise/tdebase/debian/control.in @@ -7,8 +7,7 @@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) -Standards-Version: 3.7.3 -XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian +Standards-Version: 3.8.4 Package: tdebase Section: tde diff --git a/ubuntu/precise/tdelibs/debian/control b/ubuntu/precise/tdelibs/debian/control index 76d5fa428..64c331358 100644 --- a/ubuntu/precise/tdelibs/debian/control +++ b/ubuntu/precise/tdelibs/debian/control @@ -61,8 +61,7 @@ Architecture: any Replaces: kdelibs4c2a-trinity (<< 4:14.0.0) Breaks: kdelibs4c2a-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdelibs-data-trinity, - tdelibs-data-trinity, perl, xbase-clients, - launchpad-integration, sudo + tdelibs-data-trinity, perl, xbase-clients, sudo Recommends: xdg-user-dirs Suggests: fam, perl-suid Description: core libraries and binaries for all TDE applications diff --git a/ubuntu/precise/tdelibs/debian/control.in b/ubuntu/precise/tdelibs/debian/control.in index 2762ac62e..b2a8fce1c 100644 --- a/ubuntu/precise/tdelibs/debian/control.in +++ b/ubuntu/precise/tdelibs/debian/control.in @@ -56,8 +56,7 @@ Package: tdelibs4c2a Section: libs Architecture: any Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}), - tdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, - launchpad-integration, sudo + tdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, sudo Suggests: fam, perl-suid Conflicts: tdelibs4, tdelibs4c2, tdelibs-bin (<< 4:3.3.3), tdelibs4-dev (<< 4:3.5.7.dfsg.1-6) Replaces: tdelibs4, tdelibs4c2, tdeartwork-style (<< 4:3.4.0), diff --git a/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff deleted file mode 100644 index b224a4d11..000000000 --- a/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- tdelibs/tdecore/kaboutdata.cpp 2006-03-17 10:19:05.000000000 +0000 -+++ tdelibs/tdecore/kaboutdata.cpp 2006-12-05 19:46:12.000000000 +0000 -@@ -389,7 +389,7 @@ - "of the translation teams all over the world.

" - "

For more information on KDE internationalization " - "visit http://l10n.kde.org

" -- ); -+ ) + i18n("

Debian includes additions and alterations to the TDE translation from Launchpad.

"); - } - - TQString -- cgit v1.2.1 From e9897d2176f6831435673cf463c0bbed7e836ee2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 14 Nov 2012 23:42:42 -0600 Subject: Add gtk3-tqt-engine recommends to gtk-qt-engine on Debian and Ubuntu --- ubuntu/precise/applications/gtk-qt-engine/debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/applications/gtk-qt-engine/debian/control b/ubuntu/precise/applications/gtk-qt-engine/debian/control index 6de06899e..6c2e14987 100644 --- a/ubuntu/precise/applications/gtk-qt-engine/debian/control +++ b/ubuntu/precise/applications/gtk-qt-engine/debian/control @@ -12,6 +12,7 @@ Provides: gtk2-engines-gtk-qt-trinity Replaces: gtk-qt-engine-trinity (<< 4:14.0.0) Breaks: gtk-qt-engine-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: gtk3-tqt-engine Description: theme engine using Qt for GTK+ 2.x and Trinity The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine that calls Qt to do the actual drawing. This makes your GTK 2 applications -- cgit v1.2.1 From e747ba9c24732028ce543f6885900dbe513a4ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 16 Nov 2012 03:48:08 +0100 Subject: Fix tdeutils build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Removed unnecessary files installed into doc Include files moved to default location --- .../precise/tdeutils/debian/cdbs/debian-qt-kde.mk | 8 ++++-- ubuntu/precise/tdeutils/debian/cdbs/kde.mk | 4 ++- .../precise/tdeutils/debian/kcalc-trinity.install | 4 +-- ubuntu/precise/tdeutils/debian/rules | 2 +- .../tdeutils/debian/tdeutils-trinity-dev.install | 30 +++++++++++----------- 5 files changed, 27 insertions(+), 21 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdeutils/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdeutils/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/precise/tdeutils/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdeutils/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/tdeutils/debian/cdbs/kde.mk b/ubuntu/precise/tdeutils/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdeutils/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdeutils/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/tdeutils/debian/kcalc-trinity.install b/ubuntu/precise/tdeutils/debian/kcalc-trinity.install index 231afbf24..4d245f543 100644 --- a/ubuntu/precise/tdeutils/debian/kcalc-trinity.install +++ b/ubuntu/precise/tdeutils/debian/kcalc-trinity.install @@ -10,8 +10,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/commands.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_Aix.txt -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_OSF.txt +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_Aix.txt +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_OSF.txt debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcalc.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcalc.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcalc.png diff --git a/ubuntu/precise/tdeutils/debian/rules b/ubuntu/precise/tdeutils/debian/rules index 0dfac3ab0..f0a8e0d00 100755 --- a/ubuntu/precise/tdeutils/debian/rules +++ b/ubuntu/precise/tdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install index ca7081194..17d66276d 100644 --- a/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install +++ b/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h -debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h -debian/tmp/opt/trinity/include/tde/ksim/chart.h -debian/tmp/opt/trinity/include/tde/ksim/common.h -debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h -debian/tmp/opt/trinity/include/tde/ksim/label.h -debian/tmp/opt/trinity/include/tde/ksim/led.h -debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h -debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h -debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h -debian/tmp/opt/trinity/include/tde/ksim/progress.h -debian/tmp/opt/trinity/include/tde/ksim/themeloader.h -debian/tmp/opt/trinity/include/tde/ksim/themetypes.h -debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h +debian/tmp/opt/trinity/include/kmultiformlistbox.h +debian/tmp/opt/trinity/include/kmultiformlistboxentry.h +debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/ksim/chart.h +debian/tmp/opt/trinity/include/ksim/common.h +debian/tmp/opt/trinity/include/ksim/ksimconfig.h +debian/tmp/opt/trinity/include/ksim/label.h +debian/tmp/opt/trinity/include/ksim/led.h +debian/tmp/opt/trinity/include/ksim/pluginglobal.h +debian/tmp/opt/trinity/include/ksim/pluginloader.h +debian/tmp/opt/trinity/include/ksim/pluginmodule.h +debian/tmp/opt/trinity/include/ksim/progress.h +debian/tmp/opt/trinity/include/ksim/themeloader.h +debian/tmp/opt/trinity/include/ksim/themetypes.h +debian/tmp/opt/trinity/include/kwidgetstreamer.h debian/tmp/opt/trinity/lib/libkcmlaptop.la debian/tmp/opt/trinity/lib/libkcmlaptop.so debian/tmp/opt/trinity/lib/libtdeinit_ark.la -- cgit v1.2.1 From 7c5d232eb26d4a925503f551a46965de870eefe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 17 Nov 2012 02:33:32 +0100 Subject: Fix tdeartwork build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Include files moved to default location Removed now unnecessary patches --- ubuntu/precise/tdeartwork/debian/cdbs/debian-qt-kde.mk | 8 ++++++-- ubuntu/precise/tdeartwork/debian/cdbs/kde.mk | 4 +++- .../debian/patches/debianize-xscreensaver-root-hack.diff | 11 ----------- ubuntu/precise/tdeartwork/debian/rules | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 ubuntu/precise/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdeartwork/debian/cdbs/debian-qt-kde.mk index a4e1eaef5..497be9751 100644 --- a/ubuntu/precise/tdeartwork/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdeartwork/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk b/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/ubuntu/precise/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff deleted file mode 100644 index f93aa0706..000000000 --- a/ubuntu/precise/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am ---- a/kscreensaver/krootbacking/Makefile.am -+++ b/kscreensaver/krootbacking/Makefile.am -@@ -1,6 +1,6 @@ - INCLUDES = $(all_includes) - --hackdir = /usr/local/bin/ -+hackdir = /opt/trinity/bin/ - hack_DATA = xscreensaver-getimage xscreensaver-getimage-file - - install-data-hook: diff --git a/ubuntu/precise/tdeartwork/debian/rules b/ubuntu/precise/tdeartwork/debian/rules index 82a71627a..be9adbbcd 100755 --- a/ubuntu/precise/tdeartwork/debian/rules +++ b/ubuntu/precise/tdeartwork/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -- cgit v1.2.1 From e1f624286dd31967e17a2bcdc0236de72659c23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 17 Nov 2012 16:14:08 +0100 Subject: Fix tdevelop build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Removed unnecessary files installed into doc Include files moved to default location --- ubuntu/precise/tdevelop/debian/cdbs/debian-qt-kde.mk | 8 ++++++-- ubuntu/precise/tdevelop/debian/cdbs/kde.mk | 4 +++- ubuntu/precise/tdevelop/debian/rules | 2 +- ubuntu/precise/tdevelop/debian/tdevelop-trinity-dev.install | 2 +- ubuntu/precise/tdevelop/debian/tdevelop-trinity-doc.install | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdevelop/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/precise/tdevelop/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdevelop/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/tdevelop/debian/cdbs/kde.mk b/ubuntu/precise/tdevelop/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdevelop/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdevelop/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/tdevelop/debian/rules b/ubuntu/precise/tdevelop/debian/rules index 6bb4ec733..74b304533 100755 --- a/ubuntu/precise/tdevelop/debian/rules +++ b/ubuntu/precise/tdevelop/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/precise/tdevelop/debian/tdevelop-trinity-dev.install b/ubuntu/precise/tdevelop/debian/tdevelop-trinity-dev.install index f9f8c82ab..a8813a5e2 100644 --- a/ubuntu/precise/tdevelop/debian/tdevelop-trinity-dev.install +++ b/ubuntu/precise/tdevelop/debian/tdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/tde +debian/tmp/opt/trinity/include debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/ubuntu/precise/tdevelop/debian/tdevelop-trinity-doc.install b/ubuntu/precise/tdevelop/debian/tdevelop-trinity-doc.install index 765acf0e0..2e687a858 100644 --- a/ubuntu/precise/tdevelop/debian/tdevelop-trinity-doc.install +++ b/ubuntu/precise/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/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/appwizard.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/kscribblefiles.png -- cgit v1.2.1 From ce2c7b5e4e2b68048d1fb7e5d6081fe4165d9d5b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 17 Nov 2012 14:40:07 -0600 Subject: Split libtdeldap development files into separate package --- ubuntu/precise/libraries/libtdeldap/debian/control | 10 ++++++++++ .../libraries/libtdeldap/debian/libtdeldap-trinity-dev.install | 3 +++ .../libraries/libtdeldap/debian/libtdeldap-trinity.install | 1 + 3 files changed, 14 insertions(+) create mode 100644 ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install create mode 100644 ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/libraries/libtdeldap/debian/control b/ubuntu/precise/libraries/libtdeldap/debian/control index 6734be8c9..2f489d71e 100644 --- a/ubuntu/precise/libraries/libtdeldap/debian/control +++ b/ubuntu/precise/libraries/libtdeldap/debian/control @@ -10,3 +10,13 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients Description: LDAP interface library for TDE LDAP interface library for TDE management modules. + . + libtdeldap-trinity contains the library of libtdeldap. + +Package: libtdeldap-trinity-dev +Architecture: any +Depends: libtdeldap-trinity (= ${binary:Version}), tdelibs4-trinity-dev, libldap2-dev +Description: LDAP interface library for TDE + LDAP interface library for TDE management modules. + . + libtdeldap-trinity-dev contains development files and documentation. diff --git a/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install new file mode 100644 index 000000000..639333911 --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install @@ -0,0 +1,3 @@ +opt/trinity/include/* +opt/trinity/lib/lib*.so +opt/trinity/lib/*.la diff --git a/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install new file mode 100644 index 000000000..cdef643e7 --- /dev/null +++ b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install @@ -0,0 +1 @@ +opt/trinity/lib/lib*.so.* -- cgit v1.2.1 From 72dc4d5ff96a1f84d7f1ce8f0c1a5481822161a9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 17 Nov 2012 14:41:14 -0600 Subject: Fix kerberostray build deps on Debian and Ubuntu --- ubuntu/precise/applications/kerberostray/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/applications/kerberostray/debian/control b/ubuntu/precise/applications/kerberostray/debian/control index 9db3879aa..dbeeedbc6 100644 --- a/ubuntu/precise/applications/kerberostray/debian/control +++ b/ubuntu/precise/applications/kerberostray/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libtdeldap-trinity, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kerberostray-trinity -- cgit v1.2.1 From 4cfcb3723c113b840e13e198e33a3a512b55169f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 18 Nov 2012 17:25:13 +0100 Subject: Fix tdetoys build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Removed unnecessary files installed into doc Include files moved to default location --- ubuntu/precise/tdetoys/debian/amor-trinity.install | 2 +- ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk | 8 ++++++-- ubuntu/precise/tdetoys/debian/cdbs/kde.mk | 4 +++- ubuntu/precise/tdetoys/debian/kmoon-trinity.install | 2 +- ubuntu/precise/tdetoys/debian/rules | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdetoys/debian/amor-trinity.install b/ubuntu/precise/tdetoys/debian/amor-trinity.install index 42a96abee..10653448d 100644 --- a/ubuntu/precise/tdetoys/debian/amor-trinity.install +++ b/ubuntu/precise/tdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/tde/AmorIface.h +debian/tmp/opt/trinity/include/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/tde/amor.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2 diff --git a/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/tdetoys/debian/cdbs/kde.mk b/ubuntu/precise/tdetoys/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdetoys/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdetoys/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/tdetoys/debian/kmoon-trinity.install b/ubuntu/precise/tdetoys/debian/kmoon-trinity.install index d8af4fa2f..818d57926 100644 --- a/ubuntu/precise/tdetoys/debian/kmoon-trinity.install +++ b/ubuntu/precise/tdetoys/debian/kmoon-trinity.install @@ -4,7 +4,7 @@ debian/tmp/opt/trinity/share/apps/kicker/applets/kmoonapplet.desktop debian/tmp/opt/trinity/share/apps/kmoon debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/*.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/*.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/carlosmail +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/carlosmail debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/common debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmoon.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmoon.png diff --git a/ubuntu/precise/tdetoys/debian/rules b/ubuntu/precise/tdetoys/debian/rules index 57c3cf2c9..60a5a9cf4 100755 --- a/ubuntu/precise/tdetoys/debian/rules +++ b/ubuntu/precise/tdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg -- cgit v1.2.1 From 2be159a312d63dbcb7b1291bee8fe5e26b3dcc07 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Nov 2012 12:12:25 -0600 Subject: Fix libtdeldap packaging on Debian and Ubuntu --- .../libraries/libtdeldap/debian/libtdeldap-trinity-dev.install | 6 +++--- .../precise/libraries/libtdeldap/debian/libtdeldap-trinity.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install index 639333911..5b15c89d1 100644 --- a/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install +++ b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/* -opt/trinity/lib/lib*.so -opt/trinity/lib/*.la +debian/tmp/opt/trinity/include/* +debian/tmp/opt/trinity/lib/lib*.so +debian/tmp/opt/trinity/lib/*.la diff --git a/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install index cdef643e7..11882501a 100644 --- a/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install +++ b/ubuntu/precise/libraries/libtdeldap/debian/libtdeldap-trinity.install @@ -1 +1 @@ -opt/trinity/lib/lib*.so.* +debian/tmp/opt/trinity/lib/lib*.so.* -- cgit v1.2.1 From f8c92d1cdc4f3b3abdd7dc767e570a69a34508b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 20 Nov 2012 03:20:53 +0100 Subject: Fix typo in tdenetwork on Debian and Ubuntu --- ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk index d87d86c21..f8b76cb04 100644 --- a/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdenetwork/debian/cdbs/debian-qt-kde.mk @@ -81,7 +81,7 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/user/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: -- cgit v1.2.1 From 22fd5fa79ac6b2be02017b6d19d95555eae61efb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Nov 2012 00:12:25 -0600 Subject: Fix FTBFS on Debian and Ubuntu caused by filesystem icon move to standard places --- .../debian/kamera-trinity.install | 4 +- .../tdegraphics/debian/kamera-trinity.install | 4 +- .../tdelibs/debian/tdelibs-data-trinity.install | 476 ++++++++++----------- 3 files changed, 242 insertions(+), 242 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/kdegraphics.automake/debian/kamera-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kamera-trinity.install index d9bfc4c27..e8bf34e59 100644 --- a/ubuntu/precise/kdegraphics.automake/debian/kamera-trinity.install +++ b/ubuntu/precise/kdegraphics.automake/debian/kamera-trinity.install @@ -11,7 +11,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/camera_test.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/camera.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/camera.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/camera.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/camera.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/camera.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/camera.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/camera.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/camera.png debian/tmp/opt/trinity/share/services/camera.protocol diff --git a/ubuntu/precise/tdegraphics/debian/kamera-trinity.install b/ubuntu/precise/tdegraphics/debian/kamera-trinity.install index d9bfc4c27..e8bf34e59 100644 --- a/ubuntu/precise/tdegraphics/debian/kamera-trinity.install +++ b/ubuntu/precise/tdegraphics/debian/kamera-trinity.install @@ -11,7 +11,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/camera_test.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/camera.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/camera.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/camera.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/camera.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/camera.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/camera.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/camera.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/camera.png debian/tmp/opt/trinity/share/services/camera.protocol diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install index c3580931b..5bc53c56c 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install @@ -1855,47 +1855,47 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/usbpendrive_mount. debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/tape_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/tape_unmount.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/desktop.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/exec.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/file_broken.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_crystal.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_favorite.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_green_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_green.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_grey_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_grey.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_home2.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_html.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_image.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_important.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_locked.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_man.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_wordprocessing.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_orange_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_orange.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_print.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_red_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_red.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_sound.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_tar.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_txt.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_video.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_violet_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_violet.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/folder_yellow.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/link_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/lock_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/network_local.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/network.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/pipe.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/trashcan_empty.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/trashcan_full.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/www.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/zip_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/desktop.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/exec.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/file_broken.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_crystal.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_favorite.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_green_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_green.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_grey_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_grey.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_home2.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_home.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_html.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_image.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_important.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_locked.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_man.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_wordprocessing.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_orange_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_orange.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_print.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_red_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_red.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_sound.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_tar.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_txt.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_video.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_violet_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_violet.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_yellow_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/folder_yellow.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/link_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/lock_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/network_local.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/network.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/pipe.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/trashcan_empty.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/trashcan_full.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/www.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/places/zip_overlay.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/applix.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/ascii.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/binary.png @@ -2273,52 +2273,52 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/tape_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/tape_unmount.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/zip_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/zip_unmount.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/desktop.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/exec.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/file_broken.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_crystal.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_favorite.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_green_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_green.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_grey_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_grey.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_home2.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_html.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_image.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_important.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_inbox.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_locked.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_man.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_wordprocessing.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_orange_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_orange.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_outbox.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_print.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_red_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_red.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_sent_mail.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_sound.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_tar.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_txt.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_video.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_violet.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/folder_yellow.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/ftp.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/link_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/lock_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/network_local.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/network.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/pipe.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/server.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/trashcan_empty.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/trashcan_full.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/www.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/zip_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/desktop.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/exec.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/file_broken.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_crystal.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_favorite.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_green_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_green.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_grey_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_grey.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_home2.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_home.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_html.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_image.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_important.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_inbox.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_locked.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_man.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_wordprocessing.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_orange_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_orange.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_outbox.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_print.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_red_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_red.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_sent_mail.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_sound.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_tar.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_txt.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_video.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_violet_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_violet.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_yellow_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/folder_yellow.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/ftp.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/link_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/lock_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/network_local.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/network.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/pipe.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/server.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/trashcan_empty.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/trashcan_full.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/www.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/places/zip_overlay.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/applix.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/ascii.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/binary.png @@ -2661,29 +2661,29 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/usbpendrive_mount.pn debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/tape_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/tape_unmount.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/desktop.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_green_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_green.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_grey_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_grey.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_orange_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_orange.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_print.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_red_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_red.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_violet_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_violet.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_yellow_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_yellow.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/link_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/network.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/trashcan_empty.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/trashcan_full.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/www.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/zip_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/desktop.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_green_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_green.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_grey_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_grey.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_home.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_orange_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_orange.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_print.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_red_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_red.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_violet_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_violet.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_yellow_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/folder_yellow.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/link_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/network.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/trashcan_empty.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/trashcan_full.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/www.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/zip_overlay.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/applix.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/ascii.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/binary.png @@ -3016,48 +3016,48 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/tape_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/tape_unmount.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/zip_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/zip_unmount.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/desktop.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/exec.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/file_broken.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_crystal.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_favorite.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_green_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_green.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_grey_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_grey.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_home2.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_html.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_image.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_important.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_locked.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_man.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_wordprocessing.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_orange_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_orange.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_print.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_red_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_red.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_sound.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_tar.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_txt.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_video.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_violet.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/folder_yellow.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/ftp.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/link_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/lock_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/network_local.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/network.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/pipe.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/trashcan_empty.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/trashcan_full.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/www.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/zip_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/desktop.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/exec.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/file_broken.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_crystal.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_favorite.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_green_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_green.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_grey_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_grey.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_home2.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_home.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_html.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_image.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_important.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_locked.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_man.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_wordprocessing.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_orange_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_orange.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_print.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_red_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_red.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_sound.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_tar.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_txt.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_video.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_violet_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_violet.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_yellow_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/folder_yellow.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/ftp.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/link_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/lock_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/network_local.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/network.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/pipe.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/trashcan_empty.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/trashcan_full.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/www.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/zip_overlay.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/applix.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/ascii.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/binary.png @@ -3240,51 +3240,51 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/tape_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/tape_unmount.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/zip_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/zip_unmount.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/desktop.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/exec.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/file_broken.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_crystal.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_favorite.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_green_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_green.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_grey_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_grey.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_home2.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_html.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_image.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_important.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_inbox.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_locked.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_man.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_wordprocessing.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_orange_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_orange.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_outbox.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_print.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_red_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_red.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_sound.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_tar.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_txt.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_video.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_violet.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/folder_yellow.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/ftp.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/link_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/lock_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/network_local.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/network.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/pipe.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/server.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/trashcan_empty.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/trashcan_full.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/www.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/zip_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/desktop.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/exec.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/file_broken.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_crystal.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_favorite.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_green_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_green.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_grey_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_grey.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_home2.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_home.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_html.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_image.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_important.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_inbox.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_locked.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_man.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_wordprocessing.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_orange_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_orange.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_outbox.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_print.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_red_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_red.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_sound.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_tar.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_txt.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_video.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_violet_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_violet.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_yellow_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/folder_yellow.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/ftp.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/link_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/lock_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/network_local.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/network.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/pipe.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/server.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/trashcan_empty.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/trashcan_full.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/www.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/places/zip_overlay.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/applix.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/ascii.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/binary.png @@ -3430,47 +3430,47 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/tape_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/tape_unmount.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/zip_mount.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/zip_unmount.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/desktop.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/exec.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/file_broken.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_crystal.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_favorite.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_green_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_green.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_grey_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_grey.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_home2.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_html.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_image.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_important.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_locked.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_man.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_wordprocessing.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_orange_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_orange.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_print.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_red_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_red.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_sound.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_tar.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_txt.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_video.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_violet_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_violet.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/folder_yellow.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/link_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/lock_overlay.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/network_local.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/network.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/pipe.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/trashcan_empty.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/trashcan_full.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/www.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/zip_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/desktop.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/exec.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/file_broken.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_crystal.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_favorite.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_green_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_green.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_grey_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_grey.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_home2.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_home.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_html.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_image.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_important.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_locked.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_man.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_wordprocessing.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_orange_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_orange.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_print.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_red_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_red.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_sound.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_tar.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_txt.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_video.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_violet_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_violet.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_yellow_open.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/folder_yellow.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/link_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/lock_overlay.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/network_local.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/network.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/pipe.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/trashcan_empty.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/trashcan_full.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/www.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/places/zip_overlay.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/applix.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/ascii.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/binary.png -- cgit v1.2.1