Bug#806634: Please split Deps and Build-Deps onto single lines

2016-05-20 Thread Guido Günther 
Hi Mike,

On Sun, Nov 29, 2015 at 05:42:14PM +0100, Guido Günther wrote:
> Source: nss
> Version: 2:3.21-1
> Severity: wishlist
> Tags: patch
> 
> Hi,
> as discussed on the debian-lts list I'm currently looking into using the
> same nss version in all currently supporte suites. To ease backporting
> it would be great to have the build-deps split as in the attached patch
> so it's easy to see in the diff what versions where changed.
> 
> I have a temporary repo at:
> 
> https://github.com/agx/nss-debian
> 
> in case you prefer to cherry-pick.

Attached is an updated version. I've also updated the above repo. I'd be
great if this change could make it in. I'm a member of pkg-mozilla so
I'm happy to apply this patch if it's fine with you.

I'm also happy to use wrap-and-sort instead aus Laurent suggested.

Cheers,
 -- Guido
>From 5d16662464acc5996715e969cca2838143e9afa7 Mon Sep 17 00:00:00 2001
Message-Id: <5d16662464acc5996715e969cca2838143e9afa7.1463752998.git@sigxcpu.org>
From: =?UTF-8?q?Guido=20G=C3=BCnther?= 
Date: Sat, 28 Nov 2015 15:40:02 +0100
Subject: [PATCH] Put each {build,}-dependency onto a single line

This eases diffing when backporting
---
 debian/control | 28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 3fc0957..add503e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,12 @@ Section: libs
 Priority: optional
 Maintainer: Maintainers of Mozilla-related packages 
 Uploaders: Mike Hommey 
-Build-Depends: debhelper (>= 9.20160403), dpkg-dev (>= 1.17.14), libnspr4-dev (>= 2:4.12), zlib1g-dev, libsqlite3-dev (>= 3.3.9), libnss3-tools:native (>= 2:3.19-1-1~) 
+Build-Depends: debhelper (>= 9.20160403),
+ dpkg-dev (>= 1.17.14),
+ libnspr4-dev (>= 2:4.12),
+ zlib1g-dev,
+ libsqlite3-dev (>= 3.3.9),
+ libnss3-tools:native (>= 2:3.19-1-1~) 
 Standards-Version: 3.9.6.0
 Homepage: http://www.mozilla.org/projects/security/pki/nss/
 Vcs-Git: https://anonscm.debian.org/git/pkg-mozilla/nss.git
@@ -12,7 +17,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mozilla/nss.git
 Package: libnss3
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
 Conflicts: libnss3-1d (<< 2:3.13.4-2)
 Multi-Arch: ${misc:Multi-Arch}
 Description: Network Security Service libraries
@@ -26,7 +32,8 @@ Section: oldlibs
 Priority: extra
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libnss3 (= ${binary:Version}), ${misc:Depends}
+Depends: libnss3 (= ${binary:Version}),
+ ${misc:Depends}
 Multi-Arch: ${misc:Multi-Arch}
 Description: Network Security Service libraries - transitional package
  This is a transitional package to ensure smooth transition of all packages
@@ -35,7 +42,8 @@ Description: Network Security Service libraries - transitional package
 Package: libnss3-tools
 Section: admin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
 Description: Network Security Service tools
  This is a set of tools on top of the Network Security Service libraries.
  This package includes:
@@ -53,7 +61,9 @@ Homepage: http://www.mozilla.org/projects/security/pki/nss/tools/
 Package: libnss3-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libnss3 (= ${binary:Version}), libnspr4-dev (>= 4.6.6-1)
+Depends: ${misc:Depends},
+ libnss3 (= ${binary:Version}),
+ libnspr4-dev (>= 4.6.6-1)
 Multi-Arch: ${misc:Multi-Arch}
 Description: Development files for the Network Security Service libraries
  This is a set of libraries designed to support cross-platform development
@@ -68,8 +78,12 @@ Package: libnss3-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, libnss3 (= ${binary:Version}) | libnss3-tools (= ${binary:Version})
-Conflicts: libnss3 (<< ${binary:Version}), libnss3 (>> ${binary:Version}), libnss3-tools (<< ${binary:Version}), libnss3-tools (>> ${binary:Version})
+Depends: ${misc:Depends},
+ libnss3 (= ${binary:Version}) | libnss3-tools (= ${binary:Version})
+Conflicts: libnss3 (<< ${binary:Version}),
+ libnss3 (>> ${binary:Version}),
+ libnss3-tools (<< ${binary:Version}),
+ libnss3-tools (>> ${binary:Version})
 Provides: libnss3-1d-dbg
 Multi-Arch: ${misc:Multi-Arch}
 Description: Debugging symbols for the Network Security Service libraries
