[Pkg-cups-devel] r752 - in cupsys/branches/cups-1.2-ubuntu: . debian

[Martin Pitt]

Author: mpitt
Date: Sun Apr  6 15:38:02 2008
New Revision: 752

Log:
merge from trunk

Modified:
   cupsys/branches/cups-1.2-ubuntu/   (props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Sun Apr  6 15:38:02 2008
@@ -1,3 +1,11 @@
+cupsys (1.3.7-1ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control: Add missing build dependency lsb-release. This will bring
+    back the lost AppArmor profile. (LP: #211375) Also wrap long fields, so
+    that they are easier to edit.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Sun, 06 Apr 2008 10:24:39 -0600
+
 cupsys (1.3.7-1ubuntu1) hardy; urgency=low
 
   * Merge new upstream bug fix release from unstable.

Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control	Sun Apr  6 15:38:02 2008
@@ -4,8 +4,15 @@
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
 Standards-Version: 3.7.3
-Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev | heimdal-dev, libavahi-compat-libdnssd-dev, poppler-utils | xpdf-utils
-Uploaders: Kenshi Muto <kmuto at debian.org>, Martin Pitt <mpitt at debian.org>, Roger Leigh <rleigh at debian.org>, Martin-Éric Racine <q-funk at iki.fi>, Masayuki Hatta (mhatta) <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>
+Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev,
+ libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev,
+ debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, 
+ dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev | heimdal-dev,
+ libavahi-compat-libdnssd-dev, poppler-utils | xpdf-utils, lsb-release 
+Uploaders: Kenshi Muto <kmuto at debian.org>, 
+ Martin Pitt <mpitt at debian.org>, Roger Leigh <rleigh at debian.org>, 
+ Martin-Éric Racine <q-funk at iki.fi>, Masayuki Hatta (mhatta) <mhatta at debian.org>,
+ Jeff Licquia <licquia at debian.org>
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cups/cupsys/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cups/cupsys/trunk
 
@@ -53,11 +60,16 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, ghostscript | gs-esp, lsb-base (>= 3), cupsys-common,  ssl-cert (>= 1.0.11), adduser
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0,
+ poppler-utils | xpdf-utils, perl-modules, procps, 
+ ghostscript | gs-esp, lsb-base (>= 3), cupsys-common,  
+ ssl-cert (>= 1.0.11), adduser
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils
-Suggests: cupsys-bsd, cupsys-driver-gutenprint, foomatic-filters-ppds, hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf
+Suggests: cupsys-bsd, cupsys-driver-gutenprint, foomatic-filters-ppds,
+ hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, 
+ cups-pdf
 Description: Common UNIX Printing System(tm) - server
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet 
@@ -117,7 +129,8 @@
 Priority: optional
 Section: libdevel
 Architecture: any
-Depends: libcupsimage2 (= ${binary:Version}), libcupsys2-dev (= ${binary:Version}), libpng-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev
+Depends: libcupsimage2 (= ${binary:Version}), libcupsys2-dev (= ${binary:Version}), 
+ libpng-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev
 Provides: libcupsimage-dev
 Conflicts: libcupsimage-dev
 Replaces: libcupsys1-dev, libcupsimage-dev, libcupsys2-dev (<= 1.1.18-2)
@@ -138,7 +151,8 @@
 Priority: extra
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, cupsys-client (= ${binary:Version}), debconf | debconf-2.0, update-inetd, cupsys-common
+Depends: ${shlibs:Depends}, cupsys-client (= ${binary:Version}),
+ debconf | debconf-2.0, update-inetd, cupsys-common
 Recommends: cupsys
 Conflicts: lpr, lprng, manpages-fr (<< 0.9.5-1)
 Provides: lpr