[openjdk-8] 02/04: Removed icedtea-pretend-memory.diff (the patched files no longer exist)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Mar 31 15:25:15 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 2f7cb5735fff4cbd64afec9a890c3cd419134bcd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 31 16:22:32 2014 +0200

    Removed icedtea-pretend-memory.diff (the patched files no longer exist)
---
 debian/patches/icedtea-pretend-memory.diff | 22 ----------------------
 debian/rules                               |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/icedtea-pretend-memory.diff b/debian/patches/icedtea-pretend-memory.diff
deleted file mode 100644
index 9b6bbf0..0000000
--- a/debian/patches/icedtea-pretend-memory.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- openjdk/jdk/make/common/shared/Platform.gmk
-+++ openjdk/jdk/make/common/shared/Platform.gmk
-@@ -230,7 +230,7 @@
-   # Suffix for file bundles used in previous release
-   BUNDLE_FILE_SUFFIX=.tar.gz
-   # How much RAM does this machine have:
--  MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
-+  MB_OF_MEMORY := $(shell m=`free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2`; if [ "$$m" -lt 384 ]; then echo 384; else echo $$m; fi)
- endif
- 
- ifeq ($(SYSTEM_UNAME), Darwin)
---- openjdk/corba/make/common/shared/Platform.gmk
-+++ openjdk/corba/make/common/shared/Platform.gmk
-@@ -237,7 +237,7 @@
-     endif
-   endif
-   # How much RAM does this machine have:
--  MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
-+  MB_OF_MEMORY := $(shell m=`free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2`; if [ "$$m" -lt 384 ]; then echo 384; else echo $$m; fi)
- endif
- 
- ifeq ($(SYSTEM_UNAME), FreeBSD)
diff --git a/debian/rules b/debian/rules
index 853bcaa..b902d2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -320,7 +320,6 @@ DISTRIBUTION_PATCHES += \
 	debian/patches/shebang.diff \
 	debian/patches/jexec.diff \
 	debian/patches/jdk-freetypeScaler-crash.diff \
-	debian/patches/icedtea-pretend-memory.diff \
 	debian/patches/default-jvm-cfg-$(hotspot_version).diff \
 	debian/patches/nonreparenting-wm.diff \
 	debian/patches/accessible-toolkit.patch \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git



More information about the pkg-java-commits mailing list