[Pkg-mono-svn-commits] rev 2300 - in non-group/nemerle/trunk/debian: . patches

Sebastian Dröge slomo-guest at costa.debian.org
Mon Mar 6 14:00:19 UTC 2006


Author: slomo-guest
Date: 2006-03-06 14:00:07 +0000 (Mon, 06 Mar 2006)
New Revision: 2300

Added:
   non-group/nemerle/trunk/debian/README.Debian
   non-group/nemerle/trunk/debian/libnemerle0.9-cil.install
   non-group/nemerle/trunk/debian/patches/11_disable-cs2n.dpatch
Removed:
   non-group/nemerle/trunk/debian/libnemerle-cil.install
Modified:
   non-group/nemerle/trunk/debian/changelog
   non-group/nemerle/trunk/debian/control
   non-group/nemerle/trunk/debian/copyright
   non-group/nemerle/trunk/debian/nemerle.install
   non-group/nemerle/trunk/debian/patches/00list
   non-group/nemerle/trunk/debian/rules
Log:
* updated nemerle


Added: non-group/nemerle/trunk/debian/README.Debian
===================================================================
--- non-group/nemerle/trunk/debian/README.Debian	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/README.Debian	2006-03-06 14:00:07 UTC (rev 2300)
@@ -0,0 +1,7 @@
+nemerle for Debian
+---------------------
+
+* I removed removde tools/cs2n/antlr/*.dll from the tarball as there are
+  no sources for these libraries.
+
+ -- Sebastian Dröge <slomo at ubuntu.com>, Mon, 06 Mar 2006 14:44:24 +0100

Modified: non-group/nemerle/trunk/debian/changelog
===================================================================
--- non-group/nemerle/trunk/debian/changelog	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/changelog	2006-03-06 14:00:07 UTC (rev 2300)
@@ -2,8 +2,14 @@
 
   * New upstream release
   * Initial upload to Debian (Closes: #271642)
+  * Corrected debian/copyright
+  * Don't build cs2n and remove tools/cs2n/antlr/*.dll from the tarball as we
+    don't have the sources for them.
+  * Run 'make check' after compilation
+  * Renamed the library package according to the newest addition of the CLI
+    policy to libnemerle0.9-cil
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Tue, 24 Jan 2006 15:03:15 +0100
+ -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 27 Feb 2006 10:31:56 +0100
 
 nemerle (0.3.2-2) unstable; urgency=low
 

Modified: non-group/nemerle/trunk/debian/control
===================================================================
--- non-group/nemerle/trunk/debian/control	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/control	2006-03-06 14:00:07 UTC (rev 2300)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends-Indep: debhelper (>= 4.0.0), libmono-dev (>= 1.1.9), cli-common (>= 0.2.0), mono-gmcs (>= 1.1.9) | c-sharp-2.0-compiler, dpatch, mono-gac
+Build-Depends-Indep: debhelper (>= 4.0.0), libmono-dev (>= 1.1.9), cli-common (>= 0.2.0), mono-gmcs (>= 1.1.9) | c-sharp-2.0-compiler, dpatch, mono-gac, nunit-console
 Standards-Version: 3.6.2
 
 Package: nemerle
@@ -23,10 +23,10 @@
  .
  This package contains the compiler for Nemerle and related tools
 
-Package: libnemerle-cil
+Package: libnemerle0.9-cil
 Architecture: all
 Depends: ${cli:Depends}
-Description: Class Library for Nemerle
+Description: Class Libraries for Nemerle
  Nemerle is a new functional language designed from the ground
  up for the .NET platform. Nemerle supports:
     * object oriented and imperative .NET concepts

Modified: non-group/nemerle/trunk/debian/copyright
===================================================================
--- non-group/nemerle/trunk/debian/copyright	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/copyright	2006-03-06 14:00:07 UTC (rev 2300)
@@ -1,7 +1,7 @@
 This package was debianized by Jacek Šliwerski (rzyjontko) <rzyj at plusnet.pl> on
 Sun, 19 Sep 2004 13:11:20 +0200.
 
-It was downloaded from http://nemerle.org
+It was downloaded from http:nemerle.org
 
 Upstream Authors:	Michal Moskal <michal.moskal at nemerle.org>
 			Pawel Olszta <pawel.olszta at nemerle.org>
@@ -9,9 +9,22 @@
 
 Copyright:
 
-  Copyright (c) 2003-2005 The University of Wroclaw.
+############################################
+For everything not noted explicitly below: #
+############################################
+  Copyright (c) 2003-2006 The University of Wroclaw.
+  
+  For macros/concurrency.n and lib/concurrency.n:
+  Copyright (c) 2004-2005 Ricardo Fernández Pascual <r.fernandez at ditec.um.es>
+
+  For lib/rlist.n:
+  Copyright (c) 2005 Wojciech Knapik
+
+  For tools/msbuild-task/MSBuildTask.n:
+  Copyright (c) 2005 Kamil Skalski <nazgul at nemerle.org>
+
   All rights reserved.
- 
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
@@ -38,3 +51,165 @@
 You are free to distribute this software under the terms of the BSD License.
 On Debian systems, the complete text of the BSD License can be found 
 in the file `/usr/share/common-licenses/BSD'.
+
+#######################
+For misc/nemerle.php: #
+#######################
+ Copyright: (c) 2004 Alan Juden, Nigel McNie (http:qbnz.com/highlighter/)
+            (c) 2005 Kamil Skalski
+
+  This file is part of GeSHi.
+ 
+  GeSHi 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.
+
+  GeSHi 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 GeSHi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License Version 2, found on
+Debian systems in the file /usr/share/common-licenses/GPL.
+
+###########################################
+For most parts of ncc/testsuite/frommcs/: #
+For ncc/codedom/NemerleCodeGenerator.n:   #
+###########################################
+ Copyright (c) 2001, 2002, 2003 Ximian, Inc and the individuals listed
+ on the ChangeLog entries.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+########################################
+For ncc/codedom/NemerleCodeCompiler.n: #
+########################################
+
+ Copyright (c) Novell, Inc. (http://www.novell.com)
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+###################################
+For snippets/ntrace/xmalloc.[ch]: #
+###################################
+  Copyright (C) 2002, 2003 rzyjontko
+
+  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; version 2.
+
+  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License Version 2, found on
+Debian systems in the file /usr/share/common-licenses/GPL.
+
+##############################
+For snippets/opengl/scene.n: #
+##############################
+
+Copyright 2003-2004 Randy Ridge
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither Randy Ridge nor the names of any Tao contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+
+
+
+ Copyright (c) 1993-1997, Silicon Graphics, Inc.
+ ALL RIGHTS RESERVED
+ 
+ Permission to use, copy, modify, and distribute this software for
+ any purpose and without fee is hereby granted, provided that the above
+ copyright notice appear in all copies and that both the copyright notice
+ and this permission notice appear in supporting documentation, and that
+ the name of Silicon Graphics, Inc. not be used in advertising
+ or publicity pertaining to distribution of the software without specific,
+ written prior permission.
+ 
+ THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
+ AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
+ INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
+ FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
+ GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
+ SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
+ KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
+ LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
+ THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
+

Deleted: non-group/nemerle/trunk/debian/libnemerle-cil.install
===================================================================
--- non-group/nemerle/trunk/debian/libnemerle-cil.install	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/libnemerle-cil.install	2006-03-06 14:00:07 UTC (rev 2300)
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/mono/gac
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/mono/nemerle/*.dll

Added: non-group/nemerle/trunk/debian/libnemerle0.9-cil.install
===================================================================
--- non-group/nemerle/trunk/debian/libnemerle0.9-cil.install	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/libnemerle0.9-cil.install	2006-03-06 14:00:07 UTC (rev 2300)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/mono/gac/Nemerle*/0.9*
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/mono/nemerle/Nemerle*.dll

