[Pkg-cups-devel] r386 - cupsys/branches/cups-1.2/debian

[Kenshi Muto]

Author: kmuto
Date: Sat Sep 30 06:02:23 2006
New Revision: 386

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.postinst
   cupsys/branches/cups-1.2/debian/rules

Log:
remove symlink was created for backward compatibility (it caused a long loop)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sat Sep 30 06:02:23 2006
@@ -1,3 +1,12 @@
+cupsys (1.2.4-2) UNRELEASED; urgency=low
+
+  [ Kenshi Muto ]
+  * PPD transition to /usr/share/ppd is mostly finished.
+    Now I remove old symlink /usr/share/ppd/cups-transitional-dir and
+    /usr/share/cups/cups-included. (closes: #381266, #383291)
+
+ -- Kenshi Muto <kmuto at debian.org>  Sat, 30 Sep 2006 14:56:29 +0900
+
 cupsys (1.2.4-1) unstable; urgency=medium
 
   * New upstream release

Modified: cupsys/branches/cups-1.2/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.postinst	Sat Sep 30 06:02:23 2006
@@ -55,6 +55,12 @@
 	if [ -d /var/lib/cups/certs ]; then
 	    rm -rf /va/lib/cups/certs
 	fi
+	if [ -L /usr/share/ppd/cups-transitional-dir ]; then
+	    rm -f /usr/share/ppd/cups-transitional-dir
+	fi
+	if [ -L /usr/share/cups/model/cups-included ]; then
+	    rm -f /usr/share/cups/model/cups-included
+	fi
 
 	[ -f /etc/cups/ppds.dat ] && mv /etc/cups/ppds.dat /var/cache/cups/ppd
 

Modified: cupsys/branches/cups-1.2/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2/debian/rules	(original)
+++ cupsys/branches/cups-1.2/debian/rules	Sat Sep 30 06:02:23 2006
@@ -67,8 +67,8 @@
 	done
 
 	# Compatibility for programs which still look in the old location
-	ln -s ../../ppd/cups-included $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/cups-included
-	ln -s ../cups/model $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-transitional-dir
+	#ln -s ../../ppd/cups-included $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/cups-included
+	#ln -s ../cups/model $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-transitional-dir
 
 binary-post-install/libcupsimage2-dev::
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev