Bug#982055: dia Debian package and bug #982055

2022-02-13 Thread Philippe SWARTVAGHER

Hello,

Thank you Nicolas for the set of patches, I applied (and understood!)
them. Indeed, they reduce the number of Lintian warnings :)

Le 15/01/2022 à 19:01, François Mazen a écrit :

By the way, do you use a VCS where we could get the WIP package and
eventually contribute? Salsa [1] is usually the way to go.


I created a repository on Salsa: https://salsa.debian.org/phsw/dia.

I made some trivial changes on top of Debian package currently in the
archive. Next steps will be to update the package to use the more recent
upstream code and continue some housekeeping tasks, such as ones
reported on https://tracker.debian.org/pkg/dia. And then I will be able
to start looking for a sponsor! :)

Philippe.



Bug#982055: dia Debian package and bug #982055

2022-01-15 Thread François Mazen
Hello Philippe and Nicolas,

I would be happy to help maintaining this package that I use regularly!
So feel free to ping me if help needed.

By the way, do you use a VCS where we could get the WIP package and
eventually contribute? Salsa [1] is usually the way to go.

Best Regards,
François

[1] : https://salsa.debian.org



signature.asc
Description: This is a digitally signed message part


Bug#982055: dia Debian package and bug #982055

2021-11-03 Thread Nicolas Boulenguez
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 
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   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  
+  * Use 32x32 menu icon from Mikael Hedin 
 (closes: #97062)
 
  -- Fredrik Hallenberg   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  
+  * Updated man page with patch from era eriksson 
 (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   Sat,  2 Jun 2001 17:42:56 +0200
-- 
2.30.2

>From 4ac1a6cdb091d041c837d0086831a79f62d82302 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez 
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..000
--- 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 
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..000
--- 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: