[Pkg-octave-commit] r1212 - in octave/trunk/debian: . in
Rafael Laboissiere
rafael at alioth.debian.org
Fri Feb 22 09:36:51 UTC 2008
tags 435205 pending
thanks
Author: rafael
Date: 2008-02-22 09:36:51 +0000 (Fri, 22 Feb 2008)
New Revision: 1212
Added:
octave/trunk/debian/in/copyright
Removed:
octave/trunk/debian/copyright
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/rules
Log:
* Moved debian/copyright into debian/in/copyright and generated the
former using the slice command. This is necessary because Octave 2.1
and 3.0 are released under different versions of the GPL. Changed
debian/rules accordingly.
* debian/in/copyright: Added the mention that Octave 2.1 is released under
version 2 or later of the GPL
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2008-02-22 09:33:26 UTC (rev 1211)
+++ octave/trunk/debian/changelog 2008-02-22 09:36:51 UTC (rev 1212)
@@ -2,6 +2,12 @@
* Synched with octave3.0; in particular, switch from g77 to gfortran
* debian/control: Build-depend on dejagnu (for make check)
+ * Moved debian/copyright into debian/in/copyright and generated the
+ former using the slice command. This is necessary because Octave 2.1
+ and 3.0 are released under different versions of the GPL. Changed
+ debian/rules accordingly.
+ * debian/in/copyright: Added the mention that Octave 2.1 is released under
+ version 2 or later of the GPL (closes: #435205)
-- Rafael Laboissiere <rafael at debian.org> Fri, 22 Feb 2008 10:30:25 +0100
Deleted: octave/trunk/debian/copyright
===================================================================
--- octave/trunk/debian/copyright 2008-02-22 09:33:26 UTC (rev 1211)
+++ octave/trunk/debian/copyright 2008-02-22 09:36:51 UTC (rev 1212)
@@ -1,36 +0,0 @@
-
-This is the Debian GNU/Linux prepackaged version of the GNU Octave
-interactive numerical programming language. GNU Octave was written by
-John W. Eaton <jwe at bevo.che.wisc.edu>.
-
-This package was first initially maintained by Andrew D. Fernandes
-<adfernan at cnd.mcgill.ca> who passed it to Dale Scheetz <dwarf at polaris.net>
-and then to Dirk Eddelbuettel <edd at debian.org>. It is currently maintained
-by the Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>.
-
-The original sources can be obtained at
- ftp://ftp.octave.org
- http://www.octave.org
-
-See /usr/share/doc/octave/changelog.Debian.gz for details on the
-applied changes.
-
-GNU Octave is Copyright (C) 1992 - 2007 John W. Eaton and others
-
- Octave 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 3, or (at your option) any later
- version.
-
- Octave 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 Octave; see the file COPYING. If not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
Copied: octave/trunk/debian/in/copyright (from rev 1208, octave/trunk/debian/copyright)
===================================================================
--- octave/trunk/debian/in/copyright (rev 0)
+++ octave/trunk/debian/in/copyright 2008-02-22 09:36:51 UTC (rev 1212)
@@ -0,0 +1,36 @@
+
+This is the Debian GNU/Linux prepackaged version of the GNU Octave
+interactive numerical programming language. GNU Octave was written by
+John W. Eaton <jwe at bevo.che.wisc.edu>.
+
+This package was first initially maintained by Andrew D. Fernandes
+<adfernan at cnd.mcgill.ca> who passed it to Dale Scheetz <dwarf at polaris.net>
+and then to Dirk Eddelbuettel <edd at debian.org>. It is currently maintained
+by the Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>.
+
+The original sources can be obtained at
+ ftp://ftp.octave.org
+ http://www.octave.org
+
+See /usr/share/doc/octave/changelog.Debian.gz for details on the
+applied changes.
+
+GNU Octave is Copyright (C) 1992 - 2007 John W. Eaton and others
+
+ Octave 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 [V_2_1:2:][V_3_0:3:], or (at your option) any later
+ version.
+
+ Octave 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 Octave; see the file COPYING. If not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-[V_2_1:2:][V_3_0:3:]'.
Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules 2008-02-22 09:33:26 UTC (rev 1211)
+++ octave/trunk/debian/rules 2008-02-22 09:36:51 UTC (rev 1212)
@@ -97,13 +97,13 @@
sliceterm = UNDEF+V_$(shell echo $(PACKAGEVER) | sed s/\\./_/g)
-debian/control: debian/in/control
+debian/%: debian/in/%
slice -o $(sliceterm):$@ $<
maintainer-clean:
- rm -f debian/control
+ rm -f debian/control debian/copyright
-maintainer-scripts: debian/control
+maintainer-scripts: debian/control debian/copyright
for in in debian/in/PACKAGE* ; do \
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;' \
More information about the Pkg-octave-commit
mailing list