[SCM] mapcache branch, master, updated. upstream/1.0.0-67-g63042ca
Bas Couwenberg
sebastic at xs4all.nl
Thu Sep 12 22:06:42 UTC 2013
The following commit has been merged in the master branch:
commit f66b0806529e369ca42782ae3d8fb548a75e0554
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 11 20:15:23 2013 +0200
Drop obsolete patch: libmapcache_hardening.patch.
diff --git a/debian/changelog b/debian/changelog
index 26732c6..6fd85b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
* Build system changed from autotools to cmake.
* Drop patches:
- fixwithmapserv.patch (libtool no longer used)
+ - libmapcache_hardening.patch (libtool no longer used)
-- Bas Couwenberg <sebastic at xs4all.nl> Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/patches/libmapcache_hardening.patch b/debian/patches/libmapcache_hardening.patch
deleted file mode 100644
index 76ba3b6..0000000
--- a/debian/patches/libmapcache_hardening.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Update Makefile to enable hardening build flags for libmapcache.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Last-Update: 2013-06-21
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -17,7 +17,7 @@ source_mapserver.lo: source_mapserver.c
-
-
- libmapcache.la: $(LOBJS)
-- $(LIBTOOL) --mode=link --tag CC $(CC) -rpath $(libdir) $(LOBJS) $(LIBS) -o $@
-+ $(LIBTOOL) --mode=link --tag CC $(CC) -rpath $(libdir) $(LOBJS) $(LIBS) $(LDFLAGS) -o $@
-
- clean:
- rm -f *.o
diff --git a/debian/patches/series b/debian/patches/series
index 30c372a..f32078f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
includepath.patch
-libmapcache_hardening.patch
demo_service_js_typos.patch
demo_service_valid_js_var.patch
demo_service_html5_doctype.patch
--
Packaging for MapCache
More information about the Pkg-grass-devel
mailing list