Modified: non-group/nemerle/trunk/debian/nemerle.install
===================================================================
--- non-group/nemerle/trunk/debian/nemerle.install	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/nemerle.install	2006-03-06 14:00:07 UTC (rev 2300)
@@ -2,5 +2,4 @@
 debian/tmp/usr/lib/nemerle
 debian/ncc /usr/bin
 debian/nemish /usr/bin
-debian/cs2n /usr/bin
 misc/nemerle.el /usr/share/emacs/site-lisp/nemerle

Modified: non-group/nemerle/trunk/debian/patches/00list
===================================================================
--- non-group/nemerle/trunk/debian/patches/00list	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/patches/00list	2006-03-06 14:00:07 UTC (rev 2300)
@@ -1 +1,2 @@
 10_fix-Makefiles.dpatch
+11_disable-cs2n.dpatch

Added: non-group/nemerle/trunk/debian/patches/11_disable-cs2n.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/11_disable-cs2n.dpatch	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/patches/11_disable-cs2n.dpatch	2006-03-06 14:00:07 UTC (rev 2300)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## DP: Don't build cs2n
+
+ at DPATCH@
+--- nemerle-0.9.2/tools/Makefile.old	2006-03-06 02:29:13.052457776 +0100
++++ nemerle-0.9.2/tools/Makefile	2006-03-06 02:29:28.036179904 +0100
+@@ -34,30 +34,21 @@
+ ############################################################
+ 
+ all:
+-	$(Q)if test $(ANTLR); then \
+-		$(MAKE) -C cs2n all; \
+-	elif find cs2n/CSharpParser.cs -cnewer cs2n/csharpgrammar.g | grep -q "" ; then \
+-		$(MAKE) -C cs2n all; \
+-	fi
+ 	$(Q)$(MAKE) -C nemerlish all
+ 	$(Q)$(MAKE) -C nant-task all
+ 	$(Q)$(MAKE) -C msbuild-task all
+ 
+ install: all
+-	$(Q)if test -f cs2n/cs2n.exe ; then \
+-	  $(MAKE) -C cs2n install; fi
+ 	$(Q)$(MAKE) -C nemerlish install
+ 	$(Q)$(MAKE) -C nant-task all install
+ #	$(Q)$(MAKE) -C msbuild-task all install
+ 
+ uninstall:
+-	$(Q)-$(MAKE) -C cs2n uninstall
+ 	$(Q)-$(MAKE) -C nemerlish uninstall
+ #	$(Q)-$(MAKE) -C nant-task uninstall
+ #	$(Q)-$(MAKE) -C msbuild-task uninstall
+ 
+ clean:
+-	$(MAKE) -C cs2n clean
+ 	$(MAKE) -C nemerlish clean
+ 	$(MAKE) -C nant-task clean
+ 	$(MAKE) -C htmldumper clean


