Bug#982055: dia Debian package and bug #982055
Hello.
The package seems to build in Debian/unstable.
A few trivial suggestions or updates are attached.
You should probably forward the existing debian/patches/* that are not
specific to Debian, and see if the upstream project is active.
Efforts to keep the Debian package alive in the long run only make
sense if someone volunteers to "maintain" the upstream project, at
least in a minimal sense: collect patches and produce releases.
>From 3f300d2d32259c7c3dcd3fda7bef44bc8bff717f Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:01:46 +0100
Subject: [PATCH 01/14] changelog: remove trailing whitespaces
---
debian/changelog | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c05df1c..9af88a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -929,14 +929,14 @@ dia (0.91-3) unstable; urgency=low
* Depend on libxslt (closes: #193972)
* Call 'sensible-browser' instead of netscape (closes: #193245)
* Fixed man page typo (closes: #186225)
-
+
-- Fredrik Hallenberg <hallon@debian.org> Sun, 23 Mar 2003 18:22:08 +0100
dia (0.91-2) unstable; urgency=low
* Removed gnome deps from non-gnome package.
* Don't try to open libxslt.so (closes: #185666)
- * Use 32x32 menu icon from Mikael Hedin <micce@debian.org>
+ * Use 32x32 menu icon from Mikael Hedin <micce@debian.org>
(closes: #97062)
-- Fredrik Hallenberg <hallon@debian.org> Thu, 20 Mar 2003 21:29:31 +0100
@@ -961,7 +961,7 @@ dia (0.90-1) unstable; urgency=low
dia (0.88.1-3) unstable; urgency=low
- * Updated man page with patch from era eriksson <era@iki.fi>
+ * Updated man page with patch from era eriksson <era@iki.fi>
(closes: #128410)
* Applied some stuff from CVS to fix segfault in tools menu
(closes: #127981)
@@ -978,7 +978,7 @@ dia (0.88.1-2) unstable; urgency=low
dia (0.88.1-1) unstable; urgency=low
- * New upstream release
+ * New upstream release
(closes: #82885, #89065, #94895, #95936, #98935, #97676, #99046)
-- Fredrik Hallenberg <hallon@debian.org> Sat, 2 Jun 2001 17:42:56 +0200
--
2.30.2
>From 4ac1a6cdb091d041c837d0086831a79f62d82302 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:03:01 +0100
Subject: [PATCH 02/14] Move desktop file from dia-common to dia
as required by the policy. If dia-common is installed without dia, the
end user will see a broken entry in desktop menus.
---
debian/control | 7 +++++--
debian/dia-common.install | 1 -
debian/dia-common.lintian-overrides | 2 --
debian/dia.install | 1 +
4 files changed, 6 insertions(+), 5 deletions(-)
delete mode 100644 debian/dia-common.lintian-overrides
diff --git a/debian/control b/debian/control
index 5f6cacf..703cf3b 100644
--- a/debian/control
+++ b/debian/control
@@ -46,8 +46,11 @@ Package: dia
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, dia-common (=${source:Version})
Recommends: gsfonts-x11, dia-shapes
-Breaks: dia-libs (<< 0.97.3+git20160904-1~)
-Replaces: dia-libs (<< 0.97.3+git20160904-1~)
+# usr/share/applications/dia.desktop has moved from dia-common to dia:
+Breaks: dia-libs (<< 0.97.3+git20160904-1~),
+ dia-common (<< 0.97.3+git20160930-10~),
+Replaces: dia-libs (<< 0.97.3+git20160904-1~),
+ dia-common (<< 0.97.3+git20160930-10~),
Description: Diagram editor
Dia is an editor for diagrams, graphs, charts etc. There is support for UML
static structure diagrams (class diagrams), Entity-Relationship diagrams,
diff --git a/debian/dia-common.install b/debian/dia-common.install
index 1096c4e..61f43e2 100644
--- a/debian/dia-common.install
+++ b/debian/dia-common.install
@@ -1,7 +1,6 @@
usr/share/doc/dia/*
usr/share/locale/*
usr/share/dia/*
-usr/share/applications/*
usr/share/icons/*
usr/share/mime-info/*
usr/share/thumbnailers/*
diff --git a/debian/dia-common.lintian-overrides b/debian/dia-common.lintian-overrides
deleted file mode 100644
index cf66778..0000000
--- a/debian/dia-common.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# "dia" is provided by binary package dia which is usually available if dia-common is installed
-dia-common: desktop-command-not-in-package usr/share/applications/dia.desktop dia
diff --git a/debian/dia.install b/debian/dia.install
index 341c1dd..23ad384 100644
--- a/debian/dia.install
+++ b/debian/dia.install
@@ -1,2 +1,3 @@
usr/bin/dia
usr/lib/*/dia/*.so
+usr/share/applications/dia.desktop
--
2.30.2
>From aaf2d7682e71fed5988cbde302c9eb4628a5fd68 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:04:38 +0100
Subject: [PATCH 03/14] Remove obsolete debian/*.dirs
---
debian/dia-common.dirs | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 debian/dia-common.dirs
diff --git a/debian/dia-common.dirs b/debian/dia-common.dirs
deleted file mode 100644
index 9c4f7a7..0000000
--- a/debian/dia-common.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/xml/dia
--
2.30.2
>From c0af0808075d8d068c100edd51885dd992eec0ac Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:11:51 +0100
Subject: [PATCH 04/14] control: explicit Rules-Requires-Root
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index 703cf3b..7463d1c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: autoconf,
Build-Conflicts: autoconf2.13,
dia-shapes
Homepage: https://wiki.gnome.org/Apps/Dia/
+Rules-Requires-Root: no
Package: dia-common
Architecture: all
--
2.30.2
>From 0ead036e55a73b78cd29996fc2934040ebcb40d5 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:12:23 +0100
Subject: [PATCH 05/14] copyright: HTTPS URL for copyright format
---
debian/copyright | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/copyright b/debian/copyright
index 1db2272..d47329a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: dia
Source: https://wiki.gnome.org/Apps/Dia/Download
--
2.30.2
>From 85b8c49201a7d96e1d92d115d17ece2621136a61 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:13:08 +0100
Subject: [PATCH 06/14] copyright: embed full GFDL-1.1
This version is not part of common-licenses anymore.
---
debian/copyright | 345 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 343 insertions(+), 2 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index d47329a..822f178 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -75,5 +75,346 @@ License: GFDL-NIV-1.1+
any later version published by the Free Software Foundation; with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
.
- On Debian systems, the complete text of the GNU Free Documentation
- License version 1.1 can be found in "/usr/share/common-licenses/GFDL".
+ GNU Free Documentation License
+ Version 1.1, March 2000
+ .
+ Copyright (C) 2000 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
+ written 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 that contains a
+ notice placed by the copyright holder saying it can be distributed
+ under the terms of this License. The "Document", below, refers to any
+ such manual or work. Any member of the public is a licensee, and is
+ addressed as "you".
+ .
+ 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. (For example, 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.
+ .
+ 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 "Transparent" copy of the Document means a machine-readable copy,
+ represented in a format whose specification is available to the
+ general public, whose contents can be viewed and edited directly and
+ 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 has been designed to thwart or discourage
+ subsequent modification by readers is not Transparent. 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 designed for human modification. Opaque formats include
+ PostScript, PDF, 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 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.
+ .
+ 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 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 publicly-accessible computer-network location containing a complete
+ Transparent copy of the Document, free of added material, which the
+ general network-using public has access to download anonymously at no
+ charge using public-standard network protocols. 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 less than five).
+ 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", and 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. In any section entitled "Acknowledgements" or "Dedications",
+ preserve the section's title, 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 as "Endorsements"
+ or to conflict in title with any Invariant Section.
+ .
+ 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.
+ .
+ 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, does not as a whole count as a Modified Version
+ of the Document, provided no compilation copyright is claimed for the
+ compilation. Such a compilation is called an "aggregate", and this
+ License does not apply to the other self-contained works thus compiled
+ with the Document, on account of their being thus compiled, if they
+ 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 quarter
+ of the entire aggregate, the Document's Cover Texts may be placed on
+ covers that surround only the Document within the aggregate.
+ Otherwise they must appear on covers around 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 provided that you also include the
+ original English version of this License. In case of a disagreement
+ between the translation and the original English version of this
+ License, the original English version will prevail.
+ .
+ 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
+ https://www.gnu.org/licenses/.
+ .
+ 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.1
+ or any later version published by the Free Software Foundation;
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ .
+ If you have no Invariant Sections, write "with no Invariant Sections"
+ instead of saying which ones are invariant. If you have no
+ Front-Cover Texts, write "no Front-Cover Texts" instead of
+ "Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
+ .
+ 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.
--
2.30.2
>From 6a0a8ecbf41ca0f15333178eab2e596f4bb104ab Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:14:26 +0100
Subject: [PATCH 07/14] rules: remove explicit --as-needed
This has been the default in Debian/Ubuntu for a while now.
---
debian/rules | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 0cc5d05..e0ea714 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
--
2.30.2
>From df250e29062d7dd535b01774e62e55043dafd75a Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:15:29 +0100
Subject: [PATCH 08/14] rules: include buildflags.mk
This is recommended, so that debian/rules may be called directly on
the command line (in which case the build flags are not exported yet).
---
debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index e0ea714..428c67a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
+DEB_BUILD_MAINT_OPTIONS := hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
%:
dh $@
--
2.30.2
>From 7f2b370686e73148595a139ff7b5b5366760c157 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Tue, 2 Nov 2021 13:27:20 +0100
Subject: [PATCH 09/14] remove shlibs:Depends for dia-common
which will never contain a shared library.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 7463d1c..8d56bcd 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Rules-Requires-Root: no
Package: dia-common
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
Recommends: dia
Description: Diagram editor (common files)
Dia is an editor for diagrams, graphs, charts etc. There is support for UML
--
2.30.2
>From aefd80dc1844e389cc6ba8cfcd665af10db263c4 Mon Sep 17 00:00:00 2001
From: arriott NZ <marriott99@gmx.com>
Date: Mon, 1 Nov 2021 13:56:46 +0100
Subject: [PATCH 10/14] mime: stop quoting %s placeholder. Closes: #987402
See https://lintian.debian.org/tags/quoted-placeholder-in-mailcap-entry.html
---
debian/dia.mime | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/dia.mime b/debian/dia.mime
index 305011f..610f1a1 100644
--- a/debian/dia.mime
+++ b/debian/dia.mime
@@ -1 +1 @@
-application/x-dia-diagram; dia '%s'; description="DIA diagram"; test=test -n "$DISPLAY"; nametemplate=%s.dia
+application/x-dia-diagram; dia %s; description="DIA diagram"; test=test -n "$DISPLAY"; nametemplate=%s.dia
--
2.30.2
>From 6fca96a678b59bafd3448b38b51e5dc0a7c9ee5a Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:27:04 +0100
Subject: [PATCH 11/14] Switch to debhelper 13
Use upstream install system as much as possible, then dispatch among
*.docs *.examples *.install not-installed.
This is easyer to understand and maintaini than patches or removals.
For example, usr/share/doc/dia/de/examples/*.dtd were unwantedly
installed, and the usr/share/doc/dia/html/C symbolic link was also
probably unwanted.
dh now accepts dh_installxmlcatalogs as a plugin.
dh now calls libtoolize/autoreconf/intltoolize by default.
dh_compress does not compress examples anymore.
---
debian/compat | 1 -
debian/control | 2 +-
debian/dia-common.install | 6 +-
debian/dia.install | 2 +-
debian/not-installed | 11 +++
.../patches/remove-dtds-from-examples.patch | 68 -------------------
debian/patches/series | 1 -
debian/rules | 34 ++--------
8 files changed, 24 insertions(+), 101 deletions(-)
delete mode 100644 debian/compat
create mode 100644 debian/not-installed
delete mode 100644 debian/patches/remove-dtds-from-examples.patch
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 8d56bcd..caeda10 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 4.5.0
Build-Depends: autoconf,
automake,
dblatex,
- debhelper (>= 10),
+ debhelper-compat (= 13),
docbook-xml,
docbook-xsl,
intltool,
diff --git a/debian/dia-common.install b/debian/dia-common.install
index 61f43e2..1f65387 100644
--- a/debian/dia-common.install
+++ b/debian/dia-common.install
@@ -1,4 +1,8 @@
-usr/share/doc/dia/*
+usr/share/doc/dia/??/dia.pdf
+usr/share/doc/dia/html/??/*.html
+usr/share/doc/dia/html/??/css
+usr/share/doc/dia/html/??/graphics
+usr/share/doc/dia/html/??/images
usr/share/locale/*
usr/share/dia/*
usr/share/icons/*
diff --git a/debian/dia.install b/debian/dia.install
index 23ad384..4dcc2ae 100644
--- a/debian/dia.install
+++ b/debian/dia.install
@@ -1,3 +1,3 @@
usr/bin/dia
-usr/lib/*/dia/*.so
+usr/lib/${DEB_HOST_MULTIARCH}/dia/lib*.so
usr/share/applications/dia.desktop
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..3a49e43
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,11 @@
+usr/lib/${DEB_HOST_MULTIARCH}/dia/lib*.la
+
+# Remove links in doc dir:
+usr/share/doc/dia/html/C
+usr/share/doc/dia/html/??/??
+
+# By default, dia installs dtds duplicated in several language's example/
+# documentation directories. This is not necessary for Debian (installing
+# DTDs in standard catalog registration locations). Therefore removing.
+# Roland Stigge <stigge@antcom.de>
+usr/share/doc/dia/??/examples/*.dtd
diff --git a/debian/patches/remove-dtds-from-examples.patch b/debian/patches/remove-dtds-from-examples.patch
deleted file mode 100644
index ab4eb91..0000000
--- a/debian/patches/remove-dtds-from-examples.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Remove DTDs from examples
- By default, dia installs dtds duplicated in several language's example/
- documentation directories. This is not necessary for Debian (installing
- DTDs in standard catalog registration locations). Therefore removing.
-Author: Roland Stigge <stigge@antcom.de>
-
-Index: dia-0.97.3+git20160930/doc/eu/Makefile.am
-===================================================================
---- dia-0.97.3+git20160930.orig/doc/eu/Makefile.am
-+++ dia-0.97.3+git20160930/doc/eu/Makefile.am
-@@ -72,11 +72,6 @@ metadata = \
- dia-eu.omf \
- topic.dat
-
--examples = \
-- ../shape.dtd \
-- ../diagram.dtd \
-- ../sheet.dtd
--
- ## $(progname).$(progfiles_extension)
-
- DISTCLEANFILES =
-Index: dia-0.97.3+git20160930/doc/en/Makefile.am
-===================================================================
---- dia-0.97.3+git20160930.orig/doc/en/Makefile.am
-+++ dia-0.97.3+git20160930/doc/en/Makefile.am
-@@ -154,11 +154,6 @@ metadata = \
- dia-C.omf \
- topic.dat
-
--examples = \
-- ../shape.dtd \
-- ../diagram.dtd \
-- ../sheet.dtd
--
-
- DISTCLEANFILES =
-
-Index: dia-0.97.3+git20160930/doc/pl/Makefile.am
-===================================================================
---- dia-0.97.3+git20160930.orig/doc/pl/Makefile.am
-+++ dia-0.97.3+git20160930/doc/pl/Makefile.am
-@@ -73,10 +73,6 @@ metadata = \
- dia-pl.omf \
- topic.dat
-
--examples = \
-- ../shape.dtd \
-- ../diagram.dtd \
-- ../sheet.dtd
-
- ## $(progname).$(progfiles_extension) \
-
-Index: dia-0.97.3+git20160930/doc/fr/Makefile.am
-===================================================================
---- dia-0.97.3+git20160930.orig/doc/fr/Makefile.am
-+++ dia-0.97.3+git20160930/doc/fr/Makefile.am
-@@ -76,10 +76,6 @@ metadata = \
- dia-fr.omf \
- topic.dat
-
--examples = \
-- ../shape.dtd \
-- ../diagram.dtd \
-- ../sheet.dtd
-
- DISTCLEANFILES =
-
diff --git a/debian/patches/series b/debian/patches/series
index 98c856b..f8d155e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ fix-manpages.patch
fix-makefile.patch
add-thumbnailer.patch
remove-backup-files.patch
-remove-dtds-from-examples.patch
errors-to-stderr.patch
fix-cast-warnings.patch
fix-fr-po.patch
diff --git a/debian/rules b/debian/rules
index 428c67a..14bdfc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,43 +8,21 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
%:
- dh $@
+ dh $@ --with xml-core
override_dh_auto_configure:
- libtoolize --copy --force
- autoreconf -fi
- intltoolize
dh_auto_configure -- --with-cairo --with-hardbooks
-override_dh_auto_build:
+execute_before_dh_auto_build:
# docbook-xsl source for referenced pngs
ln -s /usr/share/xml/docbook/stylesheet/docbook-xsl doc/html
- dh_auto_build
override_dh_auto_install:
dh_auto_install --no-parallel
- $(MAKE) -C doc install-html DESTDIR=$(CURDIR)/debian/dia-common
- # remove links in doc dir: en, fr, pl, eu, de
- rm debian/tmp/usr/share/doc/dia/html/en/en
- rm debian/tmp/usr/share/doc/dia/html/fr/fr
- rm debian/tmp/usr/share/doc/dia/html/eu/eu
- rm debian/tmp/usr/share/doc/dia/html/pl/pl
- rm debian/tmp/usr/share/doc/dia/html/de/de
- rm -rf debian/tmp/usr/share/doc/dia/en/examples/
- rm -rf debian/tmp/usr/share/doc/dia/eu/examples/
- rm -rf debian/tmp/usr/share/doc/dia/fr/examples/
- rm -rf debian/tmp/usr/share/doc/dia/pl/examples/
-
-override_dh_auto_clean:
- dh_auto_clean
+ $(MAKE) -C doc install-html DESTDIR=$(CURDIR)/debian/tmp
+
+execute_after_dh_clean:
-find . -name 'Makefile.in' | xargs rm -f
override_dh_compress:
- dh_compress -X.dia -X.pdf
-
-override_dh_installcatalogs:
- dh_installcatalogs
- # Workaround as long as dh_installxmlcatalogs is not integrated in dh (#575770)
- dh_installxmlcatalogs
- # Workaround for #611418 leaving /etc/xml around
- rm -rf debian/dia-common/etc
+ dh_compress -X.pdf
--
2.30.2
>From f87f69cd73740c08e772a1aafdf5b63dbd2b9bca Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:32:38 +0100
Subject: [PATCH 12/14] rules: trivial optimisation
Make find silent when no match is found, but report unexpected errors.
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 14bdfc7..d035bc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_install:
$(MAKE) -C doc install-html DESTDIR=$(CURDIR)/debian/tmp
execute_after_dh_clean:
- -find . -name 'Makefile.in' | xargs rm -f
+ find . -name Makefile.in -delete
override_dh_compress:
dh_compress -X.pdf
--
2.30.2
>From 8f1f8eea1a10cfc27987b94ecd3cee781b05ca27 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Mon, 1 Nov 2021 13:34:35 +0100
Subject: [PATCH 13/14] rules: only create the docbook symlink once
Second attempt would fail.
---
debian/rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index d035bc6..4982e56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ include /usr/share/dpkg/buildflags.mk
override_dh_auto_configure:
dh_auto_configure -- --with-cairo --with-hardbooks
-execute_before_dh_auto_build:
+execute_before_dh_auto_build: doc/html/docbook-xsl
+doc/html/docbook-xsl:
# docbook-xsl source for referenced pngs
ln -s /usr/share/xml/docbook/stylesheet/docbook-xsl doc/html
--
2.30.2
>From 3b19430ba703d05affec6da59aded68030184191 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Tue, 2 Nov 2021 16:26:41 +0100
Subject: [PATCH 14/14] Style: format and order some debhelper files
---
debian/dia-common.doc-base | 1 -
debian/dia-common.docs | 4 ++--
debian/dia-common.install | 14 +++++++-------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/debian/dia-common.doc-base b/debian/dia-common.doc-base
index 590adc8..24431aa 100644
--- a/debian/dia-common.doc-base
+++ b/debian/dia-common.doc-base
@@ -8,4 +8,3 @@ Section: Graphics
Format: HTML
Index: /usr/share/doc/dia/html/en/index.html
Files: /usr/share/doc/dia/html/en/*.html
-
diff --git a/debian/dia-common.docs b/debian/dia-common.docs
index 178973a..e04d4c3 100644
--- a/debian/dia-common.docs
+++ b/debian/dia-common.docs
@@ -1,5 +1,5 @@
-doc/custom-shapes
+AUTHORS
NEWS
README
TODO
-AUTHORS
+doc/custom-shapes
diff --git a/debian/dia-common.install b/debian/dia-common.install
index 1f65387..6d45cc2 100644
--- a/debian/dia-common.install
+++ b/debian/dia-common.install
@@ -1,12 +1,12 @@
+doc/*.dtd usr/share/xml/dia
+usr/share/dia
usr/share/doc/dia/??/dia.pdf
usr/share/doc/dia/html/??/*.html
usr/share/doc/dia/html/??/css
usr/share/doc/dia/html/??/graphics
usr/share/doc/dia/html/??/images
-usr/share/locale/*
-usr/share/dia/*
-usr/share/icons/*
-usr/share/mime-info/*
-usr/share/thumbnailers/*
-usr/share/man/*
-doc/*.dtd usr/share/xml/dia
+usr/share/icons
+usr/share/locale
+usr/share/man
+usr/share/mime-info
+usr/share/thumbnailers
--
2.30.2
Reply to: