[Pkg-octave-commit] r2402 - in octave-pkg-dev/trunk: . debian

Sun Aug 31 09:01:10 UTC 2008

Author: rafael
Date: 2008-08-31 09:01:09 +0000 (Sun, 31 Aug 2008)
New Revision: 2402

Added:
   octave-pkg-dev/trunk/debian/octave-pkg-dev.install
   octave-pkg-dev/trunk/debian/octave-pkg-rebuild.postinst.in
   octave-pkg-dev/trunk/debian/octave-pkg-rebuild.triggers
   octave-pkg-dev/trunk/triggers-octpkg
Removed:
   octave-pkg-dev/trunk/debian/install
   octave-pkg-dev/trunk/postinst-octpkg
   octave-pkg-dev/trunk/postrm-octpkg
Modified:
   octave-pkg-dev/trunk/README
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/debian/control
   octave-pkg-dev/trunk/debian/rules
   octave-pkg-dev/trunk/octave-pkg-helper.in
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Use a dpkg trigger instead of postinst/postrm scripts for updating the pkg database


Modified: octave-pkg-dev/trunk/README
===================================================================

--- octave-pkg-dev/trunk/README	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/README	2008-08-31 09:01:09 UTC (rev 2402)
@@ -16,10 +16,7 @@
 Add ${octave:Depends} to the Depends field of the package in
 debian/control.
 
-Appropriate postinst and postrm scripts are automatically generated.
-If the package needs its own maintainer scripts, add a line containing
-#DEBHELPER# to it.  This tag will be appropriately substituted by
-octave-pkg-dev.
+The appropriate dpkg-triggers file is automatically generated.
 
 A get-orig-source target is also transparently provided.  It works
 only for the packages distributed by the octave-forge project at

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/debian/changelog	2008-08-31 09:01:09 UTC (rev 2402)
@@ -1,3 +1,16 @@
+octave-pkg-dev (0.6.0) UNRELEASED; urgency=low
+
+  * Instead of using postinst and postrm scripts for updating the Octave's
+    pkg database (via "pkg rebuild"), we use dpkg triggers now.
+  * A new binary package is created, called octave-pkg-rebuild, which is
+    essentially empty but contains the postinst script and the trigger
+    "interest" statement.  The packages providing Octave pkg's will
+    activate the trigger.
+
+  * Bump the dependencies on octave3.0 to 3.0.2 or later
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 30 Aug 2008 16:28:39 +0200
+
 octave-pkg-dev (0.5.8) unstable; urgency=low
 
   [ Ólafur Jens Sigurðsson ]

Modified: octave-pkg-dev/trunk/debian/control
===================================================================
--- octave-pkg-dev/trunk/debian/control	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/debian/control	2008-08-31 09:01:09 UTC (rev 2402)
@@ -12,7 +12,7 @@
 
 Package: octave-pkg-dev
 Architecture: all
-Depends: octave3.0-headers (>= 1:3.0.1-2), debhelper (>= 6), cdbs
+Depends: octave3.0-headers (>= 1:3.0.2), debhelper (>= 6), cdbs
 Description: infrastructure to build Octave packages
  Since version 3.0 of Octave (a numerical computation software),
  add-ons can be installed through the pkg.m system.  This package
@@ -23,3 +23,12 @@
  .
  This package is mainly intented to be used by the Debian Octave Group
  and should be of little interest to general users.
+
+Package: octave-pkg-rebuild
+Architecture: all
+Depends: octave3.0 (>= 1:3.0.2)
+Description: rebuild pkg database for Octave packages
+ Since version 3.0 of Octave (a numerical computation software),
+ add-ons can be installed through the pkg.m system.  This package
+ contains the necessary script for updating the pkg database after
+ installation of Octave packages.

Deleted: octave-pkg-dev/trunk/debian/install
===================================================================
--- octave-pkg-dev/trunk/debian/install	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/debian/install	2008-08-31 09:01:09 UTC (rev 2402)
@@ -1,6 +0,0 @@
-octave-pkg.mk		usr/share/cdbs/1/class
-octave-pkg-helper	usr/share/octave/debian/dh
-postinst-octpkg		usr/share/debhelper/autoscripts
-postrm-octpkg		usr/share/debhelper/autoscripts
-pkg.m			usr/share/octave/debian/m
-cstrcat.m		usr/share/octave/debian/m

Copied: octave-pkg-dev/trunk/debian/octave-pkg-dev.install (from rev 2399, octave-pkg-dev/trunk/debian/install)
===================================================================
--- octave-pkg-dev/trunk/debian/octave-pkg-dev.install	                        (rev 0)
+++ octave-pkg-dev/trunk/debian/octave-pkg-dev.install	2008-08-31 09:01:09 UTC (rev 2402)
@@ -0,0 +1,5 @@
+octave-pkg.mk		usr/share/cdbs/1/class
+octave-pkg-helper	usr/share/octave/debian/dh
+triggers-octpkg		usr/share/debhelper/autoscripts
+pkg.m			usr/share/octave/debian/m
+cstrcat.m		usr/share/octave/debian/m


