Package: agg
Severity: wishlist
Tags: patch
Hi,
I had some free time; see attached patches to:
- Migrate to new Copyright format 1.0; also break one lump Copyright
paragraph into individual files that the authors own copyright for.
- Improve files in debian/patches: Use DEP-3 headers for all, present
Author field first, mark URLs that no longer exist, etc.
Let me know if there is anything that needs adjusting.
Thanks for considering,
Jari
>From 41a205ae041dbfa363a004372fed40b190fefcfc Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 1 May 2012 09:34:15 +0300
Subject: [PATCH] debian-copyright
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d13f867..1d18ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+agg (2.5+dfsg1-6) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Update to Copyright Format 1.0 ; use more fine grained Copyright for files.
+ * Add DEP-3 headers to patches and canocalize files to *.patch extension.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 01 May 2012 09:25:50 +0300
+
agg (2.5+dfsg1-5) unstable; urgency=low
* Moved to Source Format Quilt.
--
1.7.10
>From 5c31797357f83e7817236b6db65144901d796e43 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 1 May 2012 09:10:24 +0300
Subject: [PATCH] copyright-format-1.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/copyright | 44 ++++++++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 10 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 7ed27f7..bb2e90b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,44 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: agg
+Upstream-Contact: Maxim Shemanarev <mcs...@antigrain.com>
Source: http://www.antigrain.com
Files: *
-Copyright: 2002 - 2006 Maxim Shemanarev <mcs...@antigrain.com>
- 2004 Stephan Assmus (supersti...@gmx.de)
- 2004 Steven Solie
- 2004 Mauricio Piacentini (SDL Support)
- 2003 Hansruedi Baer (MacOS support, b...@karto.baug.eth.ch)
-License: GPL-2.0+
+Copyright:
+ 2002-2006 Maxim Shemanarev <mcs...@antigrain.com>
+License: GPL-2+
+
+Files: include/platform/mac/agg_mac_pmap.h
+ src/platform/mac/agg_platform_support.cpp
+Copyright:
+ 2002-2006 Maxim Shemanarev <mcs...@antigrain.com>
+ 2004 2003 Hansruedi Baer <b...@karto.baug.eth.ch>
+License: GPL-2+
+
+Files: src/platform/sdl/agg_platform_support.cpp
+Copyright:
+ 2002-2006 Maxim Shemanarev <mcs...@antigrain.com>
+ 2004 Mauricio Piacentini
+License: GPL-2+
+
+Files: src/platform/BeOS/agg_platform_support.cpp
+Copyright:
+ 2002-2006 Maxim Shemanarev <mcs...@antigrain.com>
+ 2004 Stephan Assmus <supersti...@gmx.de>
+License: GPL-2+
+
+Files: src/platform/AmigaOS/agg_platform_support.cpp
+Copyright:
+ 2002-2006 Maxim Shemanarev <mcs...@antigrain.com>
+ 2004 Steven Solie
+License: GPL-2+
Files: debian/*
-Copyright: 2012 Andrea Veri <a...@debian.org>
-License: GPL-2.0+
+Copyright:
+ 2012 Andrea Veri <a...@debian.org>
+License: GPL-2+
-License: GPL-2.0+
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
--
1.7.10
>From 57bfd2808afd50ef3e9061c3e8d7650ddcf3eba1 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 1 May 2012 09:26:53 +0300
Subject: [PATCH] dep3
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
.../patches/{01_disable_gpc.diff => 01-disable-gpc.patch} | 2 +-
.../{02_maintainer_mode.diff => 02-maintainer-mode.patch} | 3 ++-
.../{03_pkg_config_pic.diff => 03-pkg-config-pic.patch} | 3 +++
debian/patches/{04_no_rpath.diff => 04-no-rpath.patch} | 3 +++
...x_recursion_crash.diff => 05-fix-recursion-crash.patch} | 5 ++++-
...missing_includes.diff => 06-fix-missing-includes.patch} | 6 ++++--
debian/patches/series | 12 ++++++------
7 files changed, 23 insertions(+), 11 deletions(-)
rename debian/patches/{01_disable_gpc.diff => 01-disable-gpc.patch} (100%)
rename debian/patches/{02_maintainer_mode.diff => 02-maintainer-mode.patch} (89%)
rename debian/patches/{03_pkg_config_pic.diff => 03-pkg-config-pic.patch} (84%)
rename debian/patches/{04_no_rpath.diff => 04-no-rpath.patch} (85%)
rename debian/patches/{05_fix_recursion_crash.diff => 05-fix-recursion-crash.patch} (77%)
rename debian/patches/{06_fix_missing_includes.diff => 06-fix-missing-includes.patch} (69%)
diff --git a/debian/patches/01_disable_gpc.diff b/debian/patches/01-disable-gpc.patch
similarity index 100%
rename from debian/patches/01_disable_gpc.diff
rename to debian/patches/01-disable-gpc.patch
index 62ea550..4fe764a 100644
--- a/debian/patches/01_disable_gpc.diff
+++ b/debian/patches/01-disable-gpc.patch
@@ -1,5 +1,5 @@
-Description: Disable GPC at build time.
Author: Andrea Veri <a...@debian.org>
+Description: Disable GPC at build time.
diff -urNad debian.source~/Makefile.am debian.source/Makefile.am
--- debian.source~/Makefile.am 2007-10-10 16:13:11.000000000 +0200
diff --git a/debian/patches/02_maintainer_mode.diff b/debian/patches/02-maintainer-mode.patch
similarity index 89%
rename from debian/patches/02_maintainer_mode.diff
rename to debian/patches/02-maintainer-mode.patch
index 6292f82..1ef9a05 100644
--- a/debian/patches/02_maintainer_mode.diff
+++ b/debian/patches/02-maintainer-mode.patch
@@ -1,5 +1,6 @@
-Description: Use AM_MAINTAINER_MODE, to avoid re-running autotools except when explicitely called in debian/rules.
Author: Andrea Veri <a...@debian.org>
+Description: Use AM_MAINTAINER_MODE, to avoid re-running autotools
+ except when explicitely called in debian/rules.
diff -urNad agg-2.5+dfsg~/configure.in agg-2.5+dfsg/configure.in
--- agg-2.5+dfsg~/configure.in 2007-07-21 19:58:06.966030999 -0500
diff --git a/debian/patches/03_pkg_config_pic.diff b/debian/patches/03-pkg-config-pic.patch
similarity index 84%
rename from debian/patches/03_pkg_config_pic.diff
rename to debian/patches/03-pkg-config-pic.patch
index 6380a22..dc16fc9 100644
--- a/debian/patches/03_pkg_config_pic.diff
+++ b/debian/patches/03-pkg-config-pic.patch
@@ -1,3 +1,6 @@
+Author: Unknown
+Description: Correct library name from agg to agg_pic for link
+
diff -urNad agg-2.3~/libagg.pc.in agg-2.3/libagg.pc.in
--- agg-2.3~/libagg.pc.in 2005-02-18 03:27:48.000000000 +0100
+++ agg-2.3/libagg.pc.in 2006-03-01 18:08:26.906950512 +0100
diff --git a/debian/patches/04_no_rpath.diff b/debian/patches/04-no-rpath.patch
similarity index 85%
rename from debian/patches/04_no_rpath.diff
rename to debian/patches/04-no-rpath.patch
index c00adf9..d3f9140 100644
--- a/debian/patches/04_no_rpath.diff
+++ b/debian/patches/04-no-rpath.patch
@@ -1,3 +1,6 @@
+Author: Unknown
+Description: Disable hard coded rpath during linking
+
diff -urNad agg-2.4~/libagg.pc.in agg-2.4/libagg.pc.in
--- agg-2.4~/libagg.pc.in 2006-07-10 11:27:16.000000000 +0200
+++ agg-2.4/libagg.pc.in 2006-07-10 11:28:51.000000000 +0200
diff --git a/debian/patches/05_fix_recursion_crash.diff b/debian/patches/05-fix-recursion-crash.patch
similarity index 77%
rename from debian/patches/05_fix_recursion_crash.diff
rename to debian/patches/05-fix-recursion-crash.patch
index b594a43..53b2985 100644
--- a/debian/patches/05_fix_recursion_crash.diff
+++ b/debian/patches/05-fix-recursion-crash.patch
@@ -1,5 +1,8 @@
-Description: Ubuntu: LP #344849, Patch: https://trac.mapnik.org/ticket/253, http://trac.mapnik.org/changeset/1801. Avoid a crash caused by an infinite recursion when drawing extremely long lines.
Author: Brian Murray <br...@ubuntu.com>
+Description: Avoid a crash caused by an infinite recursion when
+ drawing extremely long lines. Ubuntu: LP #344849
+ Patches were <https://trac.mapnik.org/ticket/253> and
+ <http://trac.mapnik.org/changeset/1801> but in 2012-05-01 no longer available.
diff -urNad agg-2.5+dfsg1~/include/agg_rasterizer_cells_aa.h agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h
--- agg-2.5+dfsg1~/include/agg_rasterizer_cells_aa.h 2007-10-10 15:06:16.000000000 -0700
diff --git a/debian/patches/06_fix_missing_includes.diff b/debian/patches/06-fix-missing-includes.patch
similarity index 69%
rename from debian/patches/06_fix_missing_includes.diff
rename to debian/patches/06-fix-missing-includes.patch
index 083e174..495a549 100644
--- a/debian/patches/06_fix_missing_includes.diff
+++ b/debian/patches/06-fix-missing-includes.patch
@@ -1,5 +1,7 @@
-Description: Add missing includes for fix compile. (LP #393923) (Upstream, https://trac.mapnik.org/changeset/1801)
-Author: Dane Springmeyer
+Author: Dane Springmeyer <dane.springme...@gmail.com>
+Description: Add missing includes for fix compile. (LP #393923)
+ Upstream patches <https://trac.mapnik.org/changeset/1801> but in
+ 2012-05-01 no longer available.
diff -pruN -x '*~' agg-2.5+dfsg1.orig/include/agg_rasterizer_cells_aa.h agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h
--- agg-2.5+dfsg1.orig/include/agg_rasterizer_cells_aa.h 2007-10-11 00:06:16.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
index e9a59ec..a2a3908 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-01_disable_gpc.diff
-02_maintainer_mode.diff
-03_pkg_config_pic.diff
-04_no_rpath.diff
-05_fix_recursion_crash.diff
-06_fix_missing_includes.diff
+01-disable-gpc.patch
+02-maintainer-mode.patch
+03-pkg-config-pic.patch
+04-no-rpath.patch
+05-fix-recursion-crash.patch
+06-fix-missing-includes.patch
--
1.7.10
