[Pkg-cups-devel] r12 - cupsys/trunk/debian

[Kenshi Muto]

Author: kmuto
Date: Mon Aug 15 13:07:01 2005
New Revision: 12

Added:
   cupsys/trunk/debian/libcupsys2.dirs
      - copied unchanged from r11, cupsys/trunk/debian/libcupsys2-gnutls10.dirs
   cupsys/trunk/debian/libcupsys2.files
      - copied unchanged from r11, cupsys/trunk/debian/libcupsys2-gnutls10.files
   cupsys/trunk/debian/libcupsys2.postinst
      - copied unchanged from r11, cupsys/trunk/debian/libcupsys2-gnutls10.postinst
   cupsys/trunk/debian/libcupsys2.shlibs
      - copied unchanged from r11, cupsys/trunk/debian/libcupsys2-gnutls10.shlibs
Removed:
   cupsys/trunk/debian/libcupsys2-gnutls10.dirs
   cupsys/trunk/debian/libcupsys2-gnutls10.files
   cupsys/trunk/debian/libcupsys2-gnutls10.postinst
   cupsys/trunk/debian/libcupsys2-gnutls10.shlibs
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/control
   cupsys/trunk/debian/rules
Log:
migrated to libgnutls12, and let libcupsys2 as real library. libcupsys2-gnutls10 becomes transitional package. (It works on my test environment) And added procps to Depends: of cupsys (for postinst).

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Mon Aug 15 13:07:01 2005
@@ -4,6 +4,10 @@
     Modified control file. (closes: #320196)
   * Add debconf-2.0 as debconf alternative.
   * Migrated to libgnutls12. (closes: #322087)
+    libcupsys2 backed as real library. libcupsys2-gnutls10 became
+    transitional package.
+  * Add procps to Depends: of cupsys. ps command is used by
+    cupsys.postinst.
 
  -- Kenshi Muto <kmuto at debian.org>  Thu, 28 Jul 2005 11:35:27 +0900
 

Modified: cupsys/trunk/debian/control
==============================================================================
--- cupsys/trunk/debian/control	(original)
+++ cupsys/trunk/debian/control	Mon Aug 15 13:07:01 2005
@@ -10,7 +10,7 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, xpdf-utils, perl-modules
+Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, xpdf-utils, perl-modules, procps
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: gs-esp, cupsys-client, smbclient (>= 3.0.9), foomatic-filters
@@ -48,13 +48,14 @@
  Easy Software Products (www.easysw.com), and refer to the original
  source packages from which these packages are made.
 
-Package: libcupsys2-gnutls10
+Package: libcupsys2
 Priority: optional
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: cupsys-client (<= 1.1.10-2), libcupsys2
-Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2 (<< 1.1.20final+rc1-2)
+Provides: libcupsys2-gnutls10
+Replaces: cupsys-client (<= 1.1.10-2), libcupsys2-gnutls10 (<= 1.1.23-11)
+Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11)
 Description: Common UNIX Printing System(tm) - libs
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet 
@@ -67,18 +68,18 @@
  Easy Software Products (www.easysw.com), and refer to the original
  source packages from which these packages are made.
 
-Package: libcupsys2
+Package: libcupsys2-gnutls10
 Priority: optional
 Section: libs
 Architecture: all
-Depends: libcupsys2-gnutls10
+Depends: libcupsys2 (>= 1.1.23-12)
 Description: Common UNIX Printing System(tm) - dummy libs for transition
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet 
  Printing Protocol (IPP), and has its own filtering driver model for 
  handling various document types.
  .
- This package is for transition to libcupsys2-gnutls10.
+ This package is for transition to libcupsys2.
  .
  The terms "Common UNIX Printing System" and "CUPS" are trademarks of
  Easy Software Products (www.easysw.com), and refer to the original
@@ -88,7 +89,7 @@
 Priority: optional
 Section: libdevel
 Architecture: any
-Depends: libcupsys2-gnutls10 (= ${Source-Version}), libgnutls-dev
+Depends: libcupsys2 (= ${Source-Version}), libgnutls-dev
 Provides: libcupsys-dev
 Conflicts: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
 Replaces: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Mon Aug 15 13:07:01 2005
@@ -56,15 +56,15 @@
 	(cd debian/libcupsimage2-dev && patch -p0 < ../image.h.patch)
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
 	ln -s libcupsimage2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
-binary-post-install/libcupsys2::
-	rm -r debian/libcupsys2/usr/share/doc/libcupsys2
-	ln -s libcupsys2-gnutls10 debian/libcupsys2/usr/share/doc/libcupsys2
+binary-post-install/libcupsys2-gnutls10::
+	rm -r debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
+	ln -s libcupsys2 debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
 binary-post-install/cupsys-bsd::
 	rm -r debian/cupsys-bsd/usr/share/doc/cupsys-bsd
-	ln -s libcupsys2-gnutls10 debian/cupsys-bsd/usr/share/doc/cupsys-bsd
+	ln -s libcupsys2 debian/cupsys-bsd/usr/share/doc/cupsys-bsd
 binary-post-install/libcupsys2-dev::
 	rm -r debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
-	ln -s libcupsys2-gnutls10 debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
+	ln -s libcupsys2 debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
 binary-post-install/cupsys-client::
 	rm -r debian/cupsys-client/usr/share/doc/cupsys-client
-	ln -s libcupsys2-gnutls10 debian/cupsys-client/usr/share/doc/cupsys-client
+	ln -s libcupsys2 debian/cupsys-client/usr/share/doc/cupsys-client