[Pkg-haskell-commits] darcs: bnfc: Import version 2.4.2.0-1
Antti-Juhani Kaijanaho
ajk at debian.org
Sat May 11 12:01:36 UTC 2013
Sat May 11 11:51:03 UTC 2013 Antti-Juhani Kaijanaho <ajk at debian.org>
* Import version 2.4.2.0-1
Ignore-this: 1326e0781176f29741964134b07f4149
R ./README.build-system
M ./changelog -7 +24
A ./compat
M ./control -4 +3
M ./copyright -84 +19
R ./librules-manual.txt
R ./librules.mk
A ./patches/
A ./patches/dont-generate-unqualified.patch
A ./patches/generate-alex3.patch
A ./patches/remove-haskell98.patch
A ./patches/series
A ./patches/use-alex-3.patch
M ./rules -30 +12
A ./source/
A ./source/format
Sat May 11 11:51:03 UTC 2013 Antti-Juhani Kaijanaho <ajk at debian.org>
* Import version 2.4.2.0-1
Ignore-this: 1326e0781176f29741964134b07f4149
diff -rN -u old-bnfc//changelog new-bnfc//changelog
--- old-bnfc//changelog 2013-05-11 12:01:36.639022332 +0000
+++ new-bnfc//changelog 2013-05-11 12:01:36.730073156 +0000
@@ -1,3 +1,27 @@
+bnfc (2.4.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Converted to source format 3.0 (quilt).
+ * Fixed a build failure with recent GHC and Alex. New patches:
+ - remove-haskell98.patch
+ - use-alex-3.patch
+ Closes: #665063 (FTBFS: Could not find module `Char')
+ Reported by Lucas Nussbaum <lucas at lucas-nussbaum.net>.
+ * Now generates code that compiles with recent GHC and Alex. New patches:
+ - generate-alex3.patch
+ - dont-generate-unqualified.patch
+ * Removed Homepage, as it seems to have disappeared.
+ * Rewrote the packaging to use dh instead of my aging personal helper script.
+ * Rewrote debian/copyright following copyright-format/1.0.
+ * Build-Depends:
+ - Added ghc as an alternative to ghc6.
+ - Added libghc-mtl-dev|libghc6-mtl-dev as it was split off from base.
+ - Restricted alex to at least version 3.
+ - Added debhelper.
+ * Standards-Version 3.9.3.
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org> Sun, 01 Apr 2012 21:21:59 +0300
+
bnfc (2.2-3.1) unstable; urgency=low
* Non-maintainer upload.
@@ -70,10 +94,3 @@
* formats/haskell/CFtoAlex2.hs: Do not import Alex in generated code
-- Antti-Juhani Kaijanaho <ajk at debian.org> Sun, 21 Mar 2004 12:41:54 +0200
-
-bnfc (2.2-3.2) unstable; urgency=low
-
- * Non-maintainer upload.
- * Replace tabs with spaces in source files. (Closes: #460386)
-
- -- Barry deFreese <bdefreese at debian2.bddebian.com> Fri, 11 Apr 2008 10:15:28 -0400
diff -rN -u old-bnfc//compat new-bnfc//compat
--- old-bnfc//compat 1970-01-01 00:00:00.000000000 +0000
+++ new-bnfc//compat 2013-05-11 12:01:36.653525012 +0000
@@ -0,0 +1 @@
+9
diff -rN -u old-bnfc//control new-bnfc//control
--- old-bnfc//control 2013-05-11 12:01:36.627024172 +0000
+++ new-bnfc//control 2013-05-11 12:01:36.669526890 +0000
@@ -2,13 +2,12 @@
Priority: optional
Section: devel
Maintainer: Antti-Juhani Kaijanaho <ajk at debian.org>
-Build-Depends: ghc6 (>= 6.4-4.1)
-Standards-Version: 3.7.2
-Homepage: http://www.cs.chalmers.se/~markus/BNFC/
+Build-Depends: debhelper (>= 9), ghc (>= 7.0.1) | ghc6 (>= 6.10.1+dfsg1), alex (>= 3.0.1), libghc-mtl-dev | libghc6-mtl-dev
+Standards-Version: 3.9.3
Package: bnfc
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Compiler front-end generator based on Labelled BNF
The BNF Converter is a compiler construction tool that generates a
compiler front-end and a readable syntax description document from a
diff -rN -u old-bnfc//copyright new-bnfc//copyright
--- old-bnfc//copyright 2013-05-11 12:01:36.619071091 +0000
+++ new-bnfc//copyright 2013-05-11 12:01:36.657524583 +0000
@@ -1,96 +1,31 @@
-This package was Debianized by Antti-Juhani Kaijanaho <ajk at debian.org>
-on 2004-03-10. It is maintained by him.
-
-The upstream sources for this version were downloaded on 2005-04-10 from
- http://www.cs.chalmers.se/~markus/BNFC/bnfc_2.2.tgz
-
-Authors and copyright licenses:
-
- The file Alex.hs:
-
-Copyright (c) 1995-2002, Chris Dornan
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * 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.
-
- * Neither the name of the copyright holders, nor the names of the
- 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.
-
- The Debian packaging:
-
-Copyright (C) 2004 Antti-Juhani Kaijanaho
-# You may treat this file as if it were in the public domain.
-
- The file debian/librules{-manual.txt,.mk}:
-
-# Copyright © 1999, 2000, 2002, 2003, 2004 Antti-Juhani Kaijanaho.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this file, to deal in this file without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of this file, and to permit persons to whom this file is furnished
-# to do so, subject to the following condition: The above copyright
-# notice and this permission notice shall be included in all copies or
-# substantial portions of this file.
-#
-# THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL SOFTWARE IN THE PUBLIC INTEREST,
-# INC. 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 THIS FILE OR THE USE OR OTHER DEALINGS IN THIS
-# FILE.
-#
-# Except as contained in this notice, the name of the author(s) of
-# this file shall not be used in advertising or otherwise to promote
-# the sale, use or other dealings in this file without prior written
-# authorization from the author(s).
-
-
-Everything else:
-
- Copyright (C) 2004 Authors:
- Björn Bringert, Markus Forberg, Peter Gammie, Patrik Jansson,
- Antti-Juhani Kaijanaho, Michael Pellauer, Aarne Ranta
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: BNFC
+Upstream-Contact: Markus Forsberg <markus.forsberg at gu.se>
+ Aarne Ranta <aarne at chalmers.se>
+Source: http://hackage.haskell.org/packages/archive/BNFC/2.4.2.0/BNFC-2.4.2.0.tar.gz
+
+Files: *
+Copyright: Copyright (C) 2002-2010 Authors:
+ Björn Bringert, Johan Broberg, Markus Forberg, Peter Gammie,
+ Patrik Jansson, Antti-Juhani Kaijanaho, Ulf Norell,
+ Michael Pellauer, Aarne Ranta
+License: GPL-2+
+License: GPL-2+
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-The GNU General Public License, version 2 or later, is installed in
-Debian systems as /usr/share/common-licenses/GPL .
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ The GNU General Public License, version 2, is installed in
+ Debian systems as /usr/share/common-licenses/GPL-2 .
diff -rN -u old-bnfc//librules-manual.txt new-bnfc//librules-manual.txt
--- old-bnfc//librules-manual.txt 2013-05-11 12:01:36.551024353 +0000
+++ new-bnfc//librules-manual.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-Manual for the librules helper -*- Text -*-
-------------------------------
-Last modified: 2004-01-01
-
-This file documents an experimental new debian/rules helper, a
-makefile called "librules.mk", which does all the boring work of
-building a package.
-
-Usage:
-
-The very first non-comment thing in your debian/rules should be the
-following line:
-librules_interface = 2
-This helps to spot incompatibilities with debian/rules and the
-librules.mk file currently in use.
-(See the section "Incompatible changes" for what to look for when
-upgrading from an old version.)
-
-Include "debian/librules.mk" just after that line. Precede it with a
-variable definition "librules_native_pkg=yes" if the package you are building
-is a Debian native package.
-
-Define a target debian/stamp/build that builds the package (like the
-build target does in conventional debian/rules files). Put "touch $@"
-as the last action in that rule.
-
-For every binary package <package> you want to build:
-
- - If the package is "arch: all", make debian/stamp/binary/indep depend
- on debian/stamp/binary/<package>; otherwise make debian/stamp/binary/arch
- depend on that target
-
- - Write a target debian/stamp/binary/<package> using the following template:
-
-debian/stamp/binary/<package>: package=<package>
-debian/stamp/binary/<package>: debian/stamp/build
- $(prebinary)
- # Add here your own commands
- $(postbinary)
- touch $@
-
- The $(prebinary) macro will create a skeletal build tree for the
- package. It also install the copyright file (debian/copyright)
- and the Debian changelog file (debian/changelog). If there is a
- debian/NEWS, it will install it as NEWS.Debian to the
- documentation directory, compressed.
-
- See below for instructions about how to write your own install commands.
-
- The $(postbinary) macro fixes directory permissions, generates the binary
- control file and builds the package.
-
- - You may want to define targets "clean", "clean-binary" and "clean-build"
- to reverse the effects of your own commands in the build and binary targets.
- The librules.mk file cleans up for itself, you don't need to worry about that.
-
-
-How to write your own commands for binary targets:
-
-Use the following macros to install files:
-
- $(install_exec) SOURCE TARGET
- $(install_exec) SOURCE SOURCE ... DIRECTORY
- installs one or more binary executables
- (TARGET need not be a directory name)
-
- $(install_nonex) SOURCE TARGET
- $(install_nonex) SOURCE SOURCE ... DIRECTORY
- install one or more non-executable files
- (TARGET need not be a directory name)
-
- $(install_dir) DIRECTORY
- create the directory
-
- $(install_script) SOURCE TARGET
- $(install_script) SOURCE SOURCE ... DIRECTORY
- install one or more executable scripts
- (TARGET need not be a directory name)
-
- $(install_prerm)
- $(install_postrm)
- $(install_preinst)
- $(install_postinst)
- install debian/prerm.$(package) etc.
- to DEBIAN using the appropriate name
-
-The macros above are wrappers around the "install" utility.
-
- $(install_symlink) SOURCE [TARGET]
- Install a symlink from SOURCE to TARGET
- (This macro is a wrapper around ln -s)
-
- $(gzip) FILE ...
- Compress the given files
- (This is a wrapper around gzip)
-
- $(strip_lib) FILE ...
- Strip the given files the way shared libraries are stripped
- (This is a wrapper around strip)
-
-
-*Never* refer to a file in the install target tree by their real name.
-Use the following macros instead:
-
- $(rootdir) - the directory that masquerades as / in the target tree
- (usually a subdirectory under debian/tmp)
- $(ctldir) - the directory where control files are installed
- (usually $(rootdir)/DEBIAN)
- $(bindir) - the main binary directory
- (usually $(rootdir)/usr/bin)
- $(docdir) - the main doc directory
- (usually $(rootdir)/usr/share/doc/<package>)
- ...
-(see librules.mk for what's available)
-
-
-If your debian/rules needs the dpkg-architecture variables, add the
-definition "librules_need_archvars=yes" before the include at the top
-of the file. If you use this feature, you need to Build-Depend on
-"dpkg-dev (>= 1.4.1.5)".
-
-If you want to patch/unpatch the package, add the definitions
-"librules_patch_support=yes" and "librules_patches=file1.diff
-file2.diff ... filen.diff" before the include at the top of the file.
-If you use this, you need to Build-Depend on "patch".
-
-
-Incompatible changes
---------------------
-
-From 1 to 2:
- - {pre,post}{rm,inst} scripts are not installed by default
- (previously prerm and postinst were unconditionally installed)
diff -rN -u old-bnfc//librules.mk new-bnfc//librules.mk
--- old-bnfc//librules.mk 2013-05-11 12:01:36.547025520 +0000
+++ new-bnfc//librules.mk 1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-# librules.mk - a library of convenient rules and macros for debian/rules files
-#
-# Copyright © 1999, 2000, 2002, 2003, 2004 Antti-Juhani Kaijanaho.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this file, to deal in this file without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of this file, and to permit persons to whom this file is furnished
-# to do so, subject to the following condition: The above copyright
-# notice and this permission notice shall be included in all copies or
-# substantial portions of this file.
-#
-# THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL SOFTWARE IN THE PUBLIC INTEREST,
-# INC. 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 THIS FILE OR THE USE OR OTHER DEALINGS IN THIS
-# FILE.
-#
-# Except as contained in this notice, the name of the author(s) of
-# this file shall not be used in advertising or otherwise to promote
-# the sale, use or other dealings in this file without prior written
-# authorization from the author(s).
-
-# This file is set up to be compliant with Debian Standards Version
-# 3.6.0.
-
-# Changes:
-# 2004-01-01 ajk Install NEWS.Debian if it exists
-# 2003-08-10 ajk Add $(etcdir)
-# 2002-10-16 ajk Don't force installing the prerm/postinst scripts
-# Instead, install them if present.
-# INCOMPATIBLE CHANGE; updated interface to 2
-
-default:
- @echo You need to specify a target.
- @exit 1
-
-librules_a_variable_just_to_run_the_commands1 := $(shell mkdir debian/stamp)
-librules_a_variable_just_to_run_the_commands2 := $(shell mkdir debian/stamp/binary)
-
-# Make sure we don't get used by an incompatible debian/rules
-# WHEN YOU MAKE INCOMPATIBLE CHANGES, EDIT THIS!
-ifneq ($(librules_interface),2)
-$(error incompatible debian/rules)
-endif
-
-# Standard interface targets
-build: debian/stamp/build
-binary: binary-indep binary-arch
-binary-arch: debian/stamp/binary/arch
-binary-indep: debian/stamp/binary/indep
-clean: clean-build clean-binary clean-std
-
-
-# Nonstandard interface targets
-clean-build: clean-build-std
-clean-binary: clean-binary-std
-
-# Stamp targets for the standard binary targets
-debian/stamp/binary/arch: debian/stamp/build
- touch $@
-
-debian/stamp/binary/indep: debian/stamp/build
- touch $@
-
-.PHONY: default build binary binary-arch binary-indep \
- clean clean-build clean-binary
-
-ifeq ($(librules_need_archvars),yes)
-DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU = $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_CPU = $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-endif
-
-CFLAGS = -O2 -Wall
-STRIP =
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-STRIP = -s
-endif
-
-export CFLAGS
-
-install := install -o root -g root
-install_exec := $(install) -m 0755 $(STRIP)
-install_nonex := $(install) -m 0644
-install_dir := $(install) -m 0755 -d
-install_script := $(install) -m 0755
-install_symlink := ln -s
-gzip := gzip -9
-strip_lib := strip --strip-unneeded
-
-tmpdir := $(shell pwd)/debian/tmp
-
-# These must not be :='s!
-rootdir = $(tmpdir)/$(package)
-ctldir = $(rootdir)/DEBIAN
-etcdir = $(rootdir)/etc
-bindir = $(rootdir)/usr/bin
-sbindir = $(rootdir)/usr/sbin
-docdir = $(rootdir)/usr/share/doc/$(package)
-exampledir = $(docdir)/examples
-mandir = $(rootdir)/usr/share/man
-elispdir = $(rootdir)/usr/share/emacs/site-lisp
-emacs_d_dir = $(etcdir)/emacs/site-start.d
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-sharedir = $(rootdir)/usr/share/$(package)
-libdir = $(rootdir)/usr/lib/$(package)
-docbasedir = $(rootdir)/usr/share/doc-base
-usrlib = $(rootdir)/usr/lib
-includedir = $(rootdir)/usr/include
-
-ifeq ($(librules_native_pkg),yes)
-librules_changelog=changelog
-else
-librules_changelog=changelog.Debian
-endif
-
-install_prerm = $(install_script) debian/prerm.$(package) $(ctldir)/prerm
-install_postrm = $(install_script) debian/postrm.$(package) $(ctldir)/postrm
-install_preinst = $(install_script) debian/preinst.$(package) $(ctldir)/preinst
-install_postinst = $(install_script) debian/postinst.$(package) $(ctldir)/postinst
-
-
-define prebinary
- $(RM) -r $(rootdir)
- $(install_dir) $(ctldir)
- $(install_dir) $(docdir)
- $(install_nonex) debian/copyright $(docdir)
- $(install_nonex) debian/changelog $(docdir)/$(librules_changelog)
- set -e ; if test -e debian/NEWS ; then \
- $(install_nonex) debian/NEWS $(docdir)/NEWS.Debian ; \
- $(gzip) $(docdir)/NEWS.Debian ; \
- fi
- $(gzip) $(docdir)/$(librules_changelog)
-endef
-
-define postbinary
- chmod -R g-s $(rootdir)
- dpkg-gencontrol -isp -p$(package) -P$(rootdir) $(gencontrol_options)
- dpkg --build $(rootdir) ..
-endef
-
-clean-build-std:
- rm -f debian/stamp/build
-
-clean-binary-std:
- rm -f debian/stamp/binary/*
- rm -f debian/files debian/substvars
- rm -rf $(tmpdir)
-
-clean-std:
- rm -rf debian/stamp/
-
-# Patching support
-ifeq ($(librules_patch_support),yes)
-debian/stamp/build: debian/stamp/patch
-clean-build: unpatch
-
-debian/stamp/patch:
- $(foreach patch, $(librules_patches), patch -fs < $(patch) && )true
- touch $@
-
-unpatch: debian/stamp/patch
- $(foreach patch, $(librules_patches), patch -fsR < $(patch) && )true
- rm -f debian/stamp/patch
-endif
diff -rN -u old-bnfc//patches/dont-generate-unqualified.patch new-bnfc//patches/dont-generate-u[...incomplete...]
More information about the Pkg-haskell-commits
mailing list