Package: hugs
Version: 98.200503.08-4
Severity: minor
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Isaac,
My HaXml packages have finally entered the Debian archive, including
libhugs-haxml. I think it is time to remove the HaXml library from the
hugs binary package as it is outdated (version 0.12) and libhugs-haxml
provides the latest version of the HaXml for use with hugs.
I have attached a patch which removes the library from the binary
package. I added libhugs-haxml to the Recommends line of hugs so the
users of hugs still get HaXml with hugs (as long as they use aptitude
to install hugs that is).
Greetings Arjan
p.s. The patch also removes a backup file which clutters the
diff.gz. file. I just could not resists removing it ;-)
- - System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-3-nebula
Locale: LANG=nl_NL.UTF-8, LC_CTYPE=nl_NL.UTF-8 (charmap=UTF-8)
Versions of packages hugs depends on:
ii libc6 2.3.6-15 GNU C Library: Shared libraries
ii libncurses5 5.5-2 Shared libraries for terminal hand
ii libreadline5 5.1-7 GNU readline and history libraries
hugs recommends no packages.
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
iD8DBQFEsQnxUALvsZYuOJARAjEZAJwJhqAbo+BeUEFukJf/8cWACuD5qgCfSPcP
Lgc9xioZkx8FwKG087TugHw=
=n8CG
-----END PGP SIGNATURE-----
reverted:
--- hugs98-98.200503.08/libraries/Makefile.in~
+++ hugs98-98.200503.08.orig/libraries/Makefile.in~
@@ -1,115 +0,0 @@
-# @configure_input@
-################################################################
-# Conversion of libraries from raw sources in the fptools tree
-# (this should be a POSIX 1003.2-1992 Makefile)
-################################################################
-
[EMAIL PROTECTED]@
-
-# We use the autoconf-supplied install-sh to create directories
-# but use /bin/cp to copy data because install-sh can't copy
-# multiple files at once.
-
-INSTALL = ../install-sh
-INSTALL_DATA = /bin/cp
-CPPFLAGS = -D__HUGS__ -D$(HOST_OS)_HOST_OS -D$(HOST_OS)_TARGET_OS
-
-BUILD_DIR = ../hugsdir
-
-HEADERS = ../src/HsFFI.h
-FP_HEADERS = ../src/platform.h include/MachDeps.h include/ghcconfig.h
-
-# a file created by make include
-INCLUDES = $(BUILD_DIR)/include/HsFFI.h
-
-# We use a bootstrap procedure to construct the libraries:
-#
-# 1. Preprocess hugsbase, base, haskell98 and Cabal into bootlibs
-# using the shell script make_bootlibs. The result is incomplete,
-# in particular because hsc2hs wasn't available yet, but it's enough
-# to get ffihugs, runhugs, hsc2hs and Cabal working,
-#
-# 2. Build all the packages into ../hugsdir, using Cabal.
-#
-# Unfortunately that means building (and configuring) base twice.
-
-HSC2HS = tools/hsc2hs
-CPPHS = tools/cpphs
-MAKE_BOOT = tools/make_bootlib
-CONVERT = tools/convert_libraries
-
-all: $(BUILD_DIR)/.stamp
-
-$(BUILD_DIR)/.stamp: bootlib/.stamp $(INCLUDES) $(HSC2HS) $(CONVERT)
- $(RM) -r $(BUILD_DIR)/libraries $(BUILD_DIR)/packages
$(BUILD_DIR)/oldlib
- cd ..; libraries/$(CONVERT) fptools hugsdir
- echo timestamp for libraries >$@
-
-bootlib/.stamp: hugsbase/Hugs/*.* $(MAKE_BOOT) $(INCLUDES) $(CPPHS)
- CPPFLAGS='$(CPPFLAGS)' $(MAKE_BOOT)
- echo timestamp for bootlib >$@
-
-$(HSC2HS): ../fptools/ghc/utils/hsc2hs/Main.hs $(BOOTLIB) $(INCLUDES) $(CPPHS)
- test -d hsc2hs || mkdir hsc2hs
- $(CPPHS) $(CPPFLAGS) ../fptools/ghc/utils/hsc2hs/Main.hs hsc2hs/Main.hs
- cp ../fptools/ghc/utils/hsc2hs/template-hsc.h hsc2hs/template-hsc.h
- (echo '#! /bin/sh'; \
- echo "libdir='`pwd`'"; \
- echo '$$libdir/../src/runhugs -P$$libdir/bootlib
$$libdir/hsc2hs/Main.hs -I$$libdir/../hugsdir/include "$$@"') >$@
- chmod 755 $@
-
-$(CPPHS): $(CPPHS).sh
- sed 's:<HUGSDIR>:$(hugsdir):' $(CPPHS).sh >$@
- chmod 755 $@
-
-$(INCLUDES): $(HEADERS)
- mkdir -p $(BUILD_DIR)/include
- $(CP) $(HEADERS) $(BUILD_DIR)/include
- mkdir -p ../fptools/ghc/includes
- $(CP) $(FP_HEADERS) ../fptools/ghc/includes
-
-clean:
- $(RM) LibStatus
-
-distclean: clean
- $(RM) -r bootlib
- $(RM) -r $(BUILD_DIR)
- $(RM) Makefile
- $(RM) tools/config tools/cpphs.sh
- $(RM) tools/cpphs
- $(RM) hsc2hs/Main.hs hsc2hs/template-hsc.h tools/hsc2hs
-
-veryclean: distclean
-
-install: all
- $(INSTALL) -d $(DESTDIR)$(hugsdir)/include
- $(INSTALL_DATA) $(BUILD_DIR)/include/* $(DESTDIR)$(hugsdir)/include
- $(INSTALL) -d $(DESTDIR)$(hugsdir)/oldlib
- $(INSTALL_DATA) $(BUILD_DIR)/oldlib/* $(DESTDIR)$(hugsdir)/oldlib
- (cd $(BUILD_DIR); find libraries -type f -print) | while read file;\
- do dir=`dirname $$file`;\
- case $$file in \
- *.hs|*.lhs|*.so|*.dll) \
- $(INSTALL) -d $(DESTDIR)$(hugsdir)/$$dir;\
- $(INSTALL) -c -m 0644 $(BUILD_DIR)/$$file
$(DESTDIR)$(hugsdir)/$$file ;;\
- esac \
- done
- (cd $(BUILD_DIR); find packages -type f -print) | while read file;\
- do dir=`dirname $$file`;\
- $(INSTALL) -d $(DESTDIR)$(hugsdir)/$$dir;\
- $(INSTALL) -c -m 0644 $(BUILD_DIR)/$$file
$(DESTDIR)$(hugsdir)/$$file;\
- done
- (cd $(BUILD_DIR); find demos -type f -print) | while read file;\
- do dir=`dirname $$file`;\
- $(INSTALL) -d $(DESTDIR)$(hugsdir)/$$dir;\
- $(INSTALL) -c -m 0644 $(BUILD_DIR)/$$file
$(DESTDIR)$(hugsdir)/$$file;\
- done
- $(INSTALL) -d $(DESTDIR)$(hugsdir)/programs/hsc2hs
- $(INSTALL_DATA) hsc2hs/Main.hs hsc2hs/template-hsc.h
$(DESTDIR)$(hugsdir)/programs/hsc2hs
- (echo '#! /bin/sh'; \
- echo 'runhugs $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include
"$$@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs
- chmod 755 $(DESTDIR)$(bindir)/hsc2hs-hugs
- $(INSTALL) -c $(CPPHS) $(DESTDIR)$(bindir)/cpphs-hugs
-
-LibStatus: all
- tools/test_libraries ../fptools >$@
diff -u hugs98-98.200503.08/debian/control hugs98-98.200503.08/debian/control
--- hugs98-98.200503.08/debian/control
+++ hugs98-98.200503.08/debian/control
@@ -11,6 +11,7 @@
Conflicts: hugs98
Provides: hugs98
Replaces: hugs98
+Recommends: libhugs-haxml
Suggests: haskell-mode, haskell-doc
Section: interpreters
Priority: optional
diff -u hugs98-98.200503.08/debian/changelog
hugs98-98.200503.08/debian/changelog
--- hugs98-98.200503.08/debian/changelog
+++ hugs98-98.200503.08/debian/changelog
@@ -1,3 +1,19 @@
+hugs98 (98.200503.08-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't ship the HaXml library in the binary package anymore. It is now
+ shipped in a seperate package (libhugs-haxml).
+ - libraries/tools/convert_libraries: remove HaXml from the
+ extra_packages list.
+ - debian/rules: don't try to remove the HaXml copyright and license
+ files from the binary package.
+ - debian/control: add libhugs-haxml to the Recommends line to make apt
+ frontends, like aptitude and synaptic, install the HaXml library on
+ upgrade or install.
+ * Cleanup diff.gz by removing libraries/Makefile.in~.
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Sun, 9 Jul 2006 14:50:42 +0200
+
hugs98 (98.200503.08-4) unstable; urgency=low
* Added buid-depends on gzip (Closes: #336201).
diff -u hugs98-98.200503.08/debian/rules hugs98-98.200503.08/debian/rules
--- hugs98-98.200503.08/debian/rules
+++ hugs98-98.200503.08/debian/rules
@@ -110,9 +110,9 @@
$(RM) $(libdir)/packages/X11/LICENSE
$(RM) $(libdir)/packages/HGL/LICENSE
$(RM) $(libdir)/packages/OpenGL/LICENSE
- $(RM) $(libdir)/packages/HaXml/LICENCE-GPL
- $(RM) $(libdir)/packages/HaXml/LICENCE-LGPL
- $(RM) $(libdir)/packages/HaXml/COPYRIGHT
+# $(RM) $(libdir)/packages/HaXml/LICENCE-GPL
+# $(RM) $(libdir)/packages/HaXml/LICENCE-LGPL
+# $(RM) $(libdir)/packages/HaXml/COPYRIGHT
# Install linda and lintian overrides
$(install_dir) $(sharedir)/linda/overrides
$(install_dir) $(sharedir)/lintian/overrides
only in patch2:
unchanged:
--- hugs98-98.200503.08.orig/libraries/tools/convert_libraries
+++ hugs98-98.200503.08/libraries/tools/convert_libraries
@@ -172,7 +172,7 @@
# (each of these goes in a separate hierarchy under {Hugs}/packages)
core_packages='base haskell98 haskell-src network'
-extra_packages='Cabal QuickCheck mtl fgl HaXml parsec HUnit'
+extra_packages='Cabal QuickCheck mtl fgl parsec HUnit'
#
# ToDo: fix -- cygwin supports 'unix' only when no -mno-cygwin is given to gcc
