The NMU diff for 1.0.0-3.1.

Bastian

-- 
Without followers, evil cannot spread.
                -- Spock, "And The Children Shall Lead", stardate 5029.5
diff -u pypy-1.0.0/debian/Makefile.in pypy-1.0.0/debian/Makefile.in
--- pypy-1.0.0/debian/Makefile.in
+++ pypy-1.0.0/debian/Makefile.in
@@ -1,33 +1,39 @@
 TARGET=pypy/translator/goal/targetpypystandalone
 
 TRANSLATE=pypy/translator/goal/translate.py
-TRANSLATEOPTS=--text --batch -b c --output=$@
+TRANSLATEOPTS=--text --batch -b c --source
 TARGETOPTS=%(TARGETOPTS)s
-TARGETOPTS_LOGIC=%(TARGETOPTS_LOGIC)s
 TARGETOPTS_STACKLESS=%(TARGETOPTS_STACKLESS)s
 PREFIX=%(PREFIX)s
 OUTPUTDIR=debian/tmp/usr/bin
 STACKLESS=--stackless
 LOGIC=-o logic
 
-BINARIES=bin/pypy bin/pypy-stackless bin/pypy-logic
+BINARIES=bin/pypy bin/pypy-stackless
 
 all: $(BINARIES)
 
-bin/pypy: bin
+.NOTPARALLEL: $(BINARIES)
+
+bin/pypy: export TMPDIR = $(CURDIR)/build-default
+bin/pypy:
+       @rm -rf $(TMPDIR)
+       mkdir $(TMPDIR)
        $(TRANSLATE) $(TRANSLATEOPTS)              $(TARGET) $(TARGETOPTS)
+       make -C $(TMPDIR)/usession-0/testing_1
+       install -D $(TMPDIR)/usession-0/testing_1/testing_1 $@
 
-bin/pypy-stackless: bin
+bin/pypy-stackless: export TMPDIR = $(CURDIR)/build-stackless
+bin/pypy-stackless:
+       @rm -rf $(TMPDIR)
+       mkdir $(TMPDIR)
        $(TRANSLATE) $(TRANSLATEOPTS) $(STACKLESS) $(TARGET) 
$(TARGETOPTS_STACKLESS)
-
-bin/pypy-logic: bin
-       $(TRANSLATE) $(TRANSLATEOPTS)              $(TARGET) 
$(TARGETOPTS_LOGIC) $(LOGIC)
-
-bin:
-       install -d bin
+       make -C $(TMPDIR)/usession-0/testing_1
+       install -D $(TMPDIR)/usession-0/testing_1/testing_1 $@
 
 clean:
        rm -rf bin
+       rm -rf build-*
        rm -rf pypy/_cache
        rm -rf py/c-extension/greenlet/build
        rm -f py/c-extension/greenlet/greenlet.so
diff -u pypy-1.0.0/debian/control pypy-1.0.0/debian/control
--- pypy-1.0.0/debian/control
+++ pypy-1.0.0/debian/control
@@ -49,18 +49,6 @@
  This package provides the pypy interpreter compiled using the C
  backend, with stackless functionality. 
 
-Package: pypy-logic
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, pypy-lib
-Description: the python in python interpreter, C backend translation
- The pypy project means to provide a python implementation of the
- Python interpreter. 
- .
- This package provides the pypy interpreter compiled using the C
- backend, using the logic objectspace. 
- . 
- homepage: http://codespeak.net/pypy/
-
 Package: pypy-doc
 Architecture: all
 Section: doc
diff -u pypy-1.0.0/debian/changelog pypy-1.0.0/debian/changelog
--- pypy-1.0.0/debian/changelog
+++ pypy-1.0.0/debian/changelog
@@ -1,3 +1,14 @@
+pypy (1.0.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Disable build of upstream removed logic object space. Remove pypy-logic
+    package. (closes: #442060)
+  * Move build output away from /tmp. (closes: #452850)
+  * Move compile step out of the main translation. This reduces the memory
+    footprint by one third.
+
+ -- Bastian Blank <[EMAIL PROTECTED]>  Tue, 27 Nov 2007 12:08:06 +0000
+
 pypy (1.0.0-3) unstable; urgency=low
 
   * Use more conservative options for platforms for which support is uncertain

Attachment: signature.asc
Description: Digital signature

Reply via email to