[Pkg-octave-commit] r2429 - in octave/trunk/debian: . in

Rafael Laboissiere rafael at alioth.debian.org
Fri Sep 19 21:43:34 UTC 2008 

Author: rafael
Date: 2008-09-19 21:43:33 +0000 (Fri, 19 Sep 2008)
New Revision: 2429

Added:
   octave/trunk/debian/in/PACKAGE-common.lintian-overrides
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.lintian-overrides
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Add -common package

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-09-18 23:46:04 UTC (rev 2428)
+++ octave/trunk/debian/changelog	2008-09-19 21:43:33 UTC (rev 2429)
@@ -1,3 +1,11 @@
+octave3.0 (1:3.0.2-4) UNRELEASED; urgency=low
+
+  * Add octaveX.Y-common package containing the architecture-independent
+    files, which were taking too much place in the architecture-dependent
+    main package octaveX.Y
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 15 Sep 2008 11:07:18 +0200
+
 octave3.0 (1:3.0.2-3) experimental; urgency=low
 
   * debian/in/PACKAGE.triggers, debian/in/PACKAGE.postinst: Use a dpkg

Added: octave/trunk/debian/in/PACKAGE-common.lintian-overrides
===================================================================
--- octave/trunk/debian/in/PACKAGE-common.lintian-overrides	                        (rev 0)
+++ octave/trunk/debian/in/PACKAGE-common.lintian-overrides	2008-09-19 21:43:33 UTC (rev 2429)
@@ -0,0 +1,2 @@
+ at PACKAGE@-common: extra-license-file usr/share/octave/@VERSION@/m/miscellaneous/license.m
+

Modified: octave/trunk/debian/in/PACKAGE.lintian-overrides
===================================================================
--- octave/trunk/debian/in/PACKAGE.lintian-overrides	2008-09-18 23:46:04 UTC (rev 2428)
+++ octave/trunk/debian/in/PACKAGE.lintian-overrides	2008-09-19 21:43:33 UTC (rev 2429)
@@ -1,5 +1,3 @@
-[V_3_1:[V_3_0:@PACKAGE@: extra-license-file usr/share/octave/@VERSION@/m/miscellaneous/license.m
- at PACKAGE@: package-contains-empty-directory usr/share/octave/@VERSION@/site/m/
 @PACKAGE@: binary-or-shlib-defines-rpath ./usr/bin/octave- at VERSION@ /usr/lib/octave- at VERSION@
- at PACKAGE@: binary-or-shlib-defines-rpath ./usr/lib/octave- at VERSION@/liboctave.so. at VERSION@ /usr/lib/octave- at VERSION@:]
- at PACKAGE@: package-contains-empty-directory usr/lib/octave/api-v33+/:]
+ at PACKAGE@: binary-or-shlib-defines-rpath ./usr/lib/octave- at VERSION@/liboctave.so. at VERSION@ /usr/lib/octave- at VERSION@
+ at PACKAGE@: package-contains-empty-directory usr/lib/octave/api-v at APIVERSION@/

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-09-18 23:46:04 UTC (rev 2428)
+++ octave/trunk/debian/in/control	2008-09-19 21:43:33 UTC (rev 2429)
@@ -23,7 +23,7 @@
 
 Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]
 Architecture: any
-Depends: ${shlibs:Depends}, texinfo
+Depends: ${shlibs:Depends}, texinfo, octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-common (= ${source:Version})
 Recommends: gnuplot, libatlas3gf-base
 Suggests: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-info,
  octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-doc,
@@ -242,3 +242,21 @@
  user-supplied C++ files.
  .
  This package provides the debug symbols.
+
+Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-common
+Section: devel
+Priority: extra
+Architecture: all
+Depends: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] (>= ${source:Version})
+Description: architecture-independent files for octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]
+ Octave is a (mostly Matlab (R) compatible) high-level language, primarily
+ intended for numerical computations. It provides a convenient command-line
+ interface for solving linear and nonlinear problems numerically.
+ .
+ Octave uses some of the best and most respected numerical libraries as
+ balgen, dassl, eispack, fftpack, lapack, linpack, minpack, odepack,
+ ranlib, slatec-fn and villad. Octave can be dynamically extended with
+ user-supplied C++ files.
+ .
+ This package provides the architecture-independent files (Octave scripts
+ and other helper files).

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-09-18 23:46:04 UTC (rev 2428)
+++ octave/trunk/debian/rules	2008-09-19 21:43:33 UTC (rev 2429)
@@ -27,9 +27,11 @@
 
 ifeq ($(major),3.1)
 priority	:= 70
