[shapelib] 04/05: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Fri Dec 9 14:34:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository shapelib.
commit 9967b28d0c6845dcbfd4690b7692552424c008dd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Dec 9 15:25:14 2016 +0100
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/privacy-breach-generic.patch | 420 ----------------------------
debian/patches/series | 3 -
debian/patches/soversion.patch | 15 -
debian/patches/spelling-errors.patch | 49 ----
5 files changed, 1 insertion(+), 487 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 68ce34b..dc015d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
shapelib (1.4.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Fri, 09 Dec 2016 15:24:02 +0100
diff --git a/debian/patches/privacy-breach-generic.patch b/debian/patches/privacy-breach-generic.patch
deleted file mode 100644
index c94594c..0000000
--- a/debian/patches/privacy-breach-generic.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-Description: Add CSS for local use.
- Fixes privacy-breach-generic lintian issue.
-Origin: http://www.maptools.org/maptools.css
-Forwarded: http://bugzilla.maptools.org/show_bug.cgi?id=2630
-
---- /dev/null
-+++ b/web/maptools.css
-@@ -0,0 +1,357 @@
-+/* Redefined Tags */
-+
-+body {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+h1 {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 24px;
-+ line-height: 32px;
-+ color: #006699;
-+ border-bottom-width: 2px;
-+ border-bottom-style: solid;
-+ border-bottom-color: #80B3CC;
-+}
-+h2 {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 20px;
-+ line-height: 26px;
-+ color: #006699;
-+ border-bottom-width: 1px;
-+ border-bottom-style: solid;
-+ border-bottom-color: #80B3CC;
-+}
-+h3 {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 16px;
-+ line-height: 20px;
-+ font-weight: bold;
-+ color: #006699;
-+ border-bottom-width: 1px;
-+ border-bottom-style: solid;
-+ border-bottom-color: #80B3CC;
-+}
-+h4 {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 14px;
-+ line-height: 18px;
-+ font-weight: bold;
-+ color: #006699;
-+}
-+h5 {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 13px;
-+ font-weight: bold;
-+ color: #006699;
-+}
-+h6 {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ font-weight: bold;
-+}
-+
-+p {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: 16px;
-+}
-+span {
-+ font-family: Arial, Helvetica, sans-serif;
-+}
-+div {
-+ font-family: Arial, Helvetica, sans-serif;
-+}
-+blockquote {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+pre {
-+ font-family: "Courier New", Courier, mono;
-+ font-size: 12px;
-+}
-+ol {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: 16px;
-+}
-+ul {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: 16px;
-+ list-style-type: square;
-+ list-style-image: url(images/bullets/squarebullet.gif);
-+}
-+ul.download {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: 16px;
-+ list-style-type: square;
-+ list-style-image: url(images/bullets/dlbullet.gif);
-+}
-+ul.document {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: 16px;
-+ list-style-type: square;
-+ list-style-image: url(images/bullets/pagebullet.gif);
-+}
-+li {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: 16px;
-+ margin-top: 4px;
-+}
-+dl {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+dd {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+dt {
-+ margin-top: 8px;
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+td {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+font {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+}
-+
-+
-+a[href] {
-+ font-family: Arial, Helvetica, sans-serif;
-+ color: #006699;
-+ text-decoration: underline;
-+}
-+a[href]:link {
-+ font-family: Arial, Helvetica, sans-serif;
-+ color: #006699;
-+ text-decoration: underline;
-+}
-+a[href]:hover {
-+ font-family: Arial, Helvetica, sans-serif;
-+ color: #003366;
-+ text-decoration: underline;
-+}
-+a[href]:visited {
-+ font-family: Arial, Helvetica, sans-serif;
-+ color: #003366;
-+ text-decoration: underline;
-+}
-+a[href]:active {
-+ font-family: Arial, Helvetica, sans-serif;
-+ color: #199DBF;
-+ text-decoration: underline;
-+}
-+
-+
-+/* Defined Classes */
-+
-+.copyright {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 10px;
-+ line-height: 12px;
-+ color: #FFFFFF;
-+ text-decoration: none;
-+}
-+a.copyright {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 10px;
-+ line-height: 12px;
-+ color: #FFFFFF;
-+ text-decoration: none;
-+}
-+a.copyright:link {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 10px;
-+ line-height: 12px;
-+ color: #FFFFFF;
-+ text-decoration: none;
-+}
-+a.copyright:hover {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 10px;
-+ line-height: 12px;
-+ color: #FFFFFF;
-+ text-decoration: underline;
-+}
-+a.copyright:visited {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 10px;
-+ line-height: 12px;
-+ color: #FFFFFF;
-+ text-decoration: none;
-+}
-+a.copyright:active {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 10px;
-+ line-height: 12px;
-+ color: #FFFFFF;
-+ text-decoration: underline;
-+}
-+
-+
-+.TechNewsHead {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ color: #003366;
-+ line-height: 16px;
-+ margin:0px;
-+ padding: 3px;
-+ padding-top: 14px;
-+ padding-left: 20px;
-+ padding-right: 20px;
-+}
-+.TechNewsBody {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 11px;
-+ line-height: 13px;
-+ color: #000000;
-+ margin:0px;
-+ padding: 3px;
-+ padding-left: 20px;
-+ padding-right: 20px;
-+}
-+
-+
-+.Intro {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: normal;
-+ color: #003366;
-+ background-color: #EFF3F7;
-+ border: 1px dashed #DCE4ED;
-+ padding: 6px;
-+}
-+
-+.shopbox {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ line-height: normal;
-+ color: #003366;
-+ border: 1px dashed #E7E4DA;
-+ background-color: #F7F7EF;
-+ padding: 6px;
-+ padding-bottom: 18px;
-+ padding-top: 18px;
-+}
-+
-+.shopboxTitle {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 16px;
-+ line-height: 20px;
-+ font-weight: bold;
-+ margin-bottom: 2px;
-+ color: #006699;
-+ text-align: left;
-+}
-+
-+.welcomeTitle {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 16px;
-+ line-height: 18px;
-+ font-weight: bold;
-+ color: #006699;
-+ text-align: left;
-+}
-+
-+.license {
-+ padding: 5px;
-+ border: 1px solid #003366;
-+}
-+table.BlueBox {
-+ font-family: Arial, Helvetica, sans-serif;
-+ font-size: 12px;
-+ background-color: #003366;
-+ border-spacing: 1px;
-+}
-+td.BlueBox {
-+ background-color: #EFF3F7;
-+ font-size: 12px;
-+ color: #003366;
-+ margin:0px;
-+ padding: 4px;
-+}
-+
-+.BlueCopyLt {
-+ color: #006699;
-+}
-+.BlueCopyDk {
-+ color: #003366;
-+}
-+
-+
-+.SideTitle {
-+ font-size: 12px;
-+ font-weight: bold;
-+ line-height: 16px;
-+ color: #003366;
-+ margin:0px;
-+ padding: 4px;
-+ padding-left: 7px;
-+}
-+.SideMenuItem {
-+ font-size: 11px;
-+ line-height: 14px;
-+ color: #003366;
-+ margin:0px;
-+ padding:4px;
-+ padding-left: 7px;
-+}
-+.SideText {
-+ font-size: 11px;
-+ line-height: 14px;
-+ margin:0px;
-+ padding: 4px;
-+ padding-left: 7px;
-+}
-+.TopMenu {
-+ font-size: 11px;
-+ color: #FFFFFF;
-+ margin:0px;
-+ padding: 4px;
-+ padding-left: 7px;
-+}
-+
-+TopMenuItem {
-+ font-size: 11px;
-+ color: #FFFFFF;
-+}
-+
-+a.TopMenuItem {
-+ font-size: 11px;
-+ color: #FFFFFF;
-+ text-decoration: underline;
-+}
-+
-+a.TopMenuItem:link {
-+ font-size: 11px;
-+ color: #FFFFFF;
-+ text-decoration: underline;
-+}
-+
-+a.TopMenuItem:hover {
-+ font-size: 11px;
-+ color: #AFBFCF;
-+ text-decoration: underline;
-+}
-+
-+a.TopMenuItem:visited {
-+ font-size: 11px;
-+ color: #FFFFFF;
-+ text-decoration: underline;
-+}
-+
-+a.TopMenuItem:active {
-+ font-size: 11px;
-+ color: #A0CFFF;
-+ text-decoration: underline;
-+}
-+
---- a/web/index.html
-+++ b/web/index.html
-@@ -1,7 +1,7 @@
- <html>
- <head>
- <title>Shapefile C Library</title>
--<link href="http://www.maptools.org/maptools.css" rel="stylesheet" type="text/css">
-+<link href="maptools.css" rel="stylesheet" type="text/css">
- </head>
-
- <body>
---- a/web/license.html
-+++ b/web/license.html
-@@ -1,7 +1,7 @@
- <html>
- <head>
- <title>Shapelib License</title>
--<link href="http://www.maptools.org/maptools.css" rel="stylesheet" type="text/css">
-+<link href="maptools.css" rel="stylesheet" type="text/css">
- </head>
-
- <body>
---- a/web/manifest.html
-+++ b/web/manifest.html
-@@ -1,7 +1,7 @@
- <html>
- <head>
- <title>Shapefile C Library V1.2</title>
--<link href="http://www.maptools.org/maptools.css" rel="stylesheet" type="text/css">
-+<link href="maptools.css" rel="stylesheet" type="text/css">
- </head>
-
- <body>
---- a/web/release.html
-+++ b/web/release.html
-@@ -1,7 +1,7 @@
- <html>
- <head>
- <title>Shapelib Release Notes</title>
--<link href="http://www.maptools.org/maptools.css" rel="stylesheet" type="text/css">
-+<link href="maptools.css" rel="stylesheet" type="text/css">
- </head>
-
- <body>
---- a/web/shapelib-tools.html
-+++ b/web/shapelib-tools.html
-@@ -1,7 +1,7 @@
- <html>
- <head>
- <title>ShapeLib Tools - User Guide</title>
--<link href="http://www.maptools.org/maptools.css" rel="stylesheet" type="text/css">
-+<link href="maptools.css" rel="stylesheet" type="text/css">
- </head>
-
- <body>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 610ecee..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-soversion.patch
-spelling-errors.patch
-privacy-breach-generic.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
deleted file mode 100644
index 512f6d9..0000000
--- a/debian/patches/soversion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Bump SONAME due to API and ABI changes in 1.3.0.
-Author: Arto Jantunen
-Forwarded: http://bugzilla.maptools.org/show_bug.cgi?id=2628
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,7 +16,7 @@ AM_SILENT_RULES([yes])
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
- dnl See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
--AC_SUBST([SHAPELIB_SO_VERSION], [2:1:1])
-+AC_SUBST([SHAPELIB_SO_VERSION], [2:1:0])
-
- AC_PROG_CC
- AC_PROG_CXX
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 0d2e337..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Fix various spelling errors.
- * usefull -> useful
- * convertion -> conversion
- * upto -> to
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://bugzilla.maptools.org/show_bug.cgi?id=2629
-
---- a/contrib/doc/Shape_PointInPoly_README.txt
-+++ b/contrib/doc/Shape_PointInPoly_README.txt
-@@ -23,7 +23,7 @@ I wrote this function for the Autodesk A
- no function to do this in the Object Arx SDK (the Acad programming SDK). Well,
- it will be in the 2005 release...but, still. There is a function in the
- Autodesk Map 2004 version...in the menu.
--Not usefull when you need the coordinates, not the point on the screen...
-+Not useful when you need the coordinates, not the point on the screen...
- So when the Acad version was done I was thinking of doing it on the Shape files,
- too. A little bit of changing the structures and variable
- types (so they're not using Object Arx) and I was done.
---- a/web/shapelib-tools.html
-+++ b/web/shapelib-tools.html
-@@ -158,7 +158,7 @@ Shape:0 (Polygon) nVertices=4, nParts=1
- <hr>
-
- <h2><a name="shprewind">shprewind</a></h2>
--<b>Purpose</b>: validates and resets the winding order of rings in polygon geometries to match the ordering required by shapefile specification. This is usefull for shapefiles having troubles when checked with a 'shpdump -validate'.
-+<b>Purpose</b>: validates and resets the winding order of rings in polygon geometries to match the ordering required by shapefile specification. This is useful for shapefiles having troubles when checked with a 'shpdump -validate'.
- <br>
- <b>Usage</b>: <font face="courier">shprewind in_shp_file out_shp_file</font>
- <br>
-@@ -200,7 +200,7 @@ Shape:0 (Polygon) nVertices=4, nParts=1
- <br>
- <ul>
- <li><b>-v</b>: verbose mode.</li>
-- <li><b>-f</b>: forces data convertion if data field types is not the same at both files or if is there any null value into <u>from_DBFfile</u>.</li>
-+ <li><b>-f</b>: forces data conversion if data field types is not the same at both files or if is there any null value into <u>from_DBFfile</u>.</li>
- <li><b>from_DBFfile</b>: source xBase file.</li>
- <li><b>to_DBFfile</b>: destiny xBase file.</li>
- </ul>
---- a/contrib/shpgeo.c
-+++ b/contrib/shpgeo.c
-@@ -1459,7 +1459,7 @@ SHPObject* SHPClone ( SHPObject *psCShap
- highPart = psCShape->nParts ;
-
- #ifdef DEBUG
-- printf (" cloning SHP (%d parts) from ring %d upto ring %d \n",
-+ printf (" cloning SHP (%d parts) from ring %d to ring %d \n",
- psCShape->nParts, lowPart, highPart);
- #endif
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git
More information about the Pkg-grass-devel
mailing list