Property changes on: octave-pkg-dev/trunk/debian/octave-pkg-dev.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: octave-pkg-dev/trunk/debian/octave-pkg-rebuild.postinst.in
===================================================================
--- octave-pkg-dev/trunk/debian/octave-pkg-rebuild.postinst.in	                        (rev 0)
+++ octave-pkg-dev/trunk/debian/octave-pkg-rebuild.postinst.in	2008-08-31 09:01:09 UTC (rev 2402)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Abort if any command returns an error value
+set -e
+
+case "$1" in
+  triggered)
+    @OCTAVE@ --silent --no-history --no-init-file --eval "pkg ('rebuild');"
+esac
+
+#DEBHELPER#
+
+exit 0

Added: octave-pkg-dev/trunk/debian/octave-pkg-rebuild.triggers
===================================================================
--- octave-pkg-dev/trunk/debian/octave-pkg-rebuild.triggers	                        (rev 0)
+++ octave-pkg-dev/trunk/debian/octave-pkg-rebuild.triggers	2008-08-31 09:01:09 UTC (rev 2402)
@@ -0,0 +1 @@
+interest /usr/share/octave/packages

Modified: octave-pkg-dev/trunk/debian/rules
===================================================================
--- octave-pkg-dev/trunk/debian/rules	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/debian/rules	2008-08-31 09:01:09 UTC (rev 2402)
@@ -4,8 +4,8 @@
 # debian/rules for the octave-pkg-dev Debian package
 
 OCTPKG = octave3.0
-OCTVER = 3.0.1
-FILES = octave-pkg.mk octave-pkg-helper
+OCTVER = 3.0.2
+FILES = octave-pkg.mk octave-pkg-helper debian/octave-pkg-rebuild.postinst
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 

Modified: octave-pkg-dev/trunk/octave-pkg-helper.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg-helper.in	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/octave-pkg-helper.in	2008-08-31 09:01:09 UTC (rev 2402)
@@ -53,7 +53,6 @@
     for my $pkg (keys %depends) {
         addsubstvar ($package, 'octave:Depends', $pkg, $depends {$pkg});
     }
-    autoscript ($package, 'postinst', 'postinst-octpkg',
-                's/#OCTAVE#/@OCTAVE@/');
-    autoscript ($package, 'postrm', 'postrm-octpkg', 's/#OCTAVE#/@OCTAVE@/');
+    addsubstvar ($package, 'octave:Depends', 'octave-pkg-rebuild', '');
+    system ("cp /usr/share/debhelper/autoscripts/triggers-octpkg debian/$package.triggers")
 }

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-08-31 09:01:09 UTC (rev 2402)
@@ -117,4 +117,4 @@
 ifneq ($(DEB_MAKE_CLEAN_TARGET),)
 	-$(MAKE) -k $(DEB_MAKE_CLEAN_TARGET)
 endif
-	rm -rf inst/$(hosttype)-$(apiversion)
+	rm -rf inst/$(hosttype)-$(apiversion) debian/triggers

Deleted: octave-pkg-dev/trunk/postinst-octpkg
===================================================================
--- octave-pkg-dev/trunk/postinst-octpkg	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/postinst-octpkg	2008-08-31 09:01:09 UTC (rev 2402)
@@ -1,5 +0,0 @@
-# -*- sh -*-
-
-if [ "$1" = configure ] ; then
-    #OCTAVE# --silent --no-history --no-init-file --eval "pkg ('rebuild');"
-fi

Deleted: octave-pkg-dev/trunk/postrm-octpkg
===================================================================
--- octave-pkg-dev/trunk/postrm-octpkg	2008-08-30 22:03:30 UTC (rev 2401)
+++ octave-pkg-dev/trunk/postrm-octpkg	2008-08-31 09:01:09 UTC (rev 2402)
@@ -1,6 +0,0 @@
-# -*- sh -*-
-
-case "$1" in
-    upgrade|remove|purge)
-        #OCTAVE# --silent --no-history --no-init-file --eval "pkg ('rebuild');"
-esac

Added: octave-pkg-dev/trunk/triggers-octpkg
===================================================================
--- octave-pkg-dev/trunk/triggers-octpkg	                        (rev 0)
+++ octave-pkg-dev/trunk/triggers-octpkg	2008-08-31 09:01:09 UTC (rev 2402)
@@ -0,0 +1 @@
+activate /usr/share/octave/packages