+api_version	:= 33+
 else
 ifeq ($(major),3.0)
 priority	:= 90
+api_version	:= 32
 else
 ifeq ($(major),2.1)
 priority	:= 80
@@ -42,6 +44,7 @@
 dev_package	= $(PACKAGE)-headers
 emacs_package	= $(PACKAGE)-emacsen
 info_package	= $(PACKAGE)-info
+common_package = $(PACKAGE)-common
 
 debbase		:= $(CURDIR)/debian
 debtmp		:= $(debbase)/$(PACKAGE)
@@ -50,8 +53,7 @@
 debdoc		:= $(debshare)/doc/$(PACKAGE)
 debhtmldoc	:= $(debtmp)-htmldoc/usr/share/doc/$(PACKAGE)-htmldoc
 deblsp		:= $(debbase)/$(emacs_package)/usr/share/emacs/site-lisp/$(emacs_package)
-debini		:= $(debshare)/octave/site/m/startup
-debininew	:= $(debshare)/octave/$(version)/m/startup
+debini		:= $(debbase)/$(common_package)/usr/share/octave/$(version)/m/startup
 debapp		:= $(debshare)/applications
 
 savefiles	:= BUGS configure config.h.in scripts/configure	\
@@ -107,7 +109,7 @@
 	for in in debian/in/PACKAGE* ; do \
 		slice -o $(sliceterm):debian/temp $$in ; \
 		out=`echo $$in | sed 's:/in/:/:;s/PACKAGE/$(PACKAGE)/'` ; \
-		sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;' \
+		sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;s/@APIVERSION@/$(api_version)/g;' \
 			< debian/temp > $$out ; \
 	done
 	rm -f debian/temp
@@ -336,6 +338,12 @@
 	-install -p -m 0644 emacs/octave-tags.1			\
 	     $(debbase)/$(emacs_package)/usr/share/man/man1/octave-tags-$(version).1
 
+        ## link the conf.file back from /etc over the version.spec. rc
+	ln -sf /etc/$(PACKAGE).conf 		$(debini)/octaverc
+
+        # install lintian overrride
+	dh_lintian -p$(common_package)
+
 	dh_installchangelogs -i	ChangeLog
 	dh_compress -i --exclude=.pdf
 	dh_fixperms -i
@@ -353,6 +361,9 @@
         # remove the /usr/share/info/dir stab
 	rm -vf $(debtmp)/usr/share/info/dir
 
+        # Remove empty site/ dirs
+	rm -rf $$(find debian/ -name site -type d)
+
         # save the include files for the header package
 	dh_movefiles -p$(dev_package) --sourcedir=debian/$(PACKAGE)	\
 			usr/include/		 			\
@@ -365,21 +376,19 @@
 			usr/share/octave/debian/defs.make-$(version)
 	rm -r $(debtmp)/usr/include
 	rm -rf $(debtmp)/usr/share/info
-	rm -rf $(debtmp)/usr/share/octave/debian/
 
+	# install files for the common package
+	dh_movefiles -p$(common_package) --sourcedir=debian/$(PACKAGE)	\
+			usr/share/octave				\
+			usr/share/enscript
+
+	rm -rf $(debtmp)/usr/share/octave $(debtmp)/usr/share/enscript
+
 	install -p -m 0644  debian/$(PACKAGE).conf  $(debtmp)/etc
 
         # install lintian overrride
 	dh_lintian -p$(PACKAGE)
 
-        ## link the conf.file back from /etc over the version.spec. rc
-	ln -sf /etc/$(PACKAGE).conf 		$(debininew)/octaverc
-
-	# Remove empty dirs
-	rm -rf $(debshare)/octave/site	\
-		$(deblib)/octave/*/site	\
-		$(deblib)/octave/site
-
 	dh_installdocs -a			README README.kpathsea	\
 						NEWS* PROJECTS THANKS	\
 						BUGS SENDING-PATCHES

More information about the Pkg-octave-commit mailing list