[svn:parrot] r37672 - trunk/ports/debian

[allison at svn.parrot.org]

Author: allison
Date: Tue Mar 24 08:43:50 2009
New Revision: 37672
URL: https://trac.parrot.org/parrot/changeset/37672

Log:
[debian] Move manfiles to new packages. Add some additional notations
for new packages to make sure they don't get installed with old versions
of existing packages. Thanks to David Nusinow for the patch.

Modified:
   trunk/ports/debian/changelog
   trunk/ports/debian/control.in
   trunk/ports/debian/rules

Modified: trunk/ports/debian/changelog
==============================================================================
--- trunk/ports/debian/changelog	Tue Mar 24 07:56:48 2009	(r37671)
+++ trunk/ports/debian/changelog	Tue Mar 24 08:43:50 2009	(r37672)
@@ -10,6 +10,10 @@
     - Re-order dh_installdeb in binary-arch to run after dh_makeshlibs and
       shlibdeps so that the library gets installed properly (patch from David
       Nusinow)
+    - Move manpage generation to new packages. Rename parrot-debugger.1 to
+      parrot_debugger.1 to match executable name. Generate pbc_to_exe and
+      parrot_config manpages from .pir source files (patch from David
+      Nusinow)
   * parrot.install.in, parrot-doc.install.in, libparrot-dev.install.in
     - Added template files, replace parrot.install, parrot-doc.install, and
       libparrot-dev.install
@@ -25,7 +29,7 @@
       distribution.
     - Removed copyright info for files no longer in distribution.
 
- -- Allison Randal <allison at parrot.org>  Wed, 18 Mar 2009 23:50:41 -0700
+ -- Allison Randal <allison at parrot.org>  Tue, 24 Mar 2009 01:28:57 -0700
 
 parrot (0.9.0-1) unstable; urgency=low
 

Modified: trunk/ports/debian/control.in
==============================================================================
--- trunk/ports/debian/control.in	Tue Mar 24 07:56:48 2009	(r37671)
+++ trunk/ports/debian/control.in	Tue Mar 24 08:43:50 2009	(r37672)
@@ -8,7 +8,7 @@
 
 Package: parrot
 Architecture: any
-Depends: parrot-minimal (= ${binary:Version})
+Depends: ${shlibs:Depends}, parrot-minimal (= ${binary:Version})
 Suggests: parrot-doc
 Provides: parrot-test, parrot-data-dumper
 Description: A virtual machine for dynamic languages
@@ -19,6 +19,8 @@
 Package: parrot-minimal
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: parrot ( < 1.0.0 )
+Replaces: parrot ( < 1.0.0 )
 Description: A minimal install of the Parrot VM
  This package contains the core Parrot virtual machine. It's all that you need
  to get up and running in the average use case, and is sufficient to run most
@@ -54,8 +56,10 @@
 Package: parrot-devel
 Architecture: any
 Section: devel
-Depends: parrot, perl
+Depends: ${shlibs:Depends}, parrot, perl
 Provides: parrot-pge, parrot-tge, parrot-pct, parrot-nqp
+Conflicts: parrot ( < 1.0.0 ), libparrot-dev ( < 1.0.0 )
+Replaces: parrot ( < 1.0.0 ), libparrot-dev ( < 1.0.0 )
 Description: Parrot development tools
  This package contains development tools for the Parrot virtual machine. It is
  essential for developing language implementations to run on Parrot, but not

Modified: trunk/ports/debian/rules
==============================================================================
--- trunk/ports/debian/rules	Tue Mar 24 07:56:48 2009	(r37671)
+++ trunk/ports/debian/rules	Tue Mar 24 08:43:50 2009	(r37672)
@@ -39,10 +39,11 @@
 	dh_testdir
 	$(MAKE) installable
 	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" docs/running.pod debian/parrot.1
-	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" parrot_config debian/parrot_config.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/util/parrot-config.pir debian/parrot_config.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/dev/pbc_to_exe.pir debian/pbc_to_exe.1
 	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_dump.c debian/pbc_dump.1
 	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_disassemble.c debian/pbc_disassemble.1
-	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/parrot_debugger.c debian/parrot-debugger.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/parrot_debugger.c debian/parrot_debugger.1
 	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_info.c debian/pbc_info.1
 	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_merge.c debian/pbc_merge.1
 	touch build-stamp
@@ -72,7 +73,7 @@
 	dh_testdir -i 
 	dh_testroot -i
 	dh_installchangelogs -i ChangeLog
-	dh_installman -plibparrot-dev debian/parrot_config.1
+	dh_installman -plibparrot-dev
 	dh_installdocs -i
 	dh_link -plibparrot-dev usr/lib/libparrot.so.$(SOVERSION) usr/lib/libparrot.so
 	dh_compress -pparrot-doc -X.pod
@@ -88,7 +89,8 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs -a ChangeLog
-	dh_installman -pparrot debian/parrot.1 debian/pbc_dump.1 debian/pbc_disassemble.1 debian/parrot-debugger.1 debian/pbc_info.1 debian/pbc_merge.1
+	dh_installman -pparrot-minimal debian/parrot.1
+	dh_installman -pparrot-devel debian/parrot_debugger.1 debian/pbc_disassemble.1 debian/pbc_dump.1 debian/pbc_info.1 debian/pbc_merge.1 debian/parrot_config.1 debian/pbc_to_exe.1
 	dh_installdocs -a
 	dh_strip -a
 	dh_compress -a