-- 
2.8.0.rc3

Bug#806634: Please split Deps and Build-Deps onto single lines

2016-04-19 Thread Laurent Bigonville 

You could also run the wrap-and-sort script.

Bug#806634: Please split Deps and Build-Deps onto single lines

2015-11-29 Thread Guido Günther 
Source: nss
Version: 2:3.21-1
Severity: wishlist
Tags: patch

Hi,
as discussed on the debian-lts list I'm currently looking into using the
same nss version in all currently supporte suites. To ease backporting
it would be great to have the build-deps split as in the attached patch
so it's easy to see in the diff what versions where changed.

I have a temporary repo at:

https://github.com/agx/nss-debian

in case you prefer to cherry-pick.

Cheers,
 -- Guido
>From e1944bf1aae1a3f7626ee76c7d3b2e6d4991cb05 Mon Sep 17 00:00:00 2001
Message-Id: 
From: =?UTF-8?q?Guido=20G=C3=BCnther?= 
Date: Sat, 28 Nov 2015 15:40:02 +0100
Subject: [PATCH] Put each {build,}-dependency onto a single line

This eases diffing when backporting
---
 debian/control | 28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 498452e..9783672 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,12 @@ Section: libs
 Priority: optional
 Maintainer: Maintainers of Mozilla-related packages 
 Uploaders: Mike Hommey 
-Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), libnspr4-dev (>= 2:4.9.4), zlib1g-dev, libsqlite3-dev (>= 3.3.9), libnss3-tools:native (>= 2:3.19-1-1~) 
+Build-Depends: debhelper (>= 9.20141010),
+ dpkg-dev (>= 1.17.14),
+ libnspr4-dev (>= 2:4.9.4),
+ zlib1g-dev,
+ libsqlite3-dev (>= 3.3.9),
+ libnss3-tools:native (>= 2:3.19-1-1~) 
 Standards-Version: 3.9.6.0
 Homepage: http://www.mozilla.org/projects/security/pki/nss/
 Vcs-Git: https://anonscm.debian.org/git/pkg-mozilla/nss.git
@@ -12,7 +17,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mozilla/nss.git
 Package: libnss3
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
 Conflicts: libnss3-1d (<< 2:3.13.4-2)
 Multi-Arch: ${misc:Multi-Arch}
 Description: Network Security Service libraries
@@ -26,7 +32,8 @@ Section: oldlibs
 Priority: extra
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libnss3 (= ${binary:Version}), ${misc:Depends}
+Depends: libnss3 (= ${binary:Version}),
+ ${misc:Depends}
 Multi-Arch: ${misc:Multi-Arch}
 Description: Network Security Service libraries - transitional package
  This is a transitional package to ensure smooth transition of all packages
@@ -35,7 +42,8 @@ Description: Network Security Service libraries - transitional package
 Package: libnss3-tools
 Section: admin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
 Description: Network Security Service tools
  This is a set of tools on top of the Network Security Service libraries.
  This package includes:
@@ -53,7 +61,9 @@ Homepage: http://www.mozilla.org/projects/security/pki/nss/tools/
 Package: libnss3-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libnss3 (= ${binary:Version}), libnspr4-dev (>= 4.6.6-1)
+Depends: ${misc:Depends},
+ libnss3 (= ${binary:Version}),
+ libnspr4-dev (>= 4.6.6-1)
 Multi-Arch: ${misc:Multi-Arch}
 Description: Development files for the Network Security Service libraries
  This is a set of libraries designed to support cross-platform development
@@ -68,8 +78,12 @@ Package: libnss3-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, libnss3 (= ${binary:Version}) | libnss3-tools (= ${binary:Version})
-Conflicts: libnss3 (<< ${binary:Version}), libnss3 (>> ${binary:Version}), libnss3-tools (<< ${binary:Version}), libnss3-tools (>> ${binary:Version})
+Depends: ${misc:Depends},
+ libnss3 (= ${binary:Version}) | libnss3-tools (= ${binary:Version})
+Conflicts: libnss3 (<< ${binary:Version}),
+ libnss3 (>> ${binary:Version}),
+ libnss3-tools (<< ${binary:Version}),
+ libnss3-tools (>> ${binary:Version})
 Provides: libnss3-1d-dbg
 Multi-Arch: ${misc:Multi-Arch}
 Description: Debugging symbols for the Network Security Service libraries
-- 
2.6.2