diff options
Diffstat (limited to 'debian')
48 files changed, 837 insertions, 541 deletions
diff --git a/debian/_base/applications/development/tdexsldbg/debian/changelog b/debian/_base/applications/development/tdexsldbg/debian/changelog new file mode 100644 index 000000000..ec1d59988 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/changelog @@ -0,0 +1,5 @@ +kxsldbg-trinity (4:14.1.5-0~a) forky; urgency=low + + * Move from tdewebdev into a standalone package. + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 17 Oct 2025 01:57:27 +0200 diff --git a/debian/_base/applications/development/tdexsldbg/debian/compat b/debian/_base/applications/development/tdexsldbg/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/_base/applications/development/tdexsldbg/debian/control b/debian/_base/applications/development/tdexsldbg/debian/control new file mode 100644 index 000000000..5bfe08f37 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/control @@ -0,0 +1,26 @@ +Source: kxsldbg-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev +Standards-Version: 3.8.4 +Homepage: http://www.trinitydesktop.org/ + +Package: kxsldbg-trinity +Architecture: any +Section: text +Replaces: kxsldbg-trinity (<< 4:14.0.0~) +Breaks: kxsldbg-trinity (<< 4:14.0.0~) +Depends: ${shlibs:Depends} +Suggests: quanta-trinity, khelpcenter-trinity +Description: graphical XSLT debugger for TDE [Trinity] + KXSLDbg is a debugger for XSLT scripts. It includes a graphical user + interface as well as a text-based debugger. KXSLDbg can be run as a + standalone application or as an embedded TDE part. + . + XSLT is an XML language for defining transformations of XML files from + XML to some other arbitrary format, such as XML, HTML, plain text, etc., + using standard XSLT stylesheets. + . + This package is part of TDE, as a component of the TDE web development module. + See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information. diff --git a/debian/_base/applications/development/tdexsldbg/debian/copyright b/debian/_base/applications/development/tdexsldbg/debian/copyright new file mode 100644 index 000000000..6723473d3 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/copyright @@ -0,0 +1,431 @@ +This package was debianized by Mariusz Przygodzki <dune@home.pl> on +Sat, 25 Nov 2000 15:35:08 +0100. +Maintenance was taken over by Ben Burton <bab@debian.org> on +Sun, 18 Feb 2001 12:00:03 -0600. + +It was downloaded from: https://mirror.ppa.trinitydesktop.org/trinity + +Upstream Author: + Keith Isdale <k_isdale@tpg.com.au> + +Copyright: + + All components of this package are released under the GNU General + Public License (GPL), with the following exceptions: + + DocBook documentation: (see below) + + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. + + -------------------- + + DocBook Documentation: + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.1 or any later version published by the Free Software + Foundation; with no Invariant Sections, with no Front-Cover Texts, + and with no Back-Cover Texts. + + A copy of the GNU Free Documentation License (Version 1.2) is + included below. + + + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or noncommercially. + Secondarily, this License preserves for the author and publisher a way + to get credit for their work, while not being considered responsible + for modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; + it can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work, in any medium, that + contains a notice placed by the copyright holder saying it can be + distributed under the terms of this License. Such a notice grants a + world-wide, royalty-free license, unlimited in duration, to use that + work under the conditions stated herein. The "Document", below, + refers to any such manual or work. Any member of the public is a + licensee, and is addressed as "you". You accept the license if you + copy, modify or distribute the work in a way requiring permission + under copyright law. + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (Thus, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding + them. + + The "Invariant Sections" are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the notice + that says that the Document is released under this License. If a + section does not fit the above definition of Secondary then it is not + allowed to be designated as Invariant. The Document may contain zero + Invariant Sections. If the Document does not identify any Invariant + Sections then there are none. + + The "Cover Texts" are certain short passages of text that are listed, + as Front-Cover Texts or Back-Cover Texts, in the notice that says that + the Document is released under this License. A Front-Cover Text may + be at most 5 words, and a Back-Cover Text may be at most 25 words. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or + for automatic translation to a variety of formats suitable for input + to text formatters. A copy made in an otherwise Transparent file + format whose markup, or absence of markup, has been arranged to thwart + or discourage subsequent modification by readers is not Transparent. + An image format is not Transparent if used for any substantial amount + of text. A copy that is not "Transparent" is called "Opaque". + + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, SGML + or XML using a publicly available DTD, and standard-conforming simple + HTML, PostScript or PDF designed for human modification. Examples of + transparent image formats include PNG, XCF and JPG. Opaque formats + include proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD and/or + processing tools are not generally available, and the + machine-generated HTML, PostScript or PDF produced by some word + processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the material + this License requires to appear in the title page. For works in + formats which do not have any title page as such, "Title Page" means + the text near the most prominent appearance of the work's title, + preceding the beginning of the body of the text. + + A section "Entitled XYZ" means a named subunit of the Document whose + title either is precisely XYZ or contains XYZ in parentheses following + text that translates XYZ in another language. (Here XYZ stands for a + specific section name mentioned below, such as "Acknowledgements", + "Dedications", "Endorsements", or "History".) To "Preserve the Title" + of such a section when you modify the Document means that it remains a + section "Entitled XYZ" according to this definition. + + The Document may include Warranty Disclaimers next to the notice which + states that this License applies to the Document. These Warranty + Disclaimers are considered to be included by reference in this + License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and has + no effect on the meaning of this License. + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License applies + to the Document are reproduced in all copies, and that you add no other + conditions whatsoever to those of this License. You may not use + technical measures to obstruct or control the reading or further + copying of the copies you make or distribute. However, you may accept + compensation in exchange for copies. If you distribute a large enough + number of copies you must also follow the conditions in section 3. + + You may also lend copies, under the same conditions stated above, and + you may publicly display copies. + + + 3. COPYING IN QUANTITY + + If you publish printed copies (or copies in media that commonly have + printed covers) of the Document, numbering more than 100, and the + Document's license notice requires Cover Texts, you must enclose the + copies in covers that carry, clearly and legibly, all these Cover + Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on + the back cover. Both covers must also clearly and legibly identify + you as the publisher of these copies. The front cover must present + the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. + Copying with changes limited to the covers, as long as they preserve + the title of the Document and satisfy these conditions, can be treated + as verbatim copying in other respects. + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto adjacent + pages. + + If you publish or distribute Opaque copies of the Document numbering + more than 100, you must either include a machine-readable Transparent + copy along with each Opaque copy, or state in or with each Opaque copy + a computer-network location from which the general network-using + public has access to download using public-standard network protocols + a complete Transparent copy of the Document, free of added material. + If you use the latter option, you must take reasonably prudent steps, + when you begin distribution of Opaque copies in quantity, to ensure + that this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you distribute an + Opaque copy (directly or through your agents or retailers) of that + edition to the public. + + It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. + + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document under + the conditions of sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the Modified + Version filling the role of the Document, thus licensing distribution + and modification of the Modified Version to whoever possesses a copy + of it. In addition, you must do these things in the Modified Version: + + A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. + B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + D. Preserve all the copyright notices of the Document. + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. + G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. + H. Include an unaltered copy of this License. + I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. + J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. + K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. + M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. + N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. + O. Preserve any Warranty Disclaimers. + + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no material + copied from the Document, you may at your option designate some or all + of these sections as invariant. To do this, add their titles to the + list of Invariant Sections in the Modified Version's license notice. + These titles must be distinct from any other section titles. + + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text has + been approved by an organization as the authoritative definition of a + standard. + + You may add a passage of up to five words as a Front-Cover Text, and a + passage of up to 25 words as a Back-Cover Text, to the end of the list + of Cover Texts in the Modified Version. Only one passage of + Front-Cover Text and one of Back-Cover Text may be added by (or + through arrangements made by) any one entity. If the Document already + includes a cover text for the same cover, previously added by you or + by arrangement made by the same entity you are acting on behalf of, + you may not add another; but you may replace the old one, on explicit + permission from the previous publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to assert or + imply endorsement of any Modified Version. + + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under this + License, under the terms defined in section 4 above for modified + versions, provided that you include in the combination all of the + Invariant Sections of all of the original documents, unmodified, and + list them all as Invariant Sections of your combined work in its + license notice, and that you preserve all their Warranty Disclaimers. + + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name but + different contents, make the title of each such section unique by + adding at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique number. + Make the same adjustment to the section titles in the list of + Invariant Sections in the license notice of the combined work. + + In the combination, you must combine any sections Entitled "History" + in the various original documents, forming one section Entitled + "History"; likewise combine any sections Entitled "Acknowledgements", + and any sections Entitled "Dedications". You must delete all sections + Entitled "Endorsements". + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies of this + License in the various documents with a single copy that is included in + the collection, provided that you follow the rules of this License for + verbatim copying of each of the documents in all other respects. + + You may extract a single document from such a collection, and distribute + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all + other respects regarding verbatim copying of that document. + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other separate + and independent documents or works, in or on a volume of a storage or + distribution medium, is called an "aggregate" if the copyright + resulting from the compilation is not used to limit the legal rights + of the compilation's users beyond what the individual works permit. + When the Document is included in an aggregate, this License does not + apply to the other works in the aggregate which are not themselves + derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half of + the entire aggregate, the Document's Cover Texts may be placed on + covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic form. + Otherwise they must appear on printed covers that bracket the whole + aggregate. + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. + Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also include + the original English version of this License and the original versions + of those notices and disclaimers. In case of a disagreement between + the translation and the original version of this License or a notice + or disclaimer, the original version will prevail. + + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to Preserve + its Title (section 1) will typically require changing the actual + title. + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except + as expressly provided for under this License. Any other attempt to + copy, modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions + of the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + http://www.gnu.org/copyleft/. + + Each version of the License is given a distinguishing version number. + If the Document specifies that a particular numbered version of this + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that specified version or + of any later version that has been published (not as a draft) by the + Free Software Foundation. If the Document does not specify a version + number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. + + + ADDENDUM: How to use this License for your documents + + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled + "GNU Free Documentation License". + + If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, + replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + + If you have Invariant Sections without Cover Texts, or some other + combination of the three, merge those two alternatives to suit the + situation. + + If your document contains nontrivial examples of program code, we + recommend releasing these examples in parallel under your choice of + free software license, such as the GNU General Public License, + to permit their use in free software. diff --git a/debian/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg b/debian/_base/applications/development/tdexsldbg/debian/doc-base.kxsldbg index 2f14db1f4..2f14db1f4 100644 --- a/debian/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg +++ b/debian/_base/applications/development/tdexsldbg/debian/doc-base.kxsldbg diff --git a/debian/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg b/debian/_base/applications/development/tdexsldbg/debian/doc-base.xsldbg index e4147f24f..e4147f24f 100644 --- a/debian/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg +++ b/debian/_base/applications/development/tdexsldbg/debian/doc-base.xsldbg diff --git a/debian/_base/applications/development/tdexsldbg/debian/docs b/debian/_base/applications/development/tdexsldbg/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.menu b/debian/_base/applications/development/tdexsldbg/debian/menu index 685853031..685853031 100644 --- a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.menu +++ b/debian/_base/applications/development/tdexsldbg/debian/menu diff --git a/debian/_base/applications/development/tdexsldbg/debian/rules b/debian/_base/applications/development/tdexsldbg/debian/rules new file mode 100755 index 000000000..acfdd3d1b --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/cdbs/1/rules/debhelper.mk +-include /usr/share/cdbs/1/class/tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/development/tdexsldbg/debian/source/format b/debian/_base/applications/development/tdexsldbg/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/_base/applications/development/tdexsldbg/debian/source/options b/debian/_base/applications/development/tdexsldbg/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/debian/_base/applications/development/tdexsldbg/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install index 010c6f400..7ab7fc5bc 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install @@ -1,17 +1,17 @@ debian/tmp/opt/trinity/bin/kvi_run_netscape debian/tmp/opt/trinity/bin/kvi_search_help -debian/tmp/opt/trinity/share/applnk/Internet/kvirc.desktop +debian/tmp/opt/trinity/lib/kvirc/modules/caps/ +debian/tmp/opt/trinity/share/applications/tde/kvirc.desktop debian/tmp/opt/trinity/share/apps/tdeconf_update/ +debian/tmp/opt/trinity/share/apps/kvirc/config/ +debian/tmp/opt/trinity/share/apps/kvirc/defscript/ +debian/tmp/opt/trinity/share/apps/kvirc/help/ +debian/tmp/opt/trinity/share/apps/kvirc/license/ +debian/tmp/opt/trinity/share/apps/kvirc/msgcolors/ +debian/tmp/opt/trinity/share/apps/kvirc/pics/ +#debian/tmp/opt/trinity/share/apps/kvirc/services/ +debian/tmp/opt/trinity/share/apps/kvirc/themes/ debian/tmp/opt/trinity/share/icons/hicolor/ -debian/tmp/opt/trinity/share/kvirc/*/config/ -debian/tmp/opt/trinity/share/kvirc/*/defscript/ -debian/tmp/opt/trinity/share/kvirc/*/help/ -debian/tmp/opt/trinity/share/kvirc/*/license/ -debian/tmp/opt/trinity/share/kvirc/*/locale/ -debian/tmp/opt/trinity/lib/kvirc/*/modules/caps/ -debian/tmp/opt/trinity/share/kvirc/*/msgcolors/ -debian/tmp/opt/trinity/share/kvirc/*/pics/ -#debian/tmp/opt/trinity/share/kvirc/*/services/ -debian/tmp/opt/trinity/share/kvirc/*/themes/ +debian/tmp/opt/trinity/share/locale/ debian/tmp/opt/trinity/share/mimelnk/text/*.desktop debian/tmp/opt/trinity/share/man/man1/kvirc.1 diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst index 44593aa4f..6bba6088d 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst @@ -6,10 +6,10 @@ case "$1" in configure) update-alternatives --quiet --install \ /opt/trinity/share/services/irc.protocol irc.protocol \ - /opt/trinity/share/kvirc/3.4/services/irc.protocol 60 + /opt/trinity/share/apps/kvirc/services/irc.protocol 60 update-alternatives --quiet --install \ /opt/trinity/share/services/irc6.protocol irc6.protocol \ - /opt/trinity/share/kvirc/3.4/services/irc6.protocol 60 + /opt/trinity/share/apps/kvirc/services/irc6.protocol 60 ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm index 411365f32..2636e2172 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm @@ -5,9 +5,9 @@ set -e case "$1" in remove) update-alternatives --quiet --remove irc.protocol \ - /opt/trinity/share/kvirc/3.4/services/irc.protocol + /opt/trinity/share/apps/kvirc/services/irc.protocol update-alternatives --quiet --remove irc6.protocol \ - /opt/trinity/share/kvirc/3.4/services/irc6.protocol + /opt/trinity/share/apps/kvirc/services/irc6.protocol ;; upgrade|deconfigure) diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install index b786fb7ec..487140ed4 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install @@ -2,4 +2,4 @@ debian/tmp/opt/trinity/bin/kvirc-config debian/tmp/opt/trinity/include/kvirc/ debian/tmp/opt/trinity/lib/*.la debian/tmp/opt/trinity/lib/*.so -debian/tmp/opt/trinity/lib/kvirc/*/modules/*.la +debian/tmp/opt/trinity/lib/kvirc/modules/*.la diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install index 01777294f..3c4e431a9 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install @@ -1,4 +1,4 @@ debian/overrides/kvirc-trinity usr/share/lintian/overrides debian/tmp/opt/trinity/bin/kvirc debian/tmp/opt/trinity/lib/*.so.* -debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so +debian/tmp/opt/trinity/lib/kvirc/modules/*.so diff --git a/debian/_base/applications/internet/kvirc/debian/rules b/debian/_base/applications/internet/kvirc/debian/rules index 6ca089653..01c1648ca 100755 --- a/debian/_base/applications/internet/kvirc/debian/rules +++ b/debian/_base/applications/internet/kvirc/debian/rules @@ -76,8 +76,8 @@ common-install-indep:: # # Change the name of the COPYING file to appease lintian # - mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/license/COPYING \ - $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/license/EULA + mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/apps/kvirc/license/COPYING \ + $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/apps/kvirc/license/EULA post-patches:: debian/stamp-bootstrap @@ -97,5 +97,5 @@ endif touch debian/stamp-bootstrap binary-install/kvirc-data-trinity:: - mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services - mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services/ + mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/apps/kvirc/services + mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/apps/kvirc/services/ diff --git a/debian/_base/applications/system/krusader/debian/README.Debian b/debian/_base/applications/system/krusader/debian/README.Debian deleted file mode 100644 index b0302c211..000000000 --- a/debian/_base/applications/system/krusader/debian/README.Debian +++ /dev/null @@ -1,107 +0,0 @@ -Debian kde-extras Team ----------------------- - -1. Contacts ------------ - -General help requests - <debian-kde@lists.debian.org> mailing list - #debian-kde on irc - -Packaging queries - <debian-qt-kde@lists.debian.org> mailing list - #debian-qt-kde on irc - -Maintainers - <pkg-kde-extras@lists.alioth.debian.org> mailing list - - -2. Subversion repository ------------------------- - -You can browse it only at: - -http://svn.debian.org/wsvn/pkg-kde/kde-extras/ - -To "checkout" the repository use these commands: - - $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Authorized SSH keys are controlled at https://alioth.debian.org/account/ - -The repository layout is: - -- packagename/ - - trunk/ - - branches/ - - tags/ - - 0.7.2-1/ - - 0.7.2-2/ - - 0.7.2-2ubuntu1/ - - 0.7.2-2ubuntu2/ - - 0.7.2-2ubuntu3/ - - 0.8.0/ - ... - -If only one version of the package is available at the time, development must -be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new -release is made. - -When, at some point, the need to have two different versions at the same time -arises (for example, if we need a version to be in unstable and a different one -to be in experimental), experimental development will be made in trunk/ and -if a new unstable package needs to be cooked, copying -tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the -trick. - -3. Using svn-buildpackage --------------------------- - -Packages with an upstream tarball will require you to set the mergeWithUpstream -property first (from the package root) so that svn-buildpackage will look for -the .orig.tar.gz in the ../tarballs directory. - - % svn propset mergeWithUpstream 1 debian - -Please note that this only works for packages which have only the debian/ -directory committed. Consequently, you must use CDBS's simple-patchsys.mk or -dpatch to modify the upstream sources. - -After you have finished and committed your Debian patches via - - % svn commit [PACKAGE] - -as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build -your package with the following commands: - - % svn-buildpackage --svn-ignore-new -rfakeroot - -Please, don't commit tarballs/ or build-area/ directories to SVN. - -4. Tarballs and Build-area directories ------------------------------------- - -During pkg development before uploaded to debian the tarballs can be found at: - - http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/ - -You need to place those dirs in the parent directory of the one from which you're -running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs -in 'pkgname'/ dir, at the same level as trunk/ - -If you want to compile inside one version in tags/ dir, you'll need to place those -dirs inside that dir. Of course the easiest and cleanest way of doing it is -by making a symlink of those dirs inside tags/ dir. - -5. Using svn-inject -------------------- - -To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1) -as follows: - - svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Type in your alioth password a few hundred times :-) and your package should be -uploaded to the archive. Note you will also need to manually copy the -package.orig.tar.gz to your tarballs directory. The -o option is important as -this ensures that we 'Only keep modified files under SVN control' diff --git a/debian/_base/applications/system/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control index 398f46f36..998fae531 100644 --- a/debian/_base/applications/system/krusader/debian/control +++ b/debian/_base/applications/system/krusader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libkonq4-trinity-dev, libacl1-dev Standards-Version: 3.8.4 Homepage: http://krusader.sourceforge.net @@ -34,15 +34,3 @@ Description: twin-panel (commander-style) file manager for TDE (and other deskto . Almost completely customizable, Krusader is very user friendly, fast and looks great on your desktop. - -Package: krusader-trinity-dbg -Section: devel -Architecture: any -Replaces: krusader-trinity-dbg (<< 4:14.0.0~) -Breaks: krusader-trinity-dbg (<< 4:14.0.0~) -Priority: extra -Depends: krusader-trinity (= ${binary:Version}) -Description: debugging symbols for krusader-trinity - This package contains the debugging symbols associated with krusader-trinity. - They will automatically be used by gdb for debugging krusader-related - issues. diff --git a/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides b/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides deleted file mode 100644 index 62bf48233..000000000 --- a/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# package depends on tdebase-bin, which provides tdesu -krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu diff --git a/debian/_base/applications/system/krusader/debian/rules b/debian/_base/applications/system/krusader/debian/rules index 721d1b856..f105545bb 100755 --- a/debian/_base/applications/system/krusader/debian/rules +++ b/debian/_base/applications/system/krusader/debian/rules @@ -1,36 +1,15 @@ #!/usr/bin/make -f -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/tde.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 - -DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -install/krusader-trinity:: - # install xpm files used by menu - install -D -p -m0644 pics/cr16-app-krusader_root.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root-16.xpm - install -D -p -m0644 pics/cr16-app-krusader_user.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user-16.xpm - install -D -p -m0644 pics/cr32-app-krusader_root.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root.xpm - install -D -p -m0644 pics/cr32-app-krusader_user.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm - # install properly tdeio_isorc - install -D -p -m0644 src/iso/tdeio_isorc \ - $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc - # install lintian override - install -D -p -m0644 debian/krusader.lintian-overrides \ - $(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg) - -binary-post-install/krusader-trinity:: - rm -rf debian/krusader-trinity/etc/trinity/ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/system/krusader/debian/source.lintian-overrides b/debian/_base/applications/system/krusader/debian/source.lintian-overrides deleted file mode 100644 index 01d57f16c..000000000 --- a/debian/_base/applications/system/krusader/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# will be cleaned in next upstream release -krusader source: source-contains-CVS-dir admin/CVS diff --git a/debian/_base/applications/system/krusader/debian/watch b/debian/_base/applications/system/krusader/debian/watch deleted file mode 100644 index d19bef39d..000000000 --- a/debian/_base/applications/system/krusader/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts=dversionmangle=s/~/-/ \ - http://sf.net/krusader/krusader-([\d\.].*)\.tar\.gz debian svn-upgrade diff --git a/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 99db98c6f..a4ced0644 100644 --- a/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -396,17 +396,17 @@ +@@ -414,17 +414,17 @@ . "$tdehome/share/config/startupconfig" fi @@ -27,5 +27,5 @@ +# fi +#fi - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + # An XCursor mouse theme is needed to work with kded or ksmserver. if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then diff --git a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install index 8131ae5b5..eb09b1d5d 100644 --- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -496,93 +496,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop.p debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-system.png debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/input-touchpad.png debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/laptop.png -debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop -debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop -debian/tmp/opt/trinity/share/services/searchproviders/alexa_url.desktop -debian/tmp/opt/trinity/share/services/searchproviders/alltheweb.desktop -debian/tmp/opt/trinity/share/services/searchproviders/altavista.desktop -debian/tmp/opt/trinity/share/services/searchproviders/amg.desktop -debian/tmp/opt/trinity/share/services/searchproviders/appsy.desktop -debian/tmp/opt/trinity/share/services/searchproviders/austronaut.desktop -debian/tmp/opt/trinity/share/services/searchproviders/backports.desktop -debian/tmp/opt/trinity/share/services/searchproviders/bugft.desktop -debian/tmp/opt/trinity/share/services/searchproviders/bugno.desktop -debian/tmp/opt/trinity/share/services/searchproviders/call.desktop -debian/tmp/opt/trinity/share/services/searchproviders/cia.desktop -debian/tmp/opt/trinity/share/services/searchproviders/citeseer.desktop -debian/tmp/opt/trinity/share/services/searchproviders/cpan.desktop -debian/tmp/opt/trinity/share/services/searchproviders/ctan_cat.desktop -debian/tmp/opt/trinity/share/services/searchproviders/ctan.desktop -debian/tmp/opt/trinity/share/services/searchproviders/dbug.desktop -debian/tmp/opt/trinity/share/services/searchproviders/de2en.desktop -debian/tmp/opt/trinity/share/services/searchproviders/de2fr.desktop -debian/tmp/opt/trinity/share/services/searchproviders/deb.desktop -debian/tmp/opt/trinity/share/services/searchproviders/dmoz.desktop -debian/tmp/opt/trinity/share/services/searchproviders/docbook.desktop -debian/tmp/opt/trinity/share/services/searchproviders/doi.desktop -debian/tmp/opt/trinity/share/services/searchproviders/en2de.desktop -debian/tmp/opt/trinity/share/services/searchproviders/en2es.desktop -debian/tmp/opt/trinity/share/services/searchproviders/en2fr.desktop -debian/tmp/opt/trinity/share/services/searchproviders/en2it.desktop -debian/tmp/opt/trinity/share/services/searchproviders/es2en.desktop -debian/tmp/opt/trinity/share/services/searchproviders/excite.desktop -debian/tmp/opt/trinity/share/services/searchproviders/feedster.desktop -debian/tmp/opt/trinity/share/services/searchproviders/foldoc.desktop -debian/tmp/opt/trinity/share/services/searchproviders/fr2de.desktop -debian/tmp/opt/trinity/share/services/searchproviders/fr2en.desktop -debian/tmp/opt/trinity/share/services/searchproviders/freedb.desktop -debian/tmp/opt/trinity/share/services/searchproviders/freshmeat.desktop -debian/tmp/opt/trinity/share/services/searchproviders/froogle.desktop -debian/tmp/opt/trinity/share/services/searchproviders/fsd.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google_advanced.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google_groups.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google_images.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google_lucky.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google_movie.desktop -debian/tmp/opt/trinity/share/services/searchproviders/google_news.desktop -debian/tmp/opt/trinity/share/services/searchproviders/gracenote.desktop -debian/tmp/opt/trinity/share/services/searchproviders/grec.desktop -debian/tmp/opt/trinity/share/services/searchproviders/hotbot.desktop -debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary.desktop -debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary_thesaurus.desktop -debian/tmp/opt/trinity/share/services/searchproviders/imdb.desktop -debian/tmp/opt/trinity/share/services/searchproviders/it2en.desktop -debian/tmp/opt/trinity/share/services/searchproviders/jeeves.desktop -debian/tmp/opt/trinity/share/services/searchproviders/katatudo.desktop -debian/tmp/opt/trinity/share/services/searchproviders/kde.desktop -debian/tmp/opt/trinity/share/services/searchproviders/kde_websvn.desktop -debian/tmp/opt/trinity/share/services/searchproviders/leo.desktop -debian/tmp/opt/trinity/share/services/searchproviders/lycos.desktop -debian/tmp/opt/trinity/share/services/searchproviders/mamma.desktop -debian/tmp/opt/trinity/share/services/searchproviders/metacrawler.desktop -debian/tmp/opt/trinity/share/services/searchproviders/msdn.desktop -debian/tmp/opt/trinity/share/services/searchproviders/netcraft.desktop -debian/tmp/opt/trinity/share/services/searchproviders/nl-telephone.desktop -debian/tmp/opt/trinity/share/services/searchproviders/nl-teletekst.desktop -debian/tmp/opt/trinity/share/services/searchproviders/pgpkeys.desktop -debian/tmp/opt/trinity/share/services/searchproviders/php.desktop -debian/tmp/opt/trinity/share/services/searchproviders/python.desktop -debian/tmp/opt/trinity/share/services/searchproviders/qt3.desktop -debian/tmp/opt/trinity/share/services/searchproviders/qt.desktop -debian/tmp/opt/trinity/share/services/searchproviders/rae.desktop -debian/tmp/opt/trinity/share/services/searchproviders/rfc.desktop -debian/tmp/opt/trinity/share/services/searchproviders/rpmfind.desktop -debian/tmp/opt/trinity/share/services/searchproviders/ruby_application_archive.desktop -debian/tmp/opt/trinity/share/services/searchproviders/seek.desktop -debian/tmp/opt/trinity/share/services/searchproviders/sourceforge.desktop -debian/tmp/opt/trinity/share/services/searchproviders/technorati.desktop -debian/tmp/opt/trinity/share/services/searchproviders/technoratitags.desktop -debian/tmp/opt/trinity/share/services/searchproviders/thesaurus.desktop -debian/tmp/opt/trinity/share/services/searchproviders/tvtome.desktop -debian/tmp/opt/trinity/share/services/searchproviders/uspto.desktop -debian/tmp/opt/trinity/share/services/searchproviders/vivisimo.desktop -debian/tmp/opt/trinity/share/services/searchproviders/voila.desktop -debian/tmp/opt/trinity/share/services/searchproviders/webster.desktop -debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop -debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop -debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop -debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop +debian/tmp/opt/trinity/share/services/searchproviders/*.desktop debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop diff --git a/debian/_base/core/tdebindings/debian/control b/debian/_base/core/tdebindings/debian/control index 835813d8b..84f2a5d10 100644 --- a/debian/_base/core/tdebindings/debian/control +++ b/debian/_base/core/tdebindings/debian/control @@ -1,7 +1,7 @@ Source: tdebindings-trinity Build-Depends: tde-cdbs (>= 0.4.43), debhelper (>= 10~), python3-all-dev, dh-python, python3-setuptools, quilt, gawk, - default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc], + default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 loong64 s390 sparc], tdelibs14-trinity-dev, ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev Section: devel @@ -65,7 +65,7 @@ Description: DCOP bindings for Java [Trinity] This package is part of the official TDE bindings module. Package: libdcop3-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 loong64 s390 sparc Section: libs Replaces: libdcop3-jni-trinity (<< 4:14.0.0~) Breaks: libdcop3-jni-trinity (<< 4:14.0.0~) @@ -79,7 +79,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity] This package is part of the official TDE bindings module. Package: libdcop3-java-trinity-dev -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 loong64 s390 sparc Section: libdevel Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~) Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~) @@ -110,7 +110,7 @@ Description: Java bindings for Qt [Trinity] This package is part of the official TDE bindings module. Package: libqt3-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 loong64 s390 sparc Section: libs Replaces: libqt3-jni-trinity (<< 4:14.0.0~) Breaks: libqt3-jni-trinity (<< 4:14.0.0~) @@ -139,7 +139,7 @@ Description: tdelibs bindings for Java [Trinity] This package is part of the official TDE bindings module. Package: libtrinity-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 loong64 s390 sparc Section: libs Replaces: libtrinity-jni-trinity (<< 4:14.0.0~) Breaks: libtrinity-jni-trinity (<< 4:14.0.0~) diff --git a/debian/_base/core/tdegames/debian/control b/debian/_base/core/tdegames/debian/control index 88cb86d57..f2e36ff8c 100644 --- a/debian/_base/core/tdegames/debian/control +++ b/debian/_base/core/tdegames/debian/control @@ -10,6 +10,7 @@ Standards-Version: 3.8.4 Package: tdegames-trinity Architecture: all +Multi-Arch: foreign Section: tde Replaces: kdegames-trinity (<< 4:14.0.0~) Breaks: kdegames-trinity (<< 4:14.0.0~) @@ -26,6 +27,7 @@ Description: games from the official Trinity release Package: tdegames-trinity-doc-html Architecture: all +Multi-Arch: foreign Section: doc Replaces: kdegames-trinity-doc-html (<< 4:14.0.0~) Breaks: kdegames-trinity-doc-html (<< 4:14.0.0~) @@ -44,13 +46,12 @@ Description: TDE games documentation in HTML format This package is part of TDE, and a component of the TDE games module. See the 'tde-trinity' and 'tdegames-trinity' packages for more information. -Package: libtdegames1-trinity +Package: libtdegames4-trinity Architecture: any +Multi-Arch: no Section: games -Replaces: libkdegames1-trinity (<< 4:14.0.0~) -Breaks: libkdegames1-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Description: Trinity games library and common files +Depends: ${shlibs:Depends}, libtdegames-data-trinity +Description: Trinity games library This library provides a common infrastructure for several of the games in the TDE distribution. Features include standardized menu items, high score handling, card display, and network connections @@ -59,8 +60,23 @@ Description: Trinity games library and common files This package is part of TDE, and a component of the TDE games module. See the 'tde-trinity' and 'tdegames-trinity' packages for more information. +Package: libtdegames-data-trinity +Architecture: all +Multi-Arch: foreign +Section: games +Breaks: libtdegames1-trinity (<< 4:14.1.6~) +Conflicts: libtdegames1-trinity (<< 4:14.1.6~) +Depends: ${shlibs:Depends} +Description: Common files for Trinity games library + This package provides a common files for Trinity games library, + such as icons for standardized menu items. + . + This package is part of TDE, and a component of the TDE games module. + See the 'tde-trinity' and 'tdegames-trinity' packages for more information. + Package: tdegames-trinity-dbg Architecture: any +Multi-Arch: no Depends: tdelibs-trinity-dbg Replaces: kdegames-trinity-dbg (<< 4:14.0.0~) Breaks: kdegames-trinity-dbg (<< 4:14.0.0~) @@ -73,10 +89,11 @@ Description: debugging symbols for tdegames Package: libtdegames-trinity-dev Architecture: any +Multi-Arch: no Section: libdevel Replaces: libkdegames-trinity-dev (<< 4:14.0.0~) Breaks: libkdegames-trinity-dev (<< 4:14.0.0~) -Depends: tdelibs14-trinity-dev, libtdegames1-trinity (= ${source:Version}) +Depends: tdelibs14-trinity-dev, libtdegames4-trinity (= ${source:Version}) Description: Trinity games library headers This package is necessary if you want to develop your own games using the TDE games library. @@ -86,6 +103,7 @@ Description: Trinity games library headers Package: libtdegames-trinity-doc Architecture: all +Multi-Arch: foreign Section: doc Replaces: libkdegames-trinity-doc (<< 4:14.0.0~) Breaks: libkdegames-trinity-doc (<< 4:14.0.0~) @@ -100,6 +118,7 @@ Description: API documentation for the Trinity games library Package: tdegames-card-data-trinity Architecture: all +Multi-Arch: foreign Section: games Replaces: kdegames-card-data-trinity (<< 4:14.0.0~) Breaks: kdegames-card-data-trinity (<< 4:14.0.0~) @@ -111,6 +130,7 @@ Description: Card decks for Trinity games Package: atlantik-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: atlantik-trinity (<< 4:14.0.0~) Breaks: atlantik-trinity (<< 4:14.0.0~) @@ -128,6 +148,7 @@ Description: TDE client for Monopoly-like network games Package: atlantik-trinity-dev Architecture: any +Multi-Arch: no Section: devel Replaces: atlantik-trinity-dev (<< 4:14.0.0~) Breaks: atlantik-trinity-dev (<< 4:14.0.0~) @@ -142,6 +163,7 @@ Description: Development files for Atlantik Package: kasteroids-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kasteroids-trinity (<< 4:14.0.0~) Breaks: kasteroids-trinity (<< 4:14.0.0~) @@ -159,6 +181,7 @@ Description: Asteroids for Trinity Package: katomic-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: katomic-trinity (<< 4:14.0.0~) Breaks: katomic-trinity (<< 4:14.0.0~) @@ -174,6 +197,7 @@ Description: Atomic Entertainment game for Trinity Package: kbackgammon-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kbackgammon-trinity (<< 4:14.0.0~) Breaks: kbackgammon-trinity (<< 4:14.0.0~) @@ -191,6 +215,7 @@ Description: A Backgammon game for Trinity Package: kbattleship-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kbattleship-trinity (<< 4:14.0.0~) Breaks: kbattleship-trinity (<< 4:14.0.0~) @@ -206,6 +231,7 @@ Description: Battleship game for Trinity Package: kblackbox-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kblackbox-trinity (<< 4:14.0.0~) Breaks: kblackbox-trinity (<< 4:14.0.0~) @@ -223,6 +249,7 @@ Description: A simple logical game for the Trinity project Package: kbounce-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kbounce-trinity (<< 4:14.0.0~) Breaks: kbounce-trinity (<< 4:14.0.0~) @@ -250,6 +277,7 @@ Description: Jezzball clone for the Trinity Desktop Environment Package: kenolaba-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kenolaba-trinity (<< 4:14.0.0~) Breaks: kenolaba-trinity (<< 4:14.0.0~) @@ -269,6 +297,7 @@ Description: Enolaba board game for Trinity Package: kfouleggs-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kfouleggs-trinity (<< 4:14.0.0~) Breaks: kfouleggs-trinity (<< 4:14.0.0~) @@ -284,6 +313,7 @@ Description: A TDE clone of the Japanese PuyoPuyo game Package: kgoldrunner-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kgoldrunner-trinity (<< 4:14.0.0~) Breaks: kgoldrunner-trinity (<< 4:14.0.0~) @@ -309,6 +339,7 @@ Description: A Trinity clone of the Loderunner arcade game Package: kjumpingcube-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kjumpingcube-trinity (<< 4:14.0.0~) Breaks: kjumpingcube-trinity (<< 4:14.0.0~) @@ -326,6 +357,7 @@ Description: Tactical one or two player game Package: klickety-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: klickety-trinity (<< 4:14.0.0~) Breaks: klickety-trinity (<< 4:14.0.0~) @@ -339,6 +371,7 @@ Description: A Clickomania-like game for Trinity Package: klines-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: klines-trinity (<< 4:14.0.0~) Breaks: klines-trinity (<< 4:14.0.0~) @@ -361,6 +394,7 @@ Description: Color lines for Trinity Package: kmahjongg-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kmahjongg-trinity (<< 4:14.0.0~) Breaks: kmahjongg-trinity (<< 4:14.0.0~) @@ -375,6 +409,7 @@ Description: the classic mahjongg game for Trinity project Package: kmines-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kmines-trinity (<< 4:14.0.0~) Breaks: kmines-trinity (<< 4:14.0.0~) @@ -394,6 +429,7 @@ Description: Minesweeper for Trinity Package: knetwalk-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: knetwalk-trinity (<< 4:14.0.0~) Breaks: knetwalk-trinity (<< 4:14.0.0~) @@ -409,6 +445,7 @@ Description: A game for system administrators Package: kolf-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kolf-trinity (<< 4:14.0.0~) Breaks: kolf-trinity (<< 4:14.0.0~) @@ -422,6 +459,7 @@ Description: Minigolf game for TDE Package: kolf-trinity-dev Architecture: any +Multi-Arch: no Section: devel Replaces: kolf-trinity-dev (<< 4:14.0.0~) Breaks: kolf-trinity-dev (<< 4:14.0.0~) @@ -436,6 +474,7 @@ Description: Development files for Kolf Package: konquest-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: konquest-trinity (<< 4:14.0.0~) Breaks: konquest-trinity (<< 4:14.0.0~) @@ -450,6 +489,7 @@ Description: TDE based GNU-Lactic Konquest game Package: kpat-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kpat-trinity (<< 4:14.0.0~) Breaks: kpat-trinity (<< 4:14.0.0~) @@ -463,6 +503,7 @@ Description: Trinity solitaire patience game Package: kpoker-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kpoker-trinity (<< 4:14.0.0~) Breaks: kpoker-trinity (<< 4:14.0.0~) @@ -476,6 +517,7 @@ Description: Trinity based Poker clone Package: kreversi-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kreversi-trinity (<< 4:14.0.0~) Breaks: kreversi-trinity (<< 4:14.0.0~) @@ -493,6 +535,7 @@ Description: Reversi for Trinity Package: ksame-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ksame-trinity (<< 4:14.0.0~) Breaks: ksame-trinity (<< 4:14.0.0~) @@ -508,6 +551,7 @@ Description: SameGame for Trinity Package: kshisen-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kshisen-trinity (<< 4:14.0.0~) Breaks: kshisen-trinity (<< 4:14.0.0~) @@ -523,6 +567,7 @@ Description: Shisen-Sho for Trinity Package: ksirtet-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ksirtet-trinity (<< 4:14.0.0~) Breaks: ksirtet-trinity (<< 4:14.0.0~) @@ -542,6 +587,7 @@ Description: Tetris and Puyo-Puyo games for Trinity Package: ksmiletris-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ksmiletris-trinity (<< 4:14.0.0~) Breaks: ksmiletris-trinity (<< 4:14.0.0~) @@ -556,6 +602,7 @@ Description: Tetris like game for Trinity Package: ksnake-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ksnake-trinity (<< 4:14.0.0~) Breaks: ksnake-trinity (<< 4:14.0.0~) @@ -569,6 +616,7 @@ Description: Snake Race for Trinity Package: ksokoban-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ksokoban-trinity (<< 4:14.0.0~) Breaks: ksokoban-trinity (<< 4:14.0.0~) @@ -598,6 +646,7 @@ Description: Sokoban game for Trinity Package: kspaceduel-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kspaceduel-trinity (<< 4:14.0.0~) Breaks: kspaceduel-trinity (<< 4:14.0.0~) @@ -615,6 +664,7 @@ Description: Arcade two-player space game for Trinity Package: ktron-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ktron-trinity (<< 4:14.0.0~) Breaks: ktron-trinity (<< 4:14.0.0~) @@ -628,6 +678,7 @@ Description: Tron clone for the Trinity Desktop Environment Package: ktuberling-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: ktuberling-trinity (<< 4:14.0.0~) Breaks: ktuberling-trinity (<< 4:14.0.0~) @@ -654,6 +705,7 @@ Description: Potato Guy for Trinity Package: twin4-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: kwin4-trinity (<< 4:14.0.0~) Breaks: kwin4-trinity (<< 4:14.0.0~) @@ -675,6 +727,7 @@ Description: Connect Four clone for Trinity Package: lskat-trinity Architecture: any +Multi-Arch: foreign Section: games Replaces: lskat-trinity (<< 4:14.0.0~) Breaks: lskat-trinity (<< 4:14.0.0~) @@ -694,6 +747,7 @@ Description: Lieutnant Skat card game for Trinity Package: tdefifteen-trinity Architecture: any +Multi-Arch: foreign Section: games Depends: ${shlibs:Depends} Description: Puzzle-solving game for Trinity diff --git a/debian/_base/core/tdegames/debian/libtdegames1-trinity.install b/debian/_base/core/tdegames/debian/libtdegames-data-trinity.install index 2759a4355..2ddb26a0d 100644 --- a/debian/_base/core/tdegames/debian/libtdegames1-trinity.install +++ b/debian/_base/core/tdegames/debian/libtdegames-data-trinity.install @@ -1,4 +1,3 @@ -/opt/trinity/lib/libtdegames.so.* /opt/trinity/share/apps/tdegames/pics/star.png /opt/trinity/share/icons/crystalsvg/16x16/actions/roll.png /opt/trinity/share/icons/crystalsvg/16x16/actions/highscore.png diff --git a/debian/_base/core/tdegames/debian/libtdegames4-trinity.install b/debian/_base/core/tdegames/debian/libtdegames4-trinity.install new file mode 100644 index 000000000..d5fbbc4a5 --- /dev/null +++ b/debian/_base/core/tdegames/debian/libtdegames4-trinity.install @@ -0,0 +1 @@ +/opt/trinity/lib/libtdegames.so.* diff --git a/debian/_base/core/tdenetwork/debian/control b/debian/_base/core/tdenetwork/debian/control index fc590c5fc..32c3fee3c 100644 --- a/debian/_base/core/tdenetwork/debian/control +++ b/debian/_base/core/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, valgrind [!armel !mips !mipsel !riscv64 !loong64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/debian/_base/core/tdewebdev/debian/control b/debian/_base/core/tdewebdev/debian/control index ef5a2b27b..54fdf8d23 100644 --- a/debian/_base/core/tdewebdev/debian/control +++ b/debian/_base/core/tdewebdev/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com> -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdewebdev-trinity (<< 4:14.0.0~) Breaks: kdewebdev-trinity (<< 4:14.0.0~) -Depends: quanta-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version}) +Depends: quanta-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}) Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version}) Description: web development apps from the official TDE release [Trinity] TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -166,25 +166,6 @@ Description: development files for Kommander [Trinity] This package is part of TDE, as a component of the TDE web development module. See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information. -Package: kxsldbg-trinity -Architecture: any -Section: text -Replaces: kxsldbg-trinity (<< 4:14.0.0~) -Breaks: kxsldbg-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Suggests: quanta-trinity, khelpcenter-trinity -Description: graphical XSLT debugger for TDE [Trinity] - KXSLDbg is a debugger for XSLT scripts. It includes a graphical user - interface as well as a text-based debugger. KXSLDbg can be run as a - standalone application or as an embedded TDE part. - . - XSLT is an XML language for defining transformations of XML files from - XML to some other arbitrary format, such as XML, HTML, plain text, etc., - using standard XSLT stylesheets. - . - This package is part of TDE, as a component of the TDE web development module. - See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information. - Package: tdewebdev-trinity-dbg Section: libdevel Architecture: any diff --git a/debian/_base/core/tdewebdev/debian/copyright b/debian/_base/core/tdewebdev/debian/copyright index 57d8c16ea..8747f1d3b 100644 --- a/debian/_base/core/tdewebdev/debian/copyright +++ b/debian/_base/core/tdewebdev/debian/copyright @@ -17,7 +17,6 @@ Upstream Authors: Kommander: Marc Britton <consume@optusnet.com.au>, Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>, Andras Mantia <amantia@kde.org> and Trolltech - KXSLDbg: Keith Isdale <k_isdale@tpg.com.au> Quanta Plus is not in any way affiliated with any commercial versions of Quanta. The primary coders from the original team left the GPL'd diff --git a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.README.Debian b/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.README.Debian deleted file mode 100644 index 447ce09a8..000000000 --- a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -KXSLDbg for Debian ------------------- - -This application provides documentation in a docbook format that the TDE -Help Centre can display. For HTML documentation that can be read in any -web browser, see the package tdewebdev-doc-html. - - -- Ben Burton <bab@debian.org>, Tue, 19 Oct 2004 09:09:06 +1000 - diff --git a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install b/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install deleted file mode 100644 index 319e555c2..000000000 --- a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install +++ /dev/null @@ -1,34 +0,0 @@ -debian/tmp/opt/trinity/bin/kxsldbg -debian/tmp/opt/trinity/bin/xsldbg -debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.la -debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.so -debian/tmp/opt/trinity/share/applications/tde/kxsldbg.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/xsldbg.desktop -debian/tmp/opt/trinity/share/apps/kxsldbg -debian/tmp/opt/trinity/share/apps/kxsldbgpart -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png -debian/tmp/opt/trinity/share/man/man1/kxsldbg.1 -debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop diff --git a/debian/_base/libraries/pytdeextensions/debian/rules b/debian/_base/libraries/pytdeextensions/debian/rules index 682076665..55a9a8f9b 100755 --- a/debian/_base/libraries/pytdeextensions/debian/rules +++ b/debian/_base/libraries/pytdeextensions/debian/rules @@ -1,22 +1,14 @@ #!/usr/bin/make -f -DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk -include /usr/share/cdbs/1/rules/utils.mk - 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 -DEB_PYTHON_INSTALL_ARGS_ALL += \ +export PYBUILD_INSTALL_ARGS += \ --install-clib=/opt/trinity/lib \ --install-cheaders=/opt/trinity/include -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include @@ -30,32 +22,8 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -install/pytdeextensions-trinity:: - # We have no idea if the built product is site-packages or dist-packages - cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" - rm -rf debian/tmp/usr/lib/python*/site-packages/ - - # install lintian overrides - install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \ - debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity - - # fix script-not-executable - find debian -type f -name '*.py' | xargs chmod 0755 - - # remove extra-license-file - find debian -type f -name 'COPYING' | xargs rm -f - - # remove byte-compiled file - find . -type f -name '*.py[co]' | xargs rm -f - -install/libpythonize0-trinity:: - # fix binary-or-shlib-defines-rpath - chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* - -clean:: - rm -rf build - rm -f doc/en/*html doc/en/*bz2 - rm -f install_log.txt +%: + dh $@ --buildsystem=pybuild - # remove byte-compiled file - find . -type f -name '*.py[co]' | xargs rm -f +override_dh_auto_clean: + -dh_auto_clean -O--buildsystem=pybuild diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_pre_base.sh index ec5aa1b54..082c47224 100755 --- a/debian/_buildscripts/local/00_extradeps.sh +++ b/debian/_buildscripts/local/00_pre_base.sh @@ -5,6 +5,9 @@ #---------------------------- set_log_start +build_module "metapackages/tde-cdbs" +build_module "dependencies/tde-cmake" + if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then echo -e "${CBrown}#### Use of pre-built extra dependency packages is currently configured. Nothing to do. ####\n${CNone}" echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME" diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh index 53f605d88..ed8c46d62 100755 --- a/debian/_buildscripts/local/01_base_01.sh +++ b/debian/_buildscripts/local/01_base_01.sh @@ -5,14 +5,15 @@ #---------------------------- set_log_start -build_module "metapackages/tde-cdbs" -build_module "dependencies/tde-cmake" build_module "dependencies/libr" build_module "dependencies/akode" build_module "dependencies/libart-lgpl" build_module "dependencies/libcaldav" build_module "dependencies/libcarddav" build_module "dependencies/tqt" +if [[ "$DEFAULT_REPO_BRANCH" == "r14.1.x" ]]; then + build_module "dependencies/tqtinterface" +fi build_module "dependencies/arts" build_module "dependencies/dbus-1-tqt" build_module "dependencies/tqca" diff --git a/debian/_buildscripts/local/09_apps_development.sh b/debian/_buildscripts/local/09_apps_development.sh index cb876661f..1d913e4f2 100755 --- a/debian/_buildscripts/local/09_apps_development.sh +++ b/debian/_buildscripts/local/09_apps_development.sh @@ -13,6 +13,7 @@ build_module "applications/development/ktechlab" build_module "applications/development/kxmleditor" build_module "applications/development/piklab" build_module "applications/development/tdesvn" +build_module "applications/development/tdexsldbg" build_module "applications/development/universal-indent-gui-tqt" set_log_end diff --git a/debian/_buildscripts/local/91_build_base.sh b/debian/_buildscripts/local/91_build_base.sh index b53ba9048..d83f9d544 100755 --- a/debian/_buildscripts/local/91_build_base.sh +++ b/debian/_buildscripts/local/91_build_base.sh @@ -1,8 +1,6 @@ #!/bin/bash -if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then - ./00_extradeps.sh -fi +./00_pre_base.sh ./01_base_01.sh ./02_base_02.sh ./03_base_03.sh diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt index 265205721..500435c09 100644 --- a/debian/_buildscripts/local/README.txt +++ b/debian/_buildscripts/local/README.txt @@ -11,19 +11,24 @@ A) Environment preparation -------------------------- 0) Initial notes - this guide has been prepared based on a clean debian testing netinstall system without any other DE. - It should work for other debian/ubuntu distros as well, but eventually you may run into small differences + It should work for other debian/devuan/ubuntu distros as well, but eventually you may run into small differences here and there. - you can change folder names below, as long as you update the "_config.sh" file accordingly. - you need to choose whether to use standard git repository clones or use git worktrees. Different instructions will be provided where necessary, based on the choice made. - - you need to choose whether to use standard git repository clones or use git worktrees. - Different instructions will be provided where necessary, based on the choice made. + - if you want to build a single module, you can choose to use prebuilt TDE packages to satisfy the missing + dependencies. More on this at point 8). - you need to choose whether to use pre built extra dependency packages or build them yourself. Different instructions will be provided where necessary, based on the choice made. More on this at point 9). -1) Install following packages: bc, cdbs, git, pbuilder, quilt, rsync and required dependencies. - NOTE: sudo should already be installed. If not, install sudo as well. +1) Install following packages: bc, build-essential, cdbs, debhelper, fakeroot, git, pbuilder, quilt, + rsync, sudo and required dependencies. + To build some python related packages, you will also need to install dh-python and python3-setuptools. + NOTE: + pytdeextensions requires some actions before you can build it (even in a clean environment) due to the current build scripts + used for it. You will need to first build tdelibs, pytqt and pytde, then install those packages on your system and then + you should be able to successfully build pytdeextensions. 2) Create a base folder for TDE, hereafter referred to as TDE_DIR (for example $HOME/tde_src) @@ -94,9 +99,14 @@ A) Environment preparation from your current setup. Otherwise the variables can be left empty and auto detection will be performed. * UPDATE_BRANCHES to the branches you want to keep updated from the main repositories. * DEFAULT_REPO_BRANCH to the branch to check out at the end of the repositories update process. + * USE_PREBUILD_PACKAGES to decide whether to use prebuilt TDE packages to safisty missing dependencies. + Setting this to "y" is useful if you intend to work on a specific module, because it allows you to + build it without having to previously build all the other TDE modules that it depends upon. + The prebuilt modules will be taken from the TDE prelimirary builds archive. -9) Some additional packages (referred to as extra dependencies) are required to build and install TDE in debian/devuan/ubuntu. - These modules can be built locally or alternatively pre-built binaries from the TDE archive can be used. +9) Some additional packages (referred to as extra dependencies) are required to build and install TDE in + debian/devuan/ubuntu. These modules can be built locally or alternatively pre-built binaries from the + TDE prelimirary builds archive can be used. 9.1) Using pre-built extra dependencies - open "_config.sh" and set the variable USE_PREBUILD_EXTRA_DEPS to "y" (this is the default initial setting) @@ -128,6 +138,9 @@ A) Environment preparation For example: deb [trusted=yes] file:/home/tde_src/3_repo buster main +11) Depending on your git version, you may have an error about a suspicious folder when trying to run the "create_repo.sh" script. + In such case follow the suggested command and add the "tde" folder to your git safe folders. + git config --global --add safe.directory TDE_DIR/1_git/tde ---------------------- @@ -193,18 +206,19 @@ When building sets of modules or the whole TDE, a global build summary is automa build_module.sh [options] [module_name] Options: -g (Git) : build from git repo sources. If missing, build from the local copy in build folder. - -l (Local) : build the module locally. If missing, build in a clean chroot environment - -p <folder> (Path): build from the specified folder. This option cannot be used together with -g. - The path must be a module in the git repository or in the local build folder. - This option is mostly intended to be used when using branches with git worktrees. + -l (Local) : build the module locally. If missing then + you should be able to successfully build pytdeextensions., build in a clean chroot environment + -p <folder> (Path): build from the specified folder. This option cannot be used together with -g. + The path must be a module in the git repository or in the local build folder. + This option is mostly intended to be used when using branches with git worktrees. -sl (Show Log) : output the building logs to terminal while the build is ongoing -lr (Log Result) : log (append) build result (OK, FAILED) to TDE_DIR/0_logs/build_result.log file -sh (Shell Hook) : use a shell hook for failing builds, only valid if building using pbuilder (clean chroot environment) -po (Prepare Only): only prepare the source folder but do not build the module. Useful to prepare the source code before doing local changes/development. The module can then be built from the modified local folder -d (Debug) : enable debug symbols if possible (debian/rules file must contain "RelWithDebInfo" for this to work) - module_name : the module to build. If '-p <folder>' is used, this parameter must not be specified since the module - is derived from the <folder> parameter. + module_name : the module to build. If '-p <folder>' is used, this parameter must not be specified since the module + is derived from the <folder> parameter. - <dd>_<set_name>.sh A number of scripts used to build sets of modules. Each script builds an individual set. @@ -216,11 +230,11 @@ When building sets of modules or the whole TDE, a global build summary is automa -s N: if specified, skip first N modules from the set of modules The sets are logically grouped as "base system", "applications" and "meta packages". - 00_extradeps.sh : extra dependencies modules + 00_pre_base.sh : prerequirements and extra dependencies modules 01_base_01.sh - 04_base_04.sh : base system 05_apps_system.sh - 16_apps_misc.sh : application modules 17_meta_packages.sh : meta package modules - 91_build_base.sh : whole TDE base system in 00_extradeps.sh - 04_base_04.sh + 91_build_base.sh : whole TDE base system in 00_pre_base.sh - 04_base_04.sh 92_build_applications.sh : all TDE applications in 05_apps_system.sh - 16_apps_misc.sh - 99_build_TDE.sh @@ -231,7 +245,7 @@ When building sets of modules or the whole TDE, a global build summary is automa - create_repo.sh Creates a local repository from the .deb files currently stored in TDE_DIR/2_build/debs. Usage: - [sudo] create_repo.sh [options] + sudo create_repo.sh [options] Options: -b (Backup) : create a backup of the existing repository in TDE_DIR/CFG_REPO_DIR.backup @@ -244,7 +258,6 @@ There are two type of hooks: To use a hook, create an executable script (pre_build.sh and/or post_build.sh) in the TDE_DIR/1_git/hooks/<MODULE NAME> folder. The scripts are executed in the build_module.sh environment, so have access to all the variables defined in that file. See the files in the "hook examples" folder for real usage samples. - ------------------------- C) How to use the scripts ------------------------- @@ -257,7 +270,7 @@ C) How to use the scripts 5) Build modules as per your needs. You don't need to use "sudo" directly since the scripts will do that automatically if required. Just type your sudo password when prompted to do so. 6) Create a local repository from the packages you have just built, to be used as installation repository. - [sudo] ./create_repo.sh + sudo ./create_repo.sh 7) Install TDE as you usually do. For example as follow: - sudo apt-get update - sudo aptitude install tdebase-trinity (for a minimalistic TDE environment) diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index efe932b93..7eff414db 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -45,25 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz" #-- select apt components case "$DISTRIBUTION" in # debian - sid|trixie|bookwork|bullseye|buster) + sid|forky|trixie|bookwork|bullseye) COMPONENTS="main contrib non-free" ;; # devuan - ceres|excalibur|daedalus|chimaera|beowulf) + ceres|excalibur|daedalus|chimaera) COMPONENTS="main" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring" ;; # ubuntu - oracular|noble|mantic|lunar|jammy|focal|bionic) + questing|plucky|oracular|noble|jammy|focal|bionic) COMPONENTS="main restricted universe multiverse" DEBOOTSTRAPOPTS=(--variant=buildd) ;; # raspbian - raspbian-trixie|raspbian-bookworm|raspbian-bullseye|raspbian-buster) + raspbian-trixie|raspbian-bookworm|raspbian-bullseye) COMPONENTS="main contrib non-free" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) ;; @@ -73,17 +73,17 @@ EXTRAPACKAGES="$EXTRAPACKAGES fakeroot apt-transport-https ca-certificates" #-- select base apt sources case "$DISTRIBUTION" in # debian - sid|trixie|bookwork|bullseye|buster) + sid|forky|trixie|bookwork|bullseye) MIRRORSITE=http://deb.debian.org/debian ;; # devuan - ceres|excalibur|daedalus|chimaera|beowulf) - MIRRORSITE=http://auto.mirror.devuan.org/merged + ceres|excalibur|daedalus|chimaera) + MIRRORSITE=https://pkgmaster.devuan.org/merged ;; # ubuntu - oracular|noble|mantic|lunar|jammy|focal|bionic) + questing|plucky|oracular|noble|jammy|focal|bionic) if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then MIRRORSITE=http://archive.ubuntu.com/ubuntu else @@ -92,7 +92,7 @@ case "$DISTRIBUTION" in ;; # raspbian - raspbian-trixie|raspbian-bookworm|raspbian-bullseye|raspbian-buster) + raspbian-trixie|raspbian-bookworm|raspbian-bullseye) MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian ;; esac @@ -118,4 +118,5 @@ if [ -z "$DEB_SIGN_KEYID" ]; then fi #-- dependency solver -PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" +#PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-classic" diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh index 515303ebe..09c80f2bf 100755 --- a/debian/_buildscripts/local/build_module.sh +++ b/debian/_buildscripts/local/build_module.sh @@ -69,56 +69,62 @@ function search_module() MODULE_FOUND="n" - # Check if it is a metapackage - LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^(metapackages/)?||"` - LOC_MATCH=`ls "$REPO_TDE_MAIN/metapackages" | grep "^$LOC_BASENAME\$"` - if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then - # Unique metapackage found - MODULE_FOUND="y" + # Check if it is a metapackage + LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^(metapackages/)?||"` + LOC_MATCH=`ls "$REPO_TDE_MAIN/metapackages" | grep "^$LOC_BASENAME\$"` + if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then + # Unique metapackage found + MODULE_FOUND="y" bool_METAPACKAGE_MOD="y" - MOD_NAME="metapackages/$LOC_MATCH" - MOD_GIT_PATH="$REPO_TDE_MAIN/metapackages/$LOC_BASENAME" - MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" - MOD_BUILD_PATH="$TDE_BUILD_DIR/metapackages/$LOC_BASENAME" - else - # Search for unique GIT repository - LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "$LOC_MOD_NAME$"` - if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then - # Unique module - MODULE_FOUND="y" - MOD_NAME=$LOC_MATCH - if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then - MOD_GIT_PATH="$MOD_PATH" - else - MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME" - fi - MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" - MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME" - else - # Search for a unique folder with the same name - if [ -d "${REPO_TDE_MAIN}/$LOC_MOD_NAME" ]; then - # Folder found - MODULE_FOUND="y" - MOD_NAME=$LOC_MOD_NAME - MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME" - MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" - MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME" - else - # Search in extra dependency folder - LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^${CFG_EXTRA_DEPS_DIR}/(debian/)?||"` - LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME\$"` - if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then - # Unique module found - MODULE_FOUND="y" - bool_EXTRADEP_MOD="y" - MOD_NAME="$CFG_EXTRA_DEPS_DIR/$LOC_MATCH" - MOD_GIT_PATH="$REPO_EXTRA_DEPENDENCIES/debian/$LOC_BASENAME" - MOD_BUILD_PATH="$TDE_BUILD_DIR/$CFG_EXTRA_DEPS_DIR/$LOC_BASENAME" - fi - fi - fi - fi - export MOD_BUILD_PATH + MOD_NAME="metapackages/$LOC_MATCH" + MOD_GIT_PATH="$REPO_TDE_MAIN/metapackages/$LOC_BASENAME" + MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" + MOD_BUILD_PATH="$TDE_BUILD_DIR/metapackages/$LOC_BASENAME" + else + # Search for unique GIT repository + if [[ "$str" == */* ]]; then + # Module name contains path too + LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "$LOC_MOD_NAME$"` + else + # Module name only, no path. Search for exact name match + LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "/$LOC_MOD_NAME$"` + fi + if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then + # Unique module + MODULE_FOUND="y" + MOD_NAME=$LOC_MATCH + if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then + MOD_GIT_PATH="$MOD_PATH" + else + MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME" + fi + MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" + MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME" + else + # Search for a unique folder with the same name + if [ -d "${REPO_TDE_MAIN}/$LOC_MOD_NAME" ]; then + # Folder found + MODULE_FOUND="y" + MOD_NAME=$LOC_MOD_NAME + MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME" + MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" + MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME" + else + # Search in extra dependency folder + LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^${CFG_EXTRA_DEPS_DIR}/(debian/)?||"` + LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME\$"` + if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then + # Unique module found + MODULE_FOUND="y" + bool_EXTRADEP_MOD="y" + MOD_NAME="$CFG_EXTRA_DEPS_DIR/$LOC_MATCH" + MOD_GIT_PATH="$REPO_EXTRA_DEPENDENCIES/debian/$LOC_BASENAME" + MOD_BUILD_PATH="$TDE_BUILD_DIR/$CFG_EXTRA_DEPS_DIR/$LOC_BASENAME" + fi + fi + fi + fi + export MOD_BUILD_PATH MOD_BUILD_PKGING_PATH="$MOD_BUILD_PATH/debian" IFS=$OLDIFS } @@ -153,15 +159,15 @@ while [ $# -gt 0 ]; do -lr) # Log build Result to file bool_LOG_RESULT="y" ;; - -p) # build from specific Path + -p) # build from specific Path if [ -z "$MOD_NAME" ]; then - shift + shift MOD_NAME="$1" - bool_BUILD_FROM_PATH="y" + bool_BUILD_FROM_PATH="y" else bool_INVALID_PARAMETERS="y" fi - ;; + ;; -po) # Prepare build folder Only but do not build bool_PREPARE_ONLY="y" ;; @@ -192,29 +198,29 @@ fi # If building from a given path, look up the module name if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then - if [ -d "${MOD_NAME}" ]; then - cd "${MOD_NAME}" - MOD_PATH=`pwd` - if [ "${USE_GIT_WORKTREES}" = "y" ]; then - MOD_NAME=`git rev-parse --git-dir 2>/dev/null | sed "s|.*/\([^\/]\+\)\.git.*|\1|"` - else - MOD_NAME=`basename "${MOD_PATH}"` - fi - if [ "${MOD_NAME}" != "" -a "${MOD_NAME}" != "tde" -a "${MOD_NAME}" != ".git" ]; then - # Valid git module - if [[ "${MOD_PATH}" =~ ${TDE_BUILD_DIR} ]]; then - # Module from build folder - bool_BUILD_FROM_GIT="n" - else - # Module from git repo - bool_BUILD_FROM_GIT="y" - fi - else - MOD_NAME="" - fi - else - MOD_NAME="" - fi + if [ -d "${MOD_NAME}" ]; then + cd "${MOD_NAME}" + MOD_PATH=`pwd` + if [ "${USE_GIT_WORKTREES}" = "y" ]; then + MOD_NAME=`git rev-parse --git-dir 2>/dev/null | sed "s|.*/\([^\/]\+\)\.git.*|\1|"` + else + MOD_NAME=`basename "${MOD_PATH}"` + fi + if [ "${MOD_NAME}" != "" -a "${MOD_NAME}" != "tde" -a "${MOD_NAME}" != ".git" ]; then + # Valid git module + if [[ "${MOD_PATH}" =~ ${TDE_BUILD_DIR} ]]; then + # Module from build folder + bool_BUILD_FROM_GIT="n" + else + # Module from git repo + bool_BUILD_FROM_GIT="y" + fi + else + MOD_NAME="" + fi + else + MOD_NAME="" + fi fi echo -e "${CLightCyan}#### Processing module \"$MOD_NAME\" ####${CNone}" @@ -270,14 +276,14 @@ done #---------------------------- # Check if module is an extra dependency if [[ $MOD_NAME =~ ^$CFG_EXTRA_DEPS_DIR/ ]]; then - bool_EXTRADEP_MOD="y" + bool_EXTRADEP_MOD="y" fi # Make sure the module exists search_module $MOD_NAME if [ "$MODULE_FOUND" != "y" ]; then - echo "Module \"$MOD_NAME\" not found" - do_exit 5 + echo "Module \"$MOD_NAME\" not found" + do_exit 5 fi if [ "$bool_BUILD_FROM_GIT" = "y" ]; then @@ -330,11 +336,11 @@ if [ "$bool_EXTRADEP_MOD" != "y" ]; then if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then pkgver=$pkgver~pre$count+$(git rev-parse HEAD | cut -c 1-8) fi - MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"` - if [[ -z "$MOD_BRANCH" ]]; then - MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` - fi - COMMIT_HASH=`git rev-parse HEAD` + MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"` + if [[ -z "$MOD_BRANCH" ]]; then + MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` + fi + COMMIT_HASH=`git rev-parse HEAD` fi # copy main repo source files, if needed @@ -377,17 +383,17 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then fi if [ "$bool_METAPACKAGE_MOD" = "y" ]; then cp -R "$MOD_GIT_PKGING_PATH/.." "$MOD_BUILD_PATH" - else + else cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH" - fi - if [[ -s "$MOD_BUILD_PKGING_PATH/patches/series" ]]; then - cd "$MOD_BUILD_PATH" - quilt push -a - # Make sure patches are not reapplied in future local builds. This could stop pdebuild from working. - if [ -f "$MOD_BUILD_PKGING_PATH/patches/series" ]; then - rm "$MOD_BUILD_PKGING_PATH/patches/series" - fi - fi + fi + if [[ -s "$MOD_BUILD_PKGING_PATH/patches/series" ]]; then + cd "$MOD_BUILD_PATH" + QUILT_PATCHES="debian/patches" quilt push -a + # Make sure patches are not reapplied in future local builds. This could stop pdebuild from working. + if [ -f "$MOD_BUILD_PKGING_PATH/patches/series" ]; then + rm "$MOD_BUILD_PKGING_PATH/patches/series" + fi + fi # Default package name package=$(basename $PWD)-trinity-$pkgver @@ -412,8 +418,18 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then ADD_REL=0 # Update changelog + cd $MOD_GIT_PATH REPO_DATE=`git log -1 --pretty=format:"%cd%n" --date=rfc` - GITUSER="$(git config --get user.name) <$(git config --get user.email)>" + GITUSERNAME="$(git config --get user.name)" + GITUSEREMAIL="$(git config --get user.email)" + if [ -z "$GITUSERNAME" ]; then + GITUSERNAME="anonymous" + fi + if [ -z "$GITUSEREMAIL" ]; then + GITUSEREMAIL="anonymous@anonymous.org" + fi + GITUSER="$GITUSERNAME <$GITUSEREMAIL>" + cd $MOD_BUILD_PATH echo "$PKG_NAME ($REL-0$DISTRO$DISTRO_VERSION.$ADD_REL+$PKG_REL) $DISTRO_NAME; urgency=low" > "$MOD_BUILD_PKGING_PATH/changelog" echo -e "\n * Automated git build\n\n -- $GITUSER $REPO_DATE\n" >> "$MOD_BUILD_PKGING_PATH/changelog" cat "$REPO_TDE_PACKAGING/$MOD_NAME/debian/changelog" >> "$MOD_BUILD_PKGING_PATH/changelog" diff --git a/debian/_buildscripts/local/create_repo.sh b/debian/_buildscripts/local/create_repo.sh index 222cb7740..524c4aecd 100755 --- a/debian/_buildscripts/local/create_repo.sh +++ b/debian/_buildscripts/local/create_repo.sh @@ -45,7 +45,7 @@ rsync -aHS --exclude="*/src/*.xz" --exclude="*/src/*.dsc" --exclude="*/src/*.cha # Create package index file echo -e "${CYellow}> Creating package index file${CNone}" cd "$REPO_DIR" -dpkg-scanpackages "./$ARCH_PATH" | gzip -9c > "./$ARCH_PATH/Packages.gz" +dpkg-scanpackages "./$ARCH_PATH" > "./$ARCH_PATH/Packages" #---------------------------- diff --git a/debian/_buildscripts/local/internals/_config_template.sh b/debian/_buildscripts/local/internals/_config_template.sh index 7c1e929c6..ff506273c 100644 --- a/debian/_buildscripts/local/internals/_config_template.sh +++ b/debian/_buildscripts/local/internals/_config_template.sh @@ -5,19 +5,24 @@ set -a #---------------------------- # Repo information #---------------------------- -TDE_DIR="" # TDE root folder -UPDATE_BRANCHES="master" # Space separated list. Available choices: master, r14.1.x +TDE_DIR="$HOME/tde_src" # TDE root folder + +USE_GIT_WORKTREES="n" # If == "y", use git worktrees. Need consistent cloned repository to start. +UPDATE_BRANCHES="master r14.1.x" # Space separated list of branches to update. If using git worktrees, + # this list contains the branches for which worktrees will be created. DEFAULT_REPO_BRANCH="master" # After update in completed, switch repo to this branch. Must be # one of the branches specified in UPDATE_BRANCHES #---------------------------- # Build information #---------------------------- -TDE_RELEASE="14.1.0" # TDE release number +TDE_RELEASE="14.2.0" # TDE release number DISTRO="" # Distro family (leave empty for auto-detection). For ex. debian DISTRO_NAME="" # Distro name of specific version (leave empty for auto-detection). For ex. buster ARCHITECTURE="" # Build for this architecture (leave empty for auto-detection). For ex. amd64 USE_PREBUILD_EXTRA_DEPS="y" # If == "y", use pre-built extra dependency packages +USE_PREBUILD_PACKAGES="n" # If == "y", use pre-built TDE packages to satisfy package dependencies + # This is useful to build individual packages without having to do a full TDE build BUILD_DEFAULT_OPTIONS="-g -lr" # Default building options (pbuilder) GPG_SIGN_KEYID="" # Use this GPG key to sign packages. If null, packages will not be signed diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh index b520a93af..f8056de82 100755 --- a/debian/_buildscripts/local/internals/_pbuilder.sh +++ b/debian/_buildscripts/local/internals/_pbuilder.sh @@ -1,5 +1,7 @@ #!/bin/bash +source "$SCRIPT_DIR/internals/prebuilt_pkg_paths.txt" + function run_pdebuild() { # pbuilder absolute paths @@ -37,7 +39,9 @@ function run_pdebuild() (cd "$TDE_DEBS_DIR"; apt-ftparchive packages . > Packages) echo "deb [trusted=yes] file:$TDE_DEBS_DIR ./" >> /etc/apt/sources.list END_D05_01 - if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then + + # -- prebuilt TDE packages + if [[ "$USE_PREBUILD_PACKAGES" = "y" ]]; then # Get building branch from .tdescminfo file if [[ -f "$MOD_BUILD_PATH/.tdescminfo" ]]; then BUILD_BRANCH=`sed -n -r "s/^Revision: ([^-]+)-.*/\1/p" "$MOD_BUILD_PATH/.tdescminfo"` @@ -51,25 +55,58 @@ echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.l END_D05_02 break fi - done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") + done <<< $(echo "$TDE_PREBUILT_PKGS" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") if [ "$bool_EDEPS_FOUND" != "y" ]; then # EDEPS repository not found, use default. This could happen when building from sub branches of the main package repo + while read l_branch l_repo l_component; do + if [ "$l_branch" = "default" ]; then + bool_EDEPS_FOUND="y" + cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK" +echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list +END_D05_03 + break + fi + done <<< $(echo "$TDE_PREBUILT_PKGS" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") + fi + IFS=$OLD_IFS + fi + fi + + # -- prebuilt extra dependencies + if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then + # Get building branch from .tdescminfo file + if [[ -f "$MOD_BUILD_PATH/.tdescminfo" ]]; then + BUILD_BRANCH=`sed -n -r "s/^Revision: ([^-]+)-.*/\1/p" "$MOD_BUILD_PATH/.tdescminfo"` + bool_EDEPS_FOUND="n" + OLD_IFS=$IFS && IFS=$' \t' while read l_branch l_repo l_component; do - if [ "$l_branch" = "default" ]; then + if [ "$l_branch" = "$BUILD_BRANCH" ]; then bool_EDEPS_FOUND="y" - cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK" + cat <<END_D05_04 >> "$PBUILDER_DEPS_HOOK" echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list -END_D05_03 +END_D05_04 break fi - done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") + done <<< $(echo "$TDE_PREBUILT_EDEPS" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") + if [ "$bool_EDEPS_FOUND" != "y" ]; then + # EDEPS repository not found, use default. This could happen when building from sub branches of the main package repo + while read l_branch l_repo l_component; do + if [ "$l_branch" = "default" ]; then + bool_EDEPS_FOUND="y" + cat <<END_D05_05 >> "$PBUILDER_DEPS_HOOK" +echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list +END_D05_05 + break + fi + done <<< $(echo "$TDE_PREBUILT_EDEPS" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") fi IFS=$OLD_IFS fi fi - cat <<END_D05_04 >> "$PBUILDER_DEPS_HOOK" + + cat <<END_D05_06 >> "$PBUILDER_DEPS_HOOK" apt-get update -END_D05_04 +END_D05_06 chmod a+x "$PBUILDER_DEPS_HOOK" # Build OPT_BUILD_PARALLEL="" diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt index ef1104eb9..440b8bd94 100644 --- a/debian/_buildscripts/local/internals/distro_list.txt +++ b/debian/_buildscripts/local/internals/distro_list.txt @@ -10,30 +10,28 @@ # # debian -debian 10.0 buster - - debian 11.0 bullseye - - debian 12.0 bookworm - - -debian 13.0 trixie ~a - -debian 14.0 sid ~b - +debian 13.0 trixie - - +debian 14.0 forky ~a - +debian 15.0 sid ~b - # devuan -devuan 3.0 beowulf - debian/buster devuan 4.0 chimaera - debian/bullseye devuan 5.0 daedalus - debian/bookwork devuan 6.0 excalibur ~a debian/trixie devuan 7.0 ceres ~b debian/sid # raspbian -raspbian 10.0 raspbian-buster - - raspbian 11.0 raspbian-bullseye - - raspbian 12.0 raspbian-bookworm - - -raspbian 13.0 raspbian-trixie ~a - +raspbian 13.0 raspbian-trixie - - # ubuntu ubuntu 18.04 bionic - - ubuntu 20.04 focal - - ubuntu 22.04 jammy - - -ubuntu 23.04 lunar - - -ubuntu 23.10 mantic - - ubuntu 24.04 noble - - -ubuntu 24.10 oracular ~a - +ubuntu 24.10 oracular - - +ubuntu 25.04 plucky - - +ubuntu 25.10 questing ~a - diff --git a/debian/_buildscripts/local/internals/extra_deps.txt b/debian/_buildscripts/local/internals/extra_deps.txt deleted file mode 100644 index 521b16d0c..000000000 --- a/debian/_buildscripts/local/internals/extra_deps.txt +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# List of repositories for extra dependency packages. -# The "default" repo will be used in case a match can't be found. -EDEPS_REPO=" - default http://mirror.ppa.trinitydesktop.org/trinity-testing deps - master http://mirror.ppa.trinitydesktop.org/trinity-testing deps - r14.1.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14 -" diff --git a/debian/_buildscripts/local/internals/prebuilt_pkg_paths.txt b/debian/_buildscripts/local/internals/prebuilt_pkg_paths.txt new file mode 100644 index 000000000..ca3063a40 --- /dev/null +++ b/debian/_buildscripts/local/internals/prebuilt_pkg_paths.txt @@ -0,0 +1,17 @@ +#!/bin/bash + +# List of repositories for TDE prebuilt packages. +# The "default" repo will be used in case a match can't be found. +TDE_PREBUILT_PKGS=" + default http://mirror.ppa.trinitydesktop.org/trinity-testing main + master http://mirror.ppa.trinitydesktop.org/trinity-testing main + r14.1.x http://mirror.ppa.trinitydesktop.org/trinity-sb main-r14 +" + +# List of repositories for extra dependency packages. +# The "default" repo will be used in case a match can't be found. +TDE_PREBUILT_EDEPS=" + default http://mirror.ppa.trinitydesktop.org/trinity-testing deps + master http://mirror.ppa.trinitydesktop.org/trinity-testing deps + r14.1.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14 +" |