From 0cd1c860500546c129feffbe5379482dcf19788f Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Wed, 27 Jun 2012 20:12:37 +0100 Subject: Revert "debian: libgutenprint3 breaks libgutenprint2" This reverts commit d6be140496f2e3125566bca6edf5df14c8dc0553. Conflicts: debian/changelog --- debian/changelog | 4 +--- debian/control | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 203546f..b502f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,10 @@ gutenprint (5.2.8-1) unstable; urgency=low * debian/control: - Upgrade Standards-Version to 3.9.3 - Require debhelper >= 9. - - Add libgutenprint3 to replace libgutenprint2. Due to both libraries - providing the same set of loadable modules, the libraries are not - co-installable. * debian/rules: - Re-enable NLS with --enable-nls. * printer-driver-gutenprint no longer installs profile.jpg. + * Re-enable NLS with --enable-nls. -- Roger Leigh Thu, 21 Jun 2012 23:31:35 +0100 diff --git a/debian/control b/debian/control index 3deefd9..7bf8a54 100644 --- a/debian/control +++ b/debian/control @@ -98,10 +98,6 @@ Depends: ${misc:Depends}, libgutenprint3 (= ${binary:Version}), pkg-config -Breaks: -# Both libgutenprint2 and libgutenprint3 provide the same loadable modules -# and hence are not co-installable. - libgutenprint2 Suggests: libgutenprint-doc (= ${source:Version}) Description: development files for the Gutenprint printer driver library This package contains the header files for the Gutenprint library, -- cgit v1.2.3