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

[Martin Pitt]

Author: mpitt
Date: Thu Oct  4 18:06:54 2007
New Revision: 606

Log:
* cupsys-common: Depend on libcupsys2.
* Symlink doc directories to avoid duplicate files.

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
   cupsys/branches/cups-1.2-ubuntu/debian/rules

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	Thu Oct  4 18:06:54 2007
@@ -1,3 +1,10 @@
+cupsys (1.3.2-1ubuntu4) gutsy; urgency=low
+
+  * cupsys-common: Depend on libcupsys2.
+  * Symlink doc directories to avoid duplicate files.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 04 Oct 2007 17:45:31 +0200
+
 cupsys (1.3.2-1ubuntu3) gutsy; urgency=low
 
   * No-change upload of 1ubuntu1, to revert the 1ubuntu2 upload which should

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	Thu Oct  4 18:06:54 2007
@@ -157,7 +157,7 @@
 Priority: optional
 Section: net
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libcupsys2, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: cupsys (<< 1.2.1-4)
 Replaces: cupsys (<< 1.2.1-4)
 Description: Common UNIX Printing System(tm) - common files

Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules	Thu Oct  4 18:06:54 2007
@@ -72,3 +72,27 @@
 binary-post-install/cupsys-client::
 	rm -r debian/cupsys-client/usr/share/doc/cupsys-client
 	ln -s libcupsys2 debian/cupsys-client/usr/share/doc/cupsys-client
+
+common-binary-predeb-arch::
+	t=libcupsys2; \
+	for p in $$(dh_listpackages -a -N$$t); do \
+	  rm -rf debian/$$p/usr/share/doc/$$p; \
+	  ln -s $$t debian/$$p/usr/share/doc/$$p; \
+	  if [ -f debian/$$p.docs ]; then \
+	    mkdir -p debian/$$p/usr/share/doc/$$t; \
+	    cp -a $$(eval echo $$(cat debian/$$p.docs)) debian/$$p/usr/share/doc/$$t/; \
+	    dh_compress -p$$p; \
+	  fi; \
+	done
+
+common-binary-predeb-indep::
+	t=libcupsys2; \
+	for p in $$(dh_listpackages -i -N$$t); do \
+	  rm -rf debian/$$p/usr/share/doc/$$p; \
+	  ln -s $$t debian/$$p/usr/share/doc/$$p; \
+	  if [ -f debian/$$p.docs ]; then \
+	    mkdir -p debian/$$p/usr/share/doc/$$t; \
+	    cp -a $$(eval echo $$(cat debian/$$p.docs)) debian/$$p/usr/share/doc/$$t/; \
+	    dh_compress -p$$p; \
+	  fi; \
+	done