r22933 - in /trunk/libcgi-pm-perl/debian: changelog control rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Jul  8 19:53:21 2008
New Revision: 22933

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22933
Log:
Do not ship CGI/Fast.pm, avoiding conflict with libcgi-fast-perl. Instead,
Depend on that. Closes: #489928. Thanks to Ralf Treinen for reporting.

Modified:
    trunk/libcgi-pm-perl/debian/changelog
    trunk/libcgi-pm-perl/debian/control
    trunk/libcgi-pm-perl/debian/rules

Modified: trunk/libcgi-pm-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-pm-perl/debian/changelog?rev=22933&op=diff
==============================================================================
--- trunk/libcgi-pm-perl/debian/changelog (original)
+++ trunk/libcgi-pm-perl/debian/changelog Tue Jul  8 19:53:21 2008
@@ -1,3 +1,10 @@
+libcgi-pm-perl (3.38-2) UNRELEASED; urgency=medium
+
+  * Do not ship CGI/Fast.pm, avoiding conflict with libcgi-fast-perl. Instead,
+    Depend on that. Closes: #489928. Thanks to Ralf Treinen for reporting.
+
+ -- Damyan Ivanov <dmn at debian.org>  Tue, 08 Jul 2008 22:43:51 +0300
+
 libcgi-pm-perl (3.38-1) unstable; urgency=low
 
   * Initial Release. (Closes: #486943)

Modified: trunk/libcgi-pm-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-pm-perl/debian/control?rev=22933&op=diff
==============================================================================
--- trunk/libcgi-pm-perl/debian/control (original)
+++ trunk/libcgi-pm-perl/debian/control Tue Jul  8 19:53:21 2008
@@ -12,7 +12,7 @@
 
 Package: libcgi-pm-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}
+Depends: ${perl:Depends}, ${misc:Depends}, libcgi-fast-perl
 Description:  Simple Common Gateway Interface Class
  CGI.pm uses perl5 objects to make it easy to create Web fill-out
  forms  and parse their contents. This package defines CGI objects,

Modified: trunk/libcgi-pm-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-pm-perl/debian/rules?rev=22933&op=diff
==============================================================================
--- trunk/libcgi-pm-perl/debian/rules (original)
+++ trunk/libcgi-pm-perl/debian/rules Tue Jul  8 19:53:21 2008
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/quilt/quilt.make
+
+PACKAGE=$(firstword $(shell dh_listpackages))
+TMP=$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
@@ -16,6 +19,9 @@
 install: install-stamp
 install-stamp: build-stamp
 	dh install
+	# this file is also in libcgi-fast-perl, produced by perl source
+	# package. see #489928
+	rm -v $(TMP)/usr/share/perl5/CGI/Fast.pm
 	touch $@
 
 binary-arch: