[Pkg-octave-commit] r1513 - in octave-pkg-dev/trunk: . debian
Rafael Laboissiere
rafael at alioth.debian.org
Wed Mar 26 13:07:39 UTC 2008
Author: rafael
Date: 2008-03-26 13:07:39 +0000 (Wed, 26 Mar 2008)
New Revision: 1513
Added:
octave-pkg-dev/trunk/octave-pkg-helper.in
octave-pkg-dev/trunk/octave-pkg.mk.in
octave-pkg-dev/trunk/postinst-octpkg
octave-pkg-dev/trunk/prerm-octpkg
Removed:
octave-pkg-dev/trunk/octave-pkg-dev.mk.in
octave-pkg-dev/trunk/octave-pkg-dev.pl.in
octave-pkg-dev/trunk/postinst
octave-pkg-dev/trunk/prerm
Modified:
octave-pkg-dev/trunk/debian/changelog
octave-pkg-dev/trunk/debian/install
octave-pkg-dev/trunk/debian/rules
Log:
Reorganized the package.
+ Changed names:
- octave-pkg-dev.mk.in -> octave-pkg.mk.in
- octave-pkg-dev.pl.in -> octave-pkg-helper.in
- postinst -> postinst-octpkg
- prerm -> prerm-octpkg
+ The files are now installed in separated directories, instead of
everything in /usr/share/octave/debian/
Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/debian/changelog 2008-03-26 13:07:39 UTC (rev 1513)
@@ -1,16 +1,24 @@
octave-pkg-dev (0.5) UNRELEASED; urgency=low
+ * Reorganized the package.
+ + Changed names:
+ - octave-pkg-dev.mk.in -> octave-pkg.mk.in
+ - octave-pkg-dev.pl.in -> octave-pkg-helper.in
+ - postinst -> postinst-octpkg
+ - prerm -> prerm-octpkg
+ + The files are now installed in separated directories, instead of
+ everything in /usr/share/octave/debian/
* pkg.m, cstrcat.m: Added files from Octave's upstream hg repository (it
will appear in release 3.0.1 of Octave). This version allows
installation of Octave packages from an unpacked directory.
- * octave-pkg-dev.mk.in:
+ * octave-pkg.mk.in:
+ Install pkg from the current directory, not from the tarball
+ Drop the get-orig-source rule. Use uscan now to retrieve tarball.
Note that the .orig.tar.gz tarball is identical to the upstream
tarball now.
+ Added a clean rule
+ Drop the setting of the DEB_TARBALL variable, which is obsolete now
- * octave-pkg-dev.pl.in: Get information directly from file DESCRIPTION,
+ * octave-pkg-helper: Get information directly from file DESCRIPTION,
no need to unpack the tarball anymore
-- Rafael Laboissiere <rafael at debian.org> Tue, 25 Mar 2008 21:56:44 +0100
Modified: octave-pkg-dev/trunk/debian/install
===================================================================
--- octave-pkg-dev/trunk/debian/install 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/debian/install 2008-03-26 13:07:39 UTC (rev 1513)
@@ -1,6 +1,6 @@
-octave-pkg-dev.mk usr/share/octave/debian
-octave-pkg-dev.pl usr/share/octave/debian
-postinst usr/share/octave/debian
-prerm usr/share/octave/debian
-pkg.m usr/share/octave/debian
-cstrcat.m usr/share/octave/debian
+octave-pkg.mk usr/share/cdbs/1/class
+octave-pkg-helper usr/share/octave/debian/dh
+postinst-octpkg usr/share/debhelper/autoscripts
+prerm-octpkg usr/share/debhelper/autoscripts
+pkg.m usr/share/octave/debian/m
+cstrcat.m usr/share/octave/debian/m
Modified: octave-pkg-dev/trunk/debian/rules
===================================================================
--- octave-pkg-dev/trunk/debian/rules 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/debian/rules 2008-03-26 13:07:39 UTC (rev 1513)
@@ -5,7 +5,7 @@
OCTPKG = octave3.0
OCTVER = 3.0.0
-FILES = octave-pkg-dev.mk octave-pkg-dev.pl
+FILES = octave-pkg.mk octave-pkg-helper
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -13,7 +13,7 @@
sed 's/@OCTAVE@/$(OCTPKG)/;s/@VERSION@/$(OCTVER)/' < $< > $@
build/octave-pkg-dev:: $(FILES)
- chmod +x *.pl
+ chmod +x octave-pkg-helper
clean::
rm -f $(FILES)
Deleted: octave-pkg-dev/trunk/octave-pkg-dev.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg-dev.mk.in 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/octave-pkg-dev.mk.in 2008-03-26 13:07:39 UTC (rev 1513)
@@ -1,69 +0,0 @@
-# -*- makefile -*-
-# octave-pkg-dev.mk: debian/rules scrap for building/installing octve-forge
-# pkg add-ons
-# This file is part of the octave-pkg-dev Debian package
-
-# Copyright (c) 2008 Olafur Jens Sigurðsson <ojsbug at gmail.com>
-# Copyright (c) 2008 Rafael Laboissiere <rafael at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-package = $(shell awk '/^Package:/ {print $$2; exit 0}' debian/control)
-debpkg = debian/$(package)
-shrpkg = /usr/share/octave/debian
-mpath = usr/share/octave/packages
-bpath = usr/lib/octave/packages
-pkgname = $(package:octave-%=%)
-
-install/$(package)::
- mkdir -p $(CURDIR)/$(debpkg)/$(mpath) \
- $(CURDIR)/$(debpkg)/$(bpath)
- @OCTAVE@ -f -H -q --no-site-file --eval \
- "addpath ('$(shrpkg)', '-begin'); \
- pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'], \
- [pwd(),'/$(debpkg)/$(bpath)']); \
- pkg ('local_list', [pwd(),'.']); \
- pkg ('global_list', [pwd(),'.']); \
- pkg -verbose -nodeps install ."
- rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
- DH_AUTOSCRIPTDIR=$(shrpkg) $(shrpkg)/octave-pkg-dev.pl
-
- @echo Checking package...
-
- @tmp=$$(tempfile) ; \
- echo "addpath (genpath ([pwd(),'/debian']));" > $$tmp ; \
- find debian/ -name \*.m \
- | xargs grep -l '^%!\(assert\|test\)' \
- | perl -pe 's:.*/(.*)\.m::; \
- print "disp (\"[$$1]\")\ntest $$1"' \
- >> $$tmp ; \
- @OCTAVE@ -q --no-init-file $$tmp ; \
- rm -f $$tmp
-
- @if [ -f debian/check.m ] ; then \
- @OCTAVE@ -q --no-init-file --eval \
- "addpath (genpath ([pwd(),'/debian'])); \
- source ('debian/check.m');" ; \
- fi
-
- rmdir --ignore-fail-on-non-empty -p \
- $(CURDIR)/$(debpkg)/$(mpath) \
- $(CURDIR)/$(debpkg)/$(bpath)
-
-clean::
- -$(MAKE) -C src clean
- rm -rf inst/$(shell octave-config -p CANONICAL_HOST_TYPE)-$(shell octave-config -p API_VERSION)
Deleted: octave-pkg-dev/trunk/octave-pkg-dev.pl.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg-dev.pl.in 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/octave-pkg-dev.pl.in 2008-03-26 13:07:39 UTC (rev 1513)
@@ -1,58 +0,0 @@
-#!/usr/bin/perl -w
-
-# octave-pkg-dev.pl: Generate ${octave:Depends} variable and
-# postinst/prerm scripts
-# This file is part of the octave-pkg-dev Debian package
-
-# Copyright (c) 2008 Rafael Laboissiere <rafael at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-use strict;
-use File::Find;
-use Debian::Debhelper::Dh_Lib;
-
-init ();
-
-my %depends = ();
-
-my $deps;
-if (open (DESC, "< DESCRIPTION")) {
- while (<DESC>) {
- if (/Depends: (.*)/) {
- $deps = $1;
- last;
- }
- }
- close DESC;
- map {
- if (/([^ ]+) \((.*)\)/) {
- $depends {"octave-$1"} = $2;
- } else {
- $depends {"octave-$_"} = "";
- }
- } grep {not /^octave/} split (", ", $deps);
-}
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
- delsubstvar ($package, 'octave:Depends');
- addsubstvar ($package, 'octave:Depends', '@OCTAVE@', '>= @VERSION@');
- for my $pkg (keys %depends) {
- addsubstvar ($package, 'octave:Depends', $pkg, $depends {$pkg});
- }
- autoscript ($package, 'postinst', 'postinst', 's/#OCTAVE#/@OCTAVE@/');
- autoscript ($package, 'prerm', 'prerm', 's/#OCTAVE#/@OCTAVE@/');
-}
Copied: octave-pkg-dev/trunk/octave-pkg-helper.in (from rev 1508, octave-pkg-dev/trunk/octave-pkg-dev.pl.in)
===================================================================
--- octave-pkg-dev/trunk/octave-pkg-helper.in (rev 0)
+++ octave-pkg-dev/trunk/octave-pkg-helper.in 2008-03-26 13:07:39 UTC (rev 1513)
@@ -0,0 +1,59 @@
+#!/usr/bin/perl -w
+
+# octave-pkg-dev.pl: Generate ${octave:Depends} variable and
+# postinst/prerm scripts
+# This file is part of the octave-pkg-dev Debian package
+
+# Copyright (c) 2008 Rafael Laboissiere <rafael at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+use strict;
+use File::Find;
+use Debian::Debhelper::Dh_Lib;
+
+init ();
+
+my %depends = ();
+
+my $deps;
+if (open (DESC, "< DESCRIPTION")) {
+ while (<DESC>) {
+ if (/Depends: (.*)/) {
+ $deps = $1;
+ last;
+ }
+ }
+ close DESC;
+ map {
+ if (/([^ ]+) \((.*)\)/) {
+ $depends {"octave-$1"} = $2;
+ } else {
+ $depends {"octave-$_"} = "";
+ }
+ } grep {not /^octave/} split (", ", $deps);
+}
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+ delsubstvar ($package, 'octave:Depends');
+ addsubstvar ($package, 'octave:Depends', '@OCTAVE@', '>= @VERSION@');
+ for my $pkg (keys %depends) {
+ addsubstvar ($package, 'octave:Depends', $pkg, $depends {$pkg});
+ }
+ autoscript ($package, 'postinst', 'postinst-octpkg',
+ 's/#OCTAVE#/@OCTAVE@/');
+ autoscript ($package, 'prerm', 'prerm-octpkg', 's/#OCTAVE#/@OCTAVE@/');
+}
Copied: octave-pkg-dev/trunk/octave-pkg.mk.in (from rev 1507, octave-pkg-dev/trunk/octave-pkg-dev.mk.in)
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in (rev 0)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in 2008-03-26 13:07:39 UTC (rev 1513)
@@ -0,0 +1,71 @@
+# -*- makefile -*-
+# octave-pkg.mk: CDBS-based debian/rules scrap for building/installing
+# octave-forge pkg add-ons
+# This file is part of the octave-pkg-dev Debian package
+
+# Copyright (c) 2008 Olafur Jens Sigurðsson <ojsbug at gmail.com>
+# Copyright (c) 2008 Rafael Laboissiere <rafael at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+package = $(shell awk '/^Package:/ {print $$2; exit 0}' debian/control)
+debpkg = debian/$(package)
+shrpkg = /usr/share/octave/debian
+mpath = usr/share/octave/packages
+bpath = usr/lib/octave/packages
+pkgname = $(package:octave-%=%)
+hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
+apiversion = $(shell octave-config -p API_VERSION)
+
+install/$(package)::
+ mkdir -p $(CURDIR)/$(debpkg)/$(mpath) \
+ $(CURDIR)/$(debpkg)/$(bpath)
+ @OCTAVE@ -f -H -q --no-site-file --eval \
+ "addpath ('$(shrpkg)/m', '-begin'); \
+ pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'], \
+ [pwd(),'/$(debpkg)/$(bpath)']); \
+ pkg ('local_list', [pwd(),'.']); \
+ pkg ('global_list', [pwd(),'.']); \
+ pkg -verbose -nodeps install ."
+ rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
+ $(shrpkg)/dh/octave-pkg-helper
+
+ @echo Checking package...
+
+ @tmp=$$(tempfile) ; \
+ echo "addpath (genpath ([pwd(),'/debian']));" > $$tmp ; \
+ find debian/ -name \*.m \
+ | xargs grep -l '^%!\(assert\|test\)' \
+ | perl -pe 's:.*/(.*)\.m::; \
+ print "disp (\"[$$1]\")\ntest $$1"' \
+ >> $$tmp ; \
+ @OCTAVE@ -q --no-init-file $$tmp ; \
+ rm -f $$tmp
+
+ @if [ -f debian/check.m ] ; then \
+ @OCTAVE@ -q --no-init-file --eval \
+ "addpath (genpath ([pwd(),'/debian'])); \
+ source ('debian/check.m');" ; \
+ fi
+
+ rmdir --ignore-fail-on-non-empty -p \
+ $(CURDIR)/$(debpkg)/$(mpath) \
+ $(CURDIR)/$(debpkg)/$(bpath)
+
+clean::
+ -$(MAKE) -C src clean
+ rm -rf inst/$(hosttype)-$(apiversion)
Deleted: octave-pkg-dev/trunk/postinst
===================================================================
--- octave-pkg-dev/trunk/postinst 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/postinst 2008-03-26 13:07:39 UTC (rev 1513)
@@ -1,5 +0,0 @@
-# -*- sh -*-
-
-if [ "$1" = configure ] ; then
- #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
-fi
Copied: octave-pkg-dev/trunk/postinst-octpkg (from rev 1506, octave-pkg-dev/trunk/postinst)
===================================================================
--- octave-pkg-dev/trunk/postinst-octpkg (rev 0)
+++ octave-pkg-dev/trunk/postinst-octpkg 2008-03-26 13:07:39 UTC (rev 1513)
@@ -0,0 +1,5 @@
+# -*- sh -*-
+
+if [ "$1" = configure ] ; then
+ #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
+fi
Deleted: octave-pkg-dev/trunk/prerm
===================================================================
--- octave-pkg-dev/trunk/prerm 2008-03-26 01:08:16 UTC (rev 1512)
+++ octave-pkg-dev/trunk/prerm 2008-03-26 13:07:39 UTC (rev 1513)
@@ -1,6 +0,0 @@
-# -*- sh -*-
-
-case "$1" in
- upgrade|remove|purge)
- #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
-esac
Copied: octave-pkg-dev/trunk/prerm-octpkg (from rev 1506, octave-pkg-dev/trunk/prerm)
===================================================================
--- octave-pkg-dev/trunk/prerm-octpkg (rev 0)
+++ octave-pkg-dev/trunk/prerm-octpkg 2008-03-26 13:07:39 UTC (rev 1513)
@@ -0,0 +1,6 @@
+# -*- sh -*-
+
+case "$1" in
+ upgrade|remove|purge)
+ #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
+esac
More information about the Pkg-octave-commit
mailing list