r12586 - in /trunk/libfile-spec-perl/debian: changelog control rules

[tincho-guest at users.alioth.debian.org]

Author: tincho-guest
Date: Sat Jan 12 17:39:30 2008
New Revision: 12586

URL: http://svn.debian.org/wsvn/?sc=1&rev=12586
Log:
* Remove the symlinks, make both packages ship documentation , and add
  versioned replace, to avoid dpkg bug (see Method B in
  http://wiki.debian.org/Renaming_a_Package).

Modified:
    trunk/libfile-spec-perl/debian/changelog
    trunk/libfile-spec-perl/debian/control
    trunk/libfile-spec-perl/debian/rules

Modified: trunk/libfile-spec-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libfile-spec-perl/debian/changelog?rev=12586&op=diff
==============================================================================
--- trunk/libfile-spec-perl/debian/changelog (original)
+++ trunk/libfile-spec-perl/debian/changelog Sat Jan 12 17:39:30 2008
@@ -22,6 +22,11 @@
     + add the same symlink in libfile-spec-perl
     + make libfile-spec-perl Replace any version of libpathtools
   * add myself to Uploaders
+
+  [ Martín Ferrari ]
+  * Remove the symlinks, make both packages ship documentation , and add
+    versioned replace, to avoid dpkg bug (see Method B in
+    http://wiki.debian.org/Renaming_a_Package).
 
  -- Damyan Ivanov <dmn at debian.org>  Fri, 11 Jan 2008 23:36:41 +0200
 

Modified: trunk/libfile-spec-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libfile-spec-perl/debian/control?rev=12586&op=diff
==============================================================================
--- trunk/libfile-spec-perl/debian/control (original)
+++ trunk/libfile-spec-perl/debian/control Sat Jan 12 17:39:30 2008
@@ -15,7 +15,7 @@
 Architecture: any
 Depends: ${perl:Depends}, ${misc:Depends}
 Conflicts: libpathtools-perl (<< 3.2501-1)
-Replaces: libpathtools-perl
+Replaces: libpathtools-perl (<< 3.2501-1)
 Provides: libpathtools-perl
 Description: Tools for working with paths and file specs across platforms
  The File::Spec distribution provides a group of modules for working 

Modified: trunk/libfile-spec-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libfile-spec-perl/debian/rules?rev=12586&op=diff
==============================================================================
--- trunk/libfile-spec-perl/debian/rules (original)
+++ trunk/libfile-spec-perl/debian/rules Sat Jan 12 17:39:30 2008
@@ -10,6 +10,7 @@
 PACKAGE = $(firstword $(shell dh_listpackages))
 PERL   ?= /usr/bin/perl
 TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 # Allow disabling build optimation by setting noopt in
 # $DEB_BUILD_OPTIONS
 CFLAGS = -Wall -g
@@ -40,18 +41,16 @@
 	dh_testroot
 	dh_clean -k
 	$(PERL) Build install destdir=$(TMP) create_packlist=0
-
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
-
+	[ ! -d $(TMP)/usr/share/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/share/perl5
 	touch $@
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -p libfile-spec-perl
-	dh_link -p libfile-spec-perl usr/share/doc/libfile-spec-perl usr/share/doc/libpathtools-perl
-	dh_link -p libpathtools-perl usr/share/doc/libfile-spec-perl usr/share/doc/libpathtools-perl
-	dh_installchangelogs -p libfile-spec-perl Changes
+	dh_installdocs
+	dh_installchangelogs
 	dh_perl
 	dh_strip
 	dh_compress