-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi,

Please apply attached patches that updates the lintian.d.o metapackage.

The first patch is a bit noisy but I hope it will make it easier for
us to keep the dependency list in sync.  Indeed, it helped me to
identify 4 redundant packages and 1 missing packages.

The second patch adds scour, which I intend to use to optimize the SVG
files on lintian.d.o.  With that tool, we can expect to save about 40%
on the disk usage of the SVGs (~11MB in total out of 31MB) and it will
hopefully also reduce the bandwidth used as well.

Thanks,
~Niels
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEsxMaRR2/33ygW0GXBUu7n32AZEIFAlp2/0QACgkQBUu7n32A
ZELdnA/+NWnRIAzM22md6fU9RuXiWpypWKvIwBTSDBpwecLFisGYksgdM1Mta5dg
tHg0e9YiPmFfhz9JkuGxWtBaNXfpZVZuEdQtL4EQJs6DNclfSgs4xBqS7v77u0A1
dA+4hNNl9GZZbTK7bQtNC3X+TkEYN7RM69VM0DSWSdqnyMuTMrh/Y08g85SEl+iK
GLpHjKUNX+zFrHKLf/lrRYwC+9A65cIJAVtytblEUTEt3yp00F+OqzulmkWmCWAy
9xc0eIx4JwONf3RRwva+dsjXKfFwNkl1r0lz8oeTiAN/VgfGY5BVRUCT2AzyRML4
IRS2Nj12x5JoufTo1YJPEejAdcjQTDkdSj4gZOevgyFkMMdA/hGkcsvqq/OE9/nP
uCBhz13bsjik1RZMyoTEGqYNnXeSQkbWIemvjhbpcvoP21T9fd/Dg7iOH603YIXD
9j3B32GOQfa+HGItrb43ZVDZT6KR6nqHOBudOjRSykkgR5FvRzDZ9HP1rAJ4QYzE
yRqlioYiUxx+sK8SeYmPRvyZmvNgCkicqc5KhONEaXBQq+50j4YVdmT5hrF4OwBC
o7gmYiqfHaB1jTnICrj047gM4vjk2q+sCaPZu1DN8t3ERX2VSSq654g12mG76AFt
e3PbOJ3M2PbCWMYU5sJ+xNIzYfq0V02Zq6PO301UfGs8tU3yGlA=
=pWSf
-----END PGP SIGNATURE-----
From 21f96310a7c62b4924632a21a22a5a8c9ef035ba Mon Sep 17 00:00:00 2001
From: Niels Thykier <ni...@thykier.net>
Date: Sun, 4 Feb 2018 12:26:50 +0000
Subject: [PATCH 1/2] lintian.d.o: Reorder and sync dependencies

Group the dependencies so it is easier to tell *why* lintian.d.o needs
a particular package.  Going through this list also found that four of
the dependencies should now be obsolete and we were missing xz-utils.

Signed-off-by: Niels Thykier <ni...@thykier.net>
---
 debian/changelog |  6 ++++++
 debian/control   | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ecffa1..f66bff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,12 @@ debian.org (65) UNRELEASED; urgency=medium
 
   [ Niels Thykier ]
   * release.debian.org: Add python3-sphinx
+  * lintian.debian.org: Reorder and sync dependency list:
+    - fakeroot
+    - locales
+    - perl (>= 5.14~) | libautodie-perl (>= 2.10~)
+    - unzip
+    + xz-utils
 
   [ Julien Cristau ]
   * ftp-master.d.o:
diff --git a/debian/control b/debian/control
index 168d2d5..477a4e3 100644
--- a/debian/control
+++ b/debian/control
@@ -729,16 +729,15 @@ Description: metapackages for women.debian.org dependencies
 
 Package: debian.org-lintian.debian.org
 Architecture: all
-Depends:   binutils,
+Depends:
+# lintian's runtime dependencies
+	binutils,
 	binutils-multiarch,
 	bzip2,
 	diffstat,
 	dpkg-dev,
-	debhelper,
-	fakeroot,
 	file,
 	gettext,
-	gnuplot-nox | gnuplot,
 	intltool-debian,
 	libapt-pkg-perl,
 	libarchive-zip-perl,
@@ -753,22 +752,22 @@ Depends:   binutils,
 	liblist-moreutils-perl,
 	libparse-debianchangelog-perl,
 	libperlio-gzip-perl,
-	libtimedate-perl,
 	libtext-levenshtein-perl,
-	libtext-template-perl,
+	libtimedate-perl,
 	liburi-perl,
 	libyaml-libyaml-perl,
 	libxml-simple-perl,
-	locales,
 	man-db,
 	perl,
-	perl (>= 5.14~) | libautodie-perl (>= 2.10~),
 	t1utils,
-	unzip
-	,
+	xz-utils,
+# Needed for the "clean" + "rebuild-lintian.debian.org" targets (beyond the above)
+	debhelper,
 	docbook-utils,
-	docbook-xml
-	,
+	docbook-xml,
+# Needed for the reporting framework (beyond the above)
+	gnuplot-nox | gnuplot,
+	libtext-template-perl,
 Description: metapackages for lintian.debian.org dependencies
  This package depends on everything that is needed for lintian.debian.org.
 
-- 
2.15.1

From f8b9ec65072e5297d34a4be4222ae105705c1258 Mon Sep 17 00:00:00 2001
From: Niels Thykier <ni...@thykier.net>
Date: Sun, 4 Feb 2018 12:29:59 +0000
Subject: [PATCH 2/2] lintian.d.o: Add scour dependencies to optimize generated
 svg files

Add scour dependency to optimize the generated svg files on
lintian.d.o.  Quick tests suggests that the files can be easily be
reduced by about 40% with scour.

The "scour | python-scour (<< 0.36-2~)" dependency is to be forward
compatible with buster, where the scour binary moves to its own
"scour" package (from python-scour).

Signed-off-by: Niels Thykier <ni...@thykier.net>
---
 debian/changelog | 3 ++-
 debian/control   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f66bff0..b078476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,12 @@ debian.org (65) UNRELEASED; urgency=medium
 
   [ Niels Thykier ]
   * release.debian.org: Add python3-sphinx
-  * lintian.debian.org: Reorder and sync dependency list:
+  * lintian.debian.org: Reorder and update dependency list:
     - fakeroot
     - locales
     - perl (>= 5.14~) | libautodie-perl (>= 2.10~)
     - unzip
+    + scour | python-scour (<< 0.36-2~)
     + xz-utils
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 477a4e3..66a3e3f 100644
--- a/debian/control
+++ b/debian/control
@@ -768,6 +768,7 @@ Depends:
 # Needed for the reporting framework (beyond the above)
 	gnuplot-nox | gnuplot,
 	libtext-template-perl,
+	scour | python-scour (<< 0.36-2~)
 Description: metapackages for lintian.debian.org dependencies
  This package depends on everything that is needed for lintian.debian.org.
 
-- 
2.15.1

Attachment: 0001-lintian.d.o-Reorder-and-sync-dependencies.patch.sig
Description: PGP signature

Attachment: 0002-lintian.d.o-Add-scour-dependencies-to-optimize-gener.patch.sig
Description: PGP signature

Reply via email to