r48745 - in /trunk/eekboek/debian: changelog control rules

[joostvb at users.alioth.debian.org]

Author: joostvb
Date: Mon Dec 14 07:09:49 2009
New Revision: 48745

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=48745
Log:
get rid of private copies of external code

Modified:
    trunk/eekboek/debian/changelog
    trunk/eekboek/debian/control
    trunk/eekboek/debian/rules

Modified: trunk/eekboek/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/changelog?rev=48745&op=diff
==============================================================================
--- trunk/eekboek/debian/changelog (original)
+++ trunk/eekboek/debian/changelog Mon Dec 14 07:09:49 2009
@@ -1,9 +1,16 @@
 eekboek (1.05.04-1) UNRELEASED; urgency=low
 
   TODO:
-  - remove duplicates
+  - we removed duplicates
     /u/s/perl/5.10.1/EB/CPAN/Carp/Assert.pm
-    /u/s/perl/5.10.1/EB/CPAN/File/HomeDir.pm
+    /u/s/perl/5.10.1/EB/CPAN/File/HomeDir.pm: check wether eekboek
+    has some hardcoded dependencies on these private copies.  Do
+    not install
+    /usr/share/man/man3/EB::CPAN::File::HomeDir::Unix.3pm.gz
+    /usr/share/man/man3/EB::CPAN::File::HomeDir::Darwin.3pm.gz
+    /usr/share/man/man3/EB::CPAN::Carp::Assert.3pm.gz
+    /usr/share/man/man3/EB::CPAN::File::HomeDir::Windows.3pm.gz
+    /usr/share/man/man3/EB::CPAN::File::HomeDir.3pm.gz
   - refresh example administratie:
     Date: Mon, 19 Oct 2009 11:59:20 +0200
     From: Johan Vromans
@@ -77,6 +84,9 @@
       libdbd-pg-perl (>= 1.41) since we've disabled the pg-tests.
     - add libwx-perl to suggests (needed for ebgui), mention
       this in description.
+    - add libcarp-assert-perl and libfile-homedir-perl to depends: we
+      are not using the private copies of these external modules, as
+      shipped with eekboek.
   * debian/eekboek.examples: (cosmetic) introduce additional linebreak
   * lib/EB/DB/Sqlite.pm: fix warning '"unicode" attribute will be
     deprecated. Use "sqlite_unicode" instead', so that 'make test' gets
@@ -87,6 +97,8 @@
     - install manpages under /usr/share/man, not /usr/man.
     - disable tests 80_db_postgresql.t, 91_ivp_sqlite.t,
       92_ivp_postgres.t. For some reason these fail.
+    - do not install EB::CPAN::Carp::Assert, EB::CPAN::File::Homedir:
+      Debian ships these in libcarp-assert-perl and libfile-homedir-perl.
   * debian/NEWS: report experimental status of this release.
 
  -- Nathan Handler <nhandler at ubuntu.com>  Wed, 04 Nov 2009 22:30:20 -0600

Modified: trunk/eekboek/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/control?rev=48745&op=diff
==============================================================================
--- trunk/eekboek/debian/control (original)
+++ trunk/eekboek/debian/control Mon Dec 14 07:09:49 2009
@@ -16,7 +16,8 @@
 Package: eekboek
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libterm-readline-gnu-perl,
- libdbi-perl (>= 1.40), libdbd-sqlite3-perl (>= 1.13), libarchive-zip-perl
+ libdbi-perl (>= 1.40), libdbd-sqlite3-perl (>= 1.13), libarchive-zip-perl,
+ libcarp-assert-perl, libfile-homedir-perl
 Suggests: eekboek-db-postgresql, libwx-perl
 Description: Bookkeeping software for small and medium-size businesses
  EekBoek is a bookkeeping package for Dutch users; it creates reports like

Modified: trunk/eekboek/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/rules?rev=48745&op=diff
==============================================================================
--- trunk/eekboek/debian/rules (original)
+++ trunk/eekboek/debian/rules Mon Dec 14 07:09:49 2009
@@ -18,5 +18,7 @@
 # use debian/eekboek. not dh's default debian/tmp
 override_dh_auto_install:
 	./Build install --destdir `pwd`/debian/eekboek --prefix /usr --install_path libdoc=/usr/share/man/man3 --install_path bindoc=/usr/share/man/man1
+	# remove code shipped in other Debian packages
 	rm -f debian/eekboek/usr/share/perl5/EB/DB/Postgres.pm
+	rm -rf debian/eekboek/usr/share/perl5/EB/CPAN