Package: xscreensaver
Version: 5.10-3

Please split the Depends, Build-Depends lines in debian/control to one package per line. This makes it easier to read and easier to diff

Patch attached for 5.10-3
6c6,38
< Build-Depends: bc, debhelper (>= 7.0), fortune-mod, libgtk2.0-dev, libpam0g-dev (>= 0.72), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev, xutils-dev, libgnome2-dev, libxml2-dev, libglade2-dev, libjpeg62-dev, libgle-dev, intltool, autotools-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxss-dev, libxt-dev, libxtst-dev, libxxf86misc-dev, libxxf86vm-dev, x11proto-core-dev, xbitmaps, quilt, gdm, libxss-dev, libxtst-dev, libxxf86misc-dev
---
> Build-Depends: bc,
>                debhelper (>= 7.0),
> 	       fortune-mod,
> 	       libgtk2.0-dev,
> 	       libpam0g-dev (>= 0.72),
> 	       libgl1-mesa-dev | libgl-dev,
> 	       libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev,
> 	       xutils-dev,
> 	       libgnome2-dev,
> 	       libxml2-dev,
> 	       libglade2-dev,
> 	       libjpeg62-dev,
> 	       libgle-dev,
> 	       intltool,
> 	       autotools-dev,
> 	       libx11-dev,
> 	       libxext-dev,
> 	       libxinerama-dev,
> 	       libxmu-dev,
> 	       libxpm-dev,
> 	       libxrandr-dev,
> 	       libxss-dev,
> 	       libxt-dev,
> 	       libxtst-dev,
> 	       libxxf86misc-dev,
> 	       libxxf86vm-dev,
> 	       x11proto-core-dev,
> 	       xbitmaps,
> 	       quilt,
> 	       gdm,
> 	       libxss-dev,
> 	       libxtst-dev,
> 	       libxxf86misc-dev
15,17c47,61
< Conflicts: funny-manpages (<< 1.3-1), suidmanager (<< 0.50), xscreensaver-gnome (<< 4.09-2), xscreensaver-nognome (<< 4.09-2), gnome-control-center (<< 1:2)
< Recommends: xli | xloadimage, libjpeg-progs, perl5, miscfiles | wordlist
< Suggests: xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer
---
> Conflicts: funny-manpages (<< 1.3-1),
>            suidmanager (<< 0.50),
> 	   xscreensaver-gnome (<< 4.09-2),
> 	   xscreensaver-nognome (<< 4.09-2),
> 	   gnome-control-center (<< 1:2)
> Recommends: xli | xloadimage,
>             libjpeg-progs,
> 	    perl5,
> 	    miscfiles | wordlist
> Suggests: xfishtank,
>           xdaliclock,
> 	  xscreensaver-gl,
> 	  fortune,
> 	  www-browser,
> 	  qcam | streamer
35,37c79,84
< Conflicts: xscreensaver (<< 5.04-3), kscreensaver-xsavers (<< 4:3.5.9-1)
< Replaces: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.15.4-0ubuntu1)
< Breaks: gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1)
---
> Conflicts: xscreensaver (<< 5.04-3),
>            kscreensaver-xsavers (<< 4:3.5.9-1)
> Replaces: xscreensaver (<< 5.04-3),
>           gnome-screensaver (<< 2.15.4-0ubuntu1)
> Breaks: gnome-screensaver (<< 2.26),
>         kscreensaver-xsaver (<= 4:4.2.4-1)
55,57c102,110
< Depends: ${shlibs:Depends}, xscreensaver-data (>= 5.04-3), dictionaries-common, libjpeg-progs, netpbm
< Enhances: xscreensaver, gnome-screensaver
< Conflicts: xscreensaver (<< 5.04-3), kscreensaver-xsavers (<< 4:3.5.9-1)
---
> Depends: ${shlibs:Depends},
>          xscreensaver-data (>= 5.04-3),
>          dictionaries-common,
>          libjpeg-progs,
> 	 netpbm
> Enhances: xscreensaver,
>           gnome-screensaver
> Conflicts: xscreensaver (<< 5.04-3),
>            kscreensaver-xsavers (<< 4:3.5.9-1)
59c112,113
< Breaks: gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1)
---
> Breaks: gnome-screensaver (<< 2.26),
>         kscreensaver-xsaver (<= 4:4.2.4-1)
99c153,154
< Breaks: gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1)
---
> Breaks: gnome-screensaver (<< 2.26),
>         kscreensaver-xsaver (<= 4:4.2.4-1)
123,124c178,181
< Depends: ${shlibs:Depends}, xscreensaver-gl (>= 5.04-3)
< Enhances: xscreensaver, gnome-screensaver
---
> Depends: ${shlibs:Depends},
>          xscreensaver-gl (>= 5.04-3)
> Enhances: xscreensaver,
>           gnome-screensaver
127c184,185
< Breaks: gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1)
---
> Breaks: gnome-screensaver (<< 2.26),
>         kscreensaver-xsaver (<= 4:4.2.4-1)

Reply via email to