[Pkg-jed-commit] r389 - in slang-slirp/trunk/debian: . patches
Rafael Laboissiere
rafael at costa.debian.org
Sun Aug 20 11:26:08 UTC 2006
Author: rafael
Date: 2006-08-20 11:26:07 +0000 (Sun, 20 Aug 2006)
New Revision: 389
Modified:
slang-slirp/trunk/debian/changelog
slang-slirp/trunk/debian/patches/clean-config-log.patch
Log:
Debian release slang-slirp_1.9.0-1-3
Modified: slang-slirp/trunk/debian/changelog
===================================================================
--- slang-slirp/trunk/debian/changelog 2006-08-19 16:32:26 UTC (rev 388)
+++ slang-slirp/trunk/debian/changelog 2006-08-20 11:26:07 UTC (rev 389)
@@ -1,3 +1,10 @@
+slang-slirp (1.9.0-1-3) unstable; urgency=low
+
+ * debian/patches/clean-config-log.patch: Removed spurious part of this
+ patch
+
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 19 Aug 2006 18:35:12 +0200
+
slang-slirp (1.9.0-1-2) unstable; urgency=low
* debian/rules: Build PIC code (closes: #383777, closes: #383779)
Modified: slang-slirp/trunk/debian/patches/clean-config-log.patch
===================================================================
--- slang-slirp/trunk/debian/patches/clean-config-log.patch 2006-08-19 16:32:26 UTC (rev 388)
+++ slang-slirp/trunk/debian/patches/clean-config-log.patch 2006-08-20 11:26:07 UTC (rev 389)
@@ -10,237 +10,3 @@
@for dir in $(EXAMPLES) ; do \
(cd examples/$$dir; $(MAKE) clean) ; \
done
-diff -Nur slirp-1.9.0-1/Makefile.in~ slirp-1.9.0-1.new/Makefile.in~
---- slirp-1.9.0-1/Makefile.in~ 1970-01-01 01:00:00.000000000 +0100
-+++ slirp-1.9.0-1.new/Makefile.in~ 2006-06-28 22:49:59.000000000 +0200
-@@ -0,0 +1,230 @@
-+# -*- sh -*-
-+############################################################################
-+#
-+# Makefile for SLIRP, the (Sl)ang (I)nte(r)face (P)ackage
-+#
-+# Copyright (C) 2003-2006 Massachusetts Institute of Technology
-+# Copyright (C) 2002 Michael S. Noble <mnoble at space.mit.edu>
-+#
-+############################################################################
-+
-+SHELL = /bin/sh
-+RM = \rm -f
-+RM_R = \rm -rf
-+LN = @LN_S@
-+EXEEXT = @EXEEXT@
-+PATH_SEP = @PATH_SEP@
-+CONFIG_DIR = @CONFIG_DIR@
-+
-+SCRIPTS =\
-+ slirp.sl \
-+ slirpc++.sl \
-+ slirpf2c.sl \
-+ slirpmaps.sl \
-+ slirputils.sl \
-+ builtins.sl\
-+ \
-+ slsh.rc\
-+ autoload.sl\
-+ require.sl\
-+ arrayfuns.sl
-+
-+SUPPORT_CODE =\
-+ dispatch.c \
-+ nullargs.c \
-+ ntstrarr.c \
-+ refs.c \
-+ vectorize.h \
-+ vectorize.c \
-+ debug.c \
-+ usage.c \
-+ opaques.c \
-+ fortran.c \
-+ fortran.h \
-+ intro.h \
-+ copyright.h \
-+ unix.mf \
-+ compat.h
-+
-+IMPORTIFY=admin/importify
-+PREP=preproc
-+PREP_MODULE_CODE = $(PREP)/$(PREP)-module.c
-+SLSHEXT=slshext
-+SLSHEXT_CODE=$(SLSHEXT).c
-+MAN_DIRS = man1
-+MAN_PAGES = man1/slirpsh.1 man1/slirp.1
-+
-+.SUFFIXES: .sl .slc
-+
-+CONF_DIR="$(CONFIG_DIR)"
-+PATH_DIR=".$(PATH_SEP)$(CONFIG_DIR)"
-+
-+#---------------------------------------------------------------------------
-+# Section: Compiler and related libraries
-+#---------------------------------------------------------------------------
-+
-+CC = @CC@ $(PROFILE)
-+CFLAGS = @CFLAGS@ @SLANG_INC@
-+LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
-+DL_LIB = @DYNAMIC_LINK_LIB@
-+SLANGLIB = @SLANG_LIB@ -lslang
-+ELF_DEP_LIBS = @ELF_DEP_LIBS@
-+
-+#---------------------------------------------------------------------------
-+# Primary build macros and rules (NB: 'all' is first target defined)
-+#---------------------------------------------------------------------------
-+
-+.PHONY: all clean distclean install uninstall
-+
-+EXENAME = slirpsh$(EXEEXT)
-+all: $(EXENAME) slsh $(SCRIPTS)
-+
-+SLIRPSH_NAME=$(EXENAME)
-+RPATH=@RPATH@
-+$(SLIRPSH_NAME): slirpsh.c
-+ @echo ""
-+ @echo "Bootstrapping code generator ..."
-+ @echo ""
-+ $(CC) -I. -I$(PREP) $(CFLAGS) \
-+ -DLINKAGE= \
-+ -DSLSH_CONF_DIR='$(CONF_DIR)' \
-+ -DSLSH_PATH='$(PATH_DIR)' $? -o $@ \
-+ $(SLANGLIB) $(LDFLAGS) $(RPATH) $(ELF_DEP_LIBS)
-+
-+installable_slirpsh:
-+ $(MAKE) -e slirpsh.ins \
-+ CONF_DIR=\"$(install_pkg_dir)\" \
-+ PATH_DIR=\"$(install_pkg_dir)\" \
-+ PATH_DIR=\"$(install_pkg_dir)\" \
-+ SLIRPSH_NAME=slirpsh.ins
-+
-+slsh: $(EXENAME)
-+ $(RM) $@
-+ $(LN) $? $@
-+
-+# This approach is cleaner than trying to use the sed append command,
-+# which requires multiple lines and is ugly to embed w/in Makefiles
-+slirpsh.h:
-+ echo "#include <slang.h>" > $@
-+ echo "#include \"compat.h\"" >> $@
-+
-+slirpsh.c: slirpsh.h slsh.c $(PREP_MODULE_CODE) $(SLSHEXT_CODE) $(IMPORTIFY)
-+ cat slsh.c $(PREP_MODULE_CODE) $(SLSHEXT_CODE) \
-+ | sed 's/<slang.h>/"slirpsh.h"/' > $@.tmp
-+ $(IMPORTIFY) -m real_main -p -q -s $@.tmp $(PREP) $(SLSHEXT) > $@
-+ -$(RM) $@.tmp
-+
-+#---------------------------------------------------------------------------
-+# Section: Installation rules
-+#---------------------------------------------------------------------------
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+DESTDIR =
-+install_bin_dir = $(DESTDIR)@bindir@
-+install_pkg_dir = $(DESTDIR)@datadir@/slirp
-+install_man_dir = $(DESTDIR)@mandir@
-+
-+MKINSDIR = admin/mkinsdir.sh
-+INSTALLER = @INSTALL@
-+INSTALL_DATA = $(INSTALLER) -m 644
-+INSTALL_BIN = $(INSTALLER) -m 755
-+PACKAGES = $(SCRIPTS) $(SUPPORT_CODE)
-+
-+install_dirs:
-+ $(MKINSDIR) $(install_pkg_dir)
-+ $(MKINSDIR) $(install_bin_dir)
-+ for m in $(MAN_DIRS) ; do \
-+ $(MKINSDIR) $(install_man_dir)/$$m ; \
-+ done
-+
-+install_manpages:
-+ @if [ -d CVS ] ; then \
-+ $(MAKE) docs ; \
-+ fi
-+ for m in $(MAN_PAGES) ; do \
-+ $(INSTALL_DATA) doc/man/$$m $(install_man_dir)/$$m ; \
-+ done
-+
-+install_exes: installable_slirpsh
-+ $(INSTALL_BIN) slirpsh.ins $(install_bin_dir)/$(EXENAME)
-+ $(INSTALL_BIN) slirp $(install_bin_dir)
-+
-+install_packages:
-+ @for F in $(PACKAGES); do \
-+ echo $(INSTALL_DATA) $$F $(install_pkg_dir); \
-+ $(INSTALL_DATA) $$F $(install_pkg_dir); \
-+ if [ $$? -ne 0 ] ; then false; fi ;\
-+ done
-+
-+install: all install_dirs install_exes install_packages install_manpages
-+
-+install_static: # contribute nothing to SLgtk static binary distro
-+
-+uninstall:
-+ @echo
-+ @echo Removing installed SLIRP components ...
-+ @echo
-+ -for F in $(PACKAGES) ; do \
-+ $(RM) $(install_pkg_dir)/$$F ; \
-+ done
-+ $(RM) $(install_bin_dir)/slirp
-+ $(RM) $(install_bin_dir)/$(EXENAME)
-+ for m in $(MAN_PAGES) ; do \
-+ $(RM) $(install_man_dir)/$$m ; \
-+ done
-+
-+
-+#---------------------------------------------------------------------------
-+# Miscellaneous informational/housekeeping rules
-+#---------------------------------------------------------------------------
-+
-+EXAMPLES = kitchensink cpp fortran makef stubs opengl vec
-+clean:
-+ -$(RM) *.slc slsh $(EXENAME) slirpsh.* *~
-+ @for dir in $(EXAMPLES) ; do \
-+ (cd examples/$$dir; $(MAKE) clean) ; \
-+ done
-+
-+distclean: clean
-+ (cd doc/tm ; $(MAKE) distclean)
-+ @for dir in $(EXAMPLES) ; do \
-+ (cd examples/$$dir; $(MAKE) distclean) ; \
-+ done
-+ -$(RM) slirputils.sl slirp builtins.sl Makefile intro.h \
-+ config.h config.log config.status unix.mf \
-+ examples/Makefile.inc
-+
-+test:
-+ @$(MAKE)
-+ @for dir in $(EXAMPLES) ; do \
-+ $(MAKE) TEST_DIR=examples/$$dir test_dir ; \
-+ done
-+
-+QUIET=>/dev/null
-+test_dir:
-+ @echo
-+ @echo Testing $(TEST_DIR) ...
-+ @(cd $(TEST_DIR) ; $(MAKE) $(QUIET) 2>&1; $(MAKE) test $(QUIET))
-+ @echo " ... passed"
-+
-+warnings:
-+ if test -d CVS ; then \
-+ $(MAKE) warnings_real ; \
-+ fi
-+
-+# WARN_NEX turns off -Wnested-externs for g++, since 3.x versions now complain
-+warnings_real:
-+ cd examples/kitchensink ;$(MAKE) >/dev/null ; $(MAKE) warnings
-+ cd examples/cpp ;$(MAKE) >/dev/null ; $(MAKE) -e WARN_NEX= warnings
-+ cd examples/fortran;$(MAKE) >/dev/null ; $(MAKE) -e WARN_PROTO= warnings
-+ cd examples/stubs ;$(MAKE) >/dev/null ; $(MAKE) -e WARN_NEX= warnings
-+
-+docs:
-+ (cd doc/tm; $(MAKE) install)
-+
-+VERSION="@SLIRP_VERSION_STRING@@SLIRP_REVISION@"
-+srcdist: test warnings docs
-+ packit -a slirp slgtk/slirp $(VERSION)
-+
-+dist: srcdist
More information about the Pkg-jed-commit
mailing list