Property changes on: non-group/nemerle/trunk/debian/patches/11_disable-cs2n.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: non-group/nemerle/trunk/debian/rules
===================================================================
--- non-group/nemerle/trunk/debian/rules	2006-03-05 22:59:03 UTC (rev 2299)
+++ non-group/nemerle/trunk/debian/rules	2006-03-06 14:00:07 UTC (rev 2300)
@@ -11,7 +11,6 @@
 include /usr/share/dpatch/dpatch.make
 
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
-NEXT_MAJORVERSION = $(shell perl -e '$$_=pop; s/(\d+).\d+$$/$$1+1/e; print' $(UPVERSION))
 
 configure: configure-stamp
 configure-stamp:
@@ -21,16 +20,15 @@
 build: patch-stamp configure-stamp build-stamp
 build-stamp:
 	$(MAKE)
+	$(MAKE) check
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -rf ncc/out.stage*
-	rm -f tools/nemerlish/*.{dll,exe}
-	rm -f tools/nant-task/*.{dll,exe}
-	rm -f tools/cs2n/*.{dll,exe}
-	rm -f config.mak nemerle.pc configure.log
+	touch config.mak
+	$(MAKE) clean
+	rm -f nemerle.pc ncc/testsuite/a.xml ncc/testsuite/-bar+
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	rm -f build-stamp configure-stamp
 	dh_clean 
@@ -58,7 +56,7 @@
 	dh_installemacsen
 	dh_compress
 	dh_fixperms
-	dh_makeclilibs -m $(UPVERSION) -l $(NEXT_MAJORVERSION)
+	dh_makeclilibs -m $(UPVERSION)
 	dh_clideps
 	dh_installdeb
 	dh_gencontrol




More information about the Pkg-mono-svn-commits mailing list