r3146 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2015-06-15 05:37:26 + (Mon, 15 Jun 2015) New Revision: 3146 Modified: packages/mbsystem/trunk/debian/changelog Log: new upstream release, the last to support GMT4 Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2014-08-26 00:48:15 UTC (rev 3145) +++ packages/mbsystem/trunk/debian/changelog2015-06-15 05:37:26 UTC (rev 3146) @@ -1,11 +1,11 @@ -mbsystem (5.4.2202-0) UNRELEASED; urgency=low +mbsystem (5.4.2220-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages * Added doc-base registration * Enable GSF support (now licensed by SAIC as LGPL 2.1) - -- M. Hamish Bowman hamish.webmail gmail.com Tue, 26 Aug 2014 12:46:48 +1200 + -- M. Hamish Bowman hamish.webmail gmail.com Mon, 15 Jun 2015 17:31:55 +1200 mbsystem (5.1.2-0) UNRELEASED; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3145 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2014-08-26 00:48:15 + (Tue, 26 Aug 2014) New Revision: 3145 Modified: packages/mbsystem/trunk/debian/changelog Log: new upstream release, update my email addr Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2014-07-26 09:35:47 UTC (rev 3144) +++ packages/mbsystem/trunk/debian/changelog2014-08-26 00:48:15 UTC (rev 3145) @@ -1,15 +1,15 @@ -mbsystem (5.4.2199-0) UNRELEASED; urgency=low +mbsystem (5.4.2202-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages * Added doc-base registration * Enable GSF support (now licensed by SAIC as LGPL 2.1) - -- Hamish Bowman hamish_b yahoo.com Sat, 26 Jul 2014 20:51:13 +1200 + -- M. Hamish Bowman hamish.webmail gmail.com Tue, 26 Aug 2014 12:46:48 +1200 mbsystem (5.1.2-0) UNRELEASED; urgency=low * Initial packaging * Update for new 5.1.2 release - -- Hamish Bowman hamish_b yahoo.com Fri, 1 Jan 2010 21:17:28 +1300 + -- M. Hamish Bowman hamish.webmail gmail.com Fri, 1 Jan 2010 21:17:28 +1300 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#758685: gmt: pscoast segfaults with gmt-gshhs-low
Package: gmt Version: 4.5.12-1 Severity: important Hi, running GMT's pscoast with the latest gmt-gshhs-low (or -full or -high, or gmt-coast-low) causes a segfault. gmt package version 4.5.12-1 gmt-gshhs-low package version 2.2.0-2 I've experienced this in the past when the GSHHS data version went out of sync with the version gmt was expected, but that's not necessarily the cause this time. There are a couple reports about this on the GMT mailing list, and an Ubuntu bug report about it, including a stripped backtrace. see: https://bugs.launchpad.net/ubuntu/+source/gmt/+bug/1349718 http://gmt.soest.hawaii.edu/boards/1/topics/730 http://thread.gmane.org/gmane.comp.gis.gmt.user/21512 I can reproduce this in the today's sid; install the gmt-examples package, then run: $ cp -r /usr/share/doc/gmt-examples/examples/ gmt-examples cd gmt-examples/ ./do_examples.csh # or just try as in the Ubuntu ticket, $ pscoast -Rg -JH0/6i -Glightgray /dev/null *** Error in `pscoast': double free or corruption (!prev): 0x025099f0 *** Aborted thanks, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#758685: gmt: pscoast segfaults with gmt-gshhs-low
) continue;
(gdb) list
769
770 for (direction = start_direction; paint_polygons
direction = stop_direction; direction += 2) {
771
772 /* Assemble one or more segments into
polygons */
773
774 if ((np = (int)GMT_assemble_shore (c,
direction, TRUE, shift, west_border, east_border, p)) == 0) continue;
775
776 /* Get clipped polygons in x,y inches that
can be plotted */
777
778 np_new = (int)GMT_prep_polygons (p, np,
donut_hell, step, bin_trouble);
(gdb) frame 7
#7 0x7790179e in GMT_assemble_shore (c=0x7fff17c0, dir=1,
assemble=1, shift=0, west=-180, east=180, pol=0x7fff1478)
at gmt_shore.c:667
667 p[0].n = GMT_graticule_path (p[0].lon, p[0].lat,
dir, c-lon_corner[3], c-lon_corner[1], c-lat_corner[0],
c-lat_corner[2]);
(gdb) list
662 p = (struct GMT_GSHHS_POL *) GMT_memory (VNULL,
(size_t)p_alloc, sizeof (struct GMT_GSHHS_POL), GMT_assemble_shore);
663
664 low_level = GMT_MAX_GSHHS_LEVEL;
665
666 if (completely_inside use_this_level) { /* Must
include path of this bin outline as first polygon */
667 p[0].n = GMT_graticule_path (p[0].lon, p[0].lat,
dir, c-lon_corner[3], c-lon_corner[1], c-lat_corner[0],
c-lat_corner[2]);
668 p[0].level = (c-node_level[0] == 2 c-flag ==
GMT_NO_LAKES) ? 1 : c-node_level[0]; /* Any corner will do */
669 p[0].fid = p[0].level; /* Assumes no riverlake is
that big to contain an entire bin */
670 p[0].interior = FALSE;
671 P = 1;
(gdb) frame 5
#5 0x77919449 in GMT_free (addr=0x688a50) at gmt_support.c:2634
2634free (addr);
(gdb) list
2629{
2630if (!addr) return; /* Do not try to free a NULL
pointer! */
2631#ifdef DEBUG
2632GMT_memtrack_sub (GMT_mem_keeper, fname, line, addr);
2633#endif
2634free (addr);
2635}
2636
2637#ifdef DEBUG
2638GMT_LONG GMT_alloc_memory_func (void **ptr, GMT_LONG n, GMT_LONG
n_alloc, size_t element_size, char *module, char *fname, GMT_LONG line)
thanks,
Hamish
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#757308: grass: Please update to use wxpython3.0
Hi, grass 6.4.4.packaging is currently (basically) ready in DebianGIS git. Frankie is just returned, hopefully refreshed, and so with luck that will be reviewed and uploaded in the very near future. If there are parts of the patch suitable for upstream I would be happy to commit them, just be aware that changes (even debian/patches/) should be compatible back to at least squeeze and Ubuntu 10.04 LTS, since we aim for wide cross-platform compatibility. i.e. backports are pretty trivial right now, and they should stay that way. thanks, Hamish ps- grass64 and grass70 deb packages can co-exist (I'm already doing that), and like Octave, for a time it will be good for Debian to ship both versions. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#757308: grass: Please update to use wxpython3.0
Hamish wrote: grass 6.4.4.packaging is currently (basically) ready in DebianGIS git. Sebastiaan: But not by using git-import-orig. The upstream branch hasn't been updated with the grass_6.4.4.orig.tar.gz contents. it was done in the master branch, http://git.linuxminded.nl/?p=pkg-grass/grass;a=commit;h=d183a32b883dbad88e0d751d030e177dd90926a0 tagging is currently incomplete, but known todo and discussed privately. ... You should run lintian showing all tags after your build to get an idea of what is left to fix before I would consider an upload. er, you really think we don't do that and know exactly what they are? We've been busy packaging this software for more than a dozen years! Not masking false positives and real but won't-fix in this major version lintian issues is not a bug IMHO. No doubt the main rules file could use a bit of a refresh here and there (supporting 'make -j' would be nice), but let's continue this conversation on the DebainGIS list, not in a ticket about transitioning to wxpython3.0. regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/01: add patch to fix help-about name parsing, change my email addr
This is an automated email from the git hooks/post-receive script.
hamish-guest pushed a commit to branch master
in repository grass.
commit 3e122e8a5395aeee1294d456411542f01ec5cbe6
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Mon Aug 11 18:11:13 2014 +1200
add patch to fix help-about name parsing, change my email addr
---
debian/changelog| 3 ++-
debian/patches/help_about_names | 21 +
debian/patches/series | 1 +
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 6702835..f35cb4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,13 @@ grass (6.4.4-1) UNRELEASED; urgency=low
[ M. Hamish Bowman ]
* Packaged new upstream version, drop redundant patches.
* Dropped version dependency on libgdal-dev for easier backports.
+ * Added patch to fix Help-About parsing.
[ Francesco Paolo Lovergine ]
* Debhelper level set to 9.
* Vcs-* fields are now canonical to make lintian happy.
- -- M. Hamish Bowman hamis...@yahoo.com Sun, 03 Aug 2014 18:33:07 +1200
+ -- M. Hamish Bowman hamish.webm...@gmail.com Mon, 11 Aug 2014 18:09:42
+1200
grass (6.4.3-3) unstable; urgency=medium
diff --git a/debian/patches/help_about_names b/debian/patches/help_about_names
new file mode 100644
index 000..713d260
--- /dev/null
+++ b/debian/patches/help_about_names
@@ -0,0 +1,21 @@
+Index: grass/gui/wxpython/gui_core/ghelp.py
+===
+--- grass.orig/gui/wxpython/gui_core/ghelp.py (revision 58704)
grass/gui/wxpython/gui_core/ghelp.py (revision 61335)
+@@ -605,15 +605,15 @@
+ contribFile = codecs.open(contribfile, encoding = 'utf-8', mode =
'r')
+ contribs = list()
+ errLines = list()
+ for line in contribFile.readlines()[1:]:
+ line = line.rstrip('\n')
+ try:
+ if extra:
+-name, email, rfc2_agreed = line.split(',')
++name, email, country, rfc2_agreed = line.split(',')
+ else:
+ cvs_id, name, email, country, osgeo_id, rfc2_agreed =
line.split(',')
+ except ValueError:
+ errLines.append(line)
+ continue
+ if extra:
+ contribs.append((name, email))
diff --git a/debian/patches/series b/debian/patches/series
index e7797bd..05819e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pager
xterm
instdir
check4dev
+help_about_names
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch master updated (8a6692c - 3e122e8)
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a change to branch master in repository grass. from 8a6692c provides the current ABI version new 3e122e8 add patch to fix help-about name parsing, change my email addr The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog| 3 ++- debian/patches/help_about_names | 21 + debian/patches/series | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 debian/patches/help_about_names -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch master updated (2035fc5 - e2d8fc8)
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a change to branch master in repository grass. from 2035fc5 sync with upstream icon .desktop file modifications new e2d8fc8 urgency back to low The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/01: urgency back to low
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a commit to branch master in repository grass. commit e2d8fc86d16ef3cdadf36a87b55d6fc00045048d Author: M. Hamish Bowman hamis...@yahoo.com Date: Fri Aug 8 19:24:55 2014 +1200 urgency back to low --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index adfb4af..6702835 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -grass (6.4.4-1) UNRELEASED; urgency=medium +grass (6.4.4-1) UNRELEASED; urgency=low [ M. Hamish Bowman ] * Packaged new upstream version, drop redundant patches. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch master updated (e2d8fc8 - 8a6692c)
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a change to branch master in repository grass. from e2d8fc8 urgency back to low new 8a6692c provides the current ABI version The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/01: provides the current ABI version
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a commit to branch master in repository grass. commit 8a6692cf9f7a61b396e7d34bf9ae9956463a9d6d Author: M. Hamish Bowman hamis...@yahoo.com Date: Fri Aug 8 22:03:33 2014 +1200 provides the current ABI version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9431053..3f02cb5 100644 --- a/debian/control +++ b/debian/control @@ -90,7 +90,7 @@ Suggests: wget | curl, # used by r.in.wms xml2 -Provides: grass643 +Provides: grass644 Description: GRASS GIS core components Commonly referred to as GRASS, this is a Geographic Information System (GIS) used for geospatial data management and analysis, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/01: sync with upstream icon .desktop file modifications
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a commit to branch master in repository grass. commit 2035fc525f549da0555687ddfc42b1b371be7f0c Author: M. Hamish Bowman hamis...@yahoo.com Date: Wed Aug 6 20:48:27 2014 +1200 sync with upstream icon .desktop file modifications --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 258aa68..ffe2bff 100755 --- a/debian/rules +++ b/debian/rules @@ -233,7 +233,7 @@ install: build install -m 644 gui/icons/grass.desktop \ debian/tmp/usr/share/applications/$(BASE_NAME).desktop # n.b. 6.4.1 shipped with grass65 as the Exec target - sed -i -e 's+/usr/share/icons/grass-48x48.png+$(BASE_NAME)+' \ + sed -i -e 's+Icon=grass+Icon=$(BASE_NAME)+' \ debian/tmp/usr/share/applications/$(BASE_NAME).desktop # install x-grass wrapper script -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch master updated (a1f791e - d183a32)
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a change to branch master in repository grass. from a1f791e Minor changes on the d-policy side. new d183a32 updates for 6.4.4 release The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: AUTHORS| 6 +- COPYING| 5 +- ChangeLog_6.4.3.gz | Bin 563795 - 0 bytes ChangeLog_6.4.4.gz | Bin 0 - 577386 bytes INSTALL| 4 +- REQUIREMENTS.html | 2 +- SUBMITTING | 2 +- SUBMITTING_SCRIPTS | 4 +- SUBMITTING_TCLTK | 2 +- aclocal.m4 | 6 +- config.guess | 192 +- config.sub |30 +- configure | 1653 +- configure.in |17 +- contributors.csv | 1 + contributors_extra.csv |78 +- db/base/columns.c | 6 + db/base/copy.c | 8 + db/base/db.columns.html| 2 +- db/base/db.connect.html|31 +- db/base/db.copy.html | 2 +- db/base/db.createdb.html | 2 +- db/base/db.databases.html | 2 +- db/base/db.describe.html | 2 +- db/base/db.drivers.html| 2 +- db/base/db.dropdb.html | 2 +- db/base/db.droptable.html | 2 +- db/base/db.execute.html| 2 +- db/base/db.select.html | 2 +- db/base/db.tables.html | 2 +- db/base/select.c |10 +- db/db.login/description.html |30 +- db/db.login/main.c |20 +- db/drivers/dbf/dbfexe.c| 1 + db/drivers/dbf/grass-dbf.html | 2 +- db/drivers/mysql/grass-mesql.html |15 +- db/drivers/mysql/grass-mysql.html |15 +- db/drivers/odbc/grass-odbc.html| 2 +- db/drivers/ogr/grass-ogr.html | 2 +- db/drivers/postgres/grass-pg.html |18 +- db/drivers/sqlite/execute.c|17 +- db/drivers/sqlite/grass-sqlite.html| 2 +- debian/changelog | 9 +- debian/control | 2 +- debian/patches/barscale_ui |99 - debian/patches/fix_big-endian_issues | 151 - debian/patches/series | 3 - debian/patches/svn-any-version |26 - display/d.ask/description.html | 2 +- display/d.barscale/description.html| 2 +- display/d.barscale/main.c |11 +- display/d.barscale/mouse.c | 3 +- display/d.colorlist/description.html | 2 +- display/d.colors/description.html | 2 +- display/d.colors/get_info.c|14 +- display/d.colortable/description.html | 2 +- display/d.erase/description.html | 2 +- display/d.extend/description.html | 2 +- display/d.extract/description.html | 2 +- display/d.font.freetype/description.html | 2 +- display/d.font/description.html| 2 +- display/d.frame/description.html | 2 +- display/d.geodesic/description.html| 2 +- display/d.graph/description.html | 6 +- display/d.grid/description.html| 2 +- display/d.his/description.html | 2 +- display/d.histogram/description.html | 2 +- display/d.info/description.html| 2 +- display/d.legend/description.html | 2 +- display/d.linegraph/description.html | 2 +- display/d.linegraph/linegraph.c| 2 +- display
[grass] 01/01: updates for 6.4.4 release
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a commit to branch master in repository grass. commit 4d140487e3be3a5cbaaa81a20ae8ad37c976e0ca Author: M. Hamish Bowman hamis...@yahoo.com Date: Mon Aug 4 16:39:29 2014 +1200 updates for 6.4.4 release --- debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.in b/debian/control.in index 6c676bc..2a72ecd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev (= 1.10.0-0~), + libgdal-dev, libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch master updated (d183a32 - 4d14048)
This is an automated email from the git hooks/post-receive script. hamish-guest pushed a change to branch master in repository grass. from d183a32 updates for 6.4.4 release new 4d14048 updates for 6.4.4 release The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3144 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2014-07-26 09:35:47 + (Sat, 26 Jul 2014) New Revision: 3144 Modified: packages/mbsystem/trunk/debian/TODO packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/rules Log: update to lastest upstream release; enable GSF support (now licensed as LGPL) Modified: packages/mbsystem/trunk/debian/TODO === --- packages/mbsystem/trunk/debian/TODO 2014-07-15 14:16:54 UTC (rev 3143) +++ packages/mbsystem/trunk/debian/TODO 2014-07-26 09:35:47 UTC (rev 3144) @@ -2,7 +2,6 @@ * Integrate the GMT coastline(s) * Audit remove bundled libraries (libproj) -* Remove GSF code until license statement is made clear * Document copyright for LevitusAnnual82.dat global water properties database (US Fed. Gov't product, NOAA) Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2014-07-15 14:16:54 UTC (rev 3143) +++ packages/mbsystem/trunk/debian/changelog2014-07-26 09:35:47 UTC (rev 3144) @@ -1,11 +1,11 @@ -mbsystem (5.4.2183-0) UNRELEASED; urgency=low +mbsystem (5.4.2199-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages * Added doc-base registration - * GSF support disabled (unclear SAIC copyright status) + * Enable GSF support (now licensed by SAIC as LGPL 2.1) - -- Hamish Bowman hamish_b yahoo.com Sat, 22 Mar 2014 14:22:58 +1300 + -- Hamish Bowman hamish_b yahoo.com Sat, 26 Jul 2014 20:51:13 +1200 mbsystem (5.1.2-0) UNRELEASED; urgency=low Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2014-07-15 14:16:54 UTC (rev 3143) +++ packages/mbsystem/trunk/debian/rules2014-07-26 09:35:47 UTC (rev 3144) @@ -15,8 +15,7 @@ dh_auto_configure -- \ --includedir=/usr/include/mbsystem \ --docdir=/usr/share/doc/mbsystem/docs \ - --with-gmt-include=/usr/include/gmt \ - --without-gsf + --with-gmt-include=/usr/include/gmt # dpkg-buildflags needed for hardening support if compat is held at '8'. # The --exp=config doesn't exist on Squeeze, remove the line when building ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3142 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2014-04-22 04:01:33 + (Tue, 22 Apr 2014) New Revision: 3142 Modified: packages/mbsystem/trunk/debian/control Log: support for building on ubuntu 14.04 where lesstif isn't available Modified: packages/mbsystem/trunk/debian/control === --- packages/mbsystem/trunk/debian/control 2014-04-18 08:24:28 UTC (rev 3141) +++ packages/mbsystem/trunk/debian/control 2014-04-22 04:01:33 UTC (rev 3142) @@ -4,8 +4,8 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: M. Hamish Bowman hamis...@yahoo.com Build-depends: debhelper (= 8), dh-autoreconf, - libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, - libgl1-mesa-dev, libfftw3-dev, libproj-dev + libgmt-dev, lesstif2-dev | libmotif-dev, libxt-dev, libnetcdf-dev, + libglu1-mesa-dev, libgl1-mesa-dev, libfftw3-dev, libproj-dev Standards-Version: 3.9.4 Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/ Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mbsystem/trunk/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3141 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2014-04-18 08:24:28 + (Fri, 18 Apr 2014) New Revision: 3141 Modified: packages/mbsystem/trunk/debian/changelog Log: sync to new upstream release Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2014-03-22 09:35:46 UTC (rev 3140) +++ packages/mbsystem/trunk/debian/changelog2014-04-18 08:24:28 UTC (rev 3141) @@ -1,4 +1,4 @@ -mbsystem (5.4.2176-0) UNRELEASED; urgency=low +mbsystem (5.4.2183-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3140 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2014-03-22 09:35:46 + (Sat, 22 Mar 2014) New Revision: 3140 Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/mbsystem-doc.install packages/mbsystem/trunk/debian/rules Log: update for upstream release 5.4.2176; explicit autoconf no longer needed Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2014-03-16 01:09:27 UTC (rev 3139) +++ packages/mbsystem/trunk/debian/changelog2014-03-22 09:35:46 UTC (rev 3140) @@ -1,11 +1,11 @@ -mbsystem (5.4.2149-0) UNRELEASED; urgency=low +mbsystem (5.4.2176-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages * Added doc-base registration * GSF support disabled (unclear SAIC copyright status) - -- Hamish Bowman hamish_b yahoo.com Sun, 02 Jun 2013 13:09:24 +1200 + -- Hamish Bowman hamish_b yahoo.com Sat, 22 Mar 2014 14:22:58 +1300 mbsystem (5.1.2-0) UNRELEASED; urgency=low Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install === --- packages/mbsystem/trunk/debian/mbsystem-doc.install 2014-03-16 01:09:27 UTC (rev 3139) +++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2014-03-22 09:35:46 UTC (rev 3140) @@ -1,2 +1,2 @@ -usr/share/doc/mbsystem/html /usr/share/doc/mbsystem-doc/docs/ -usr/share/doc/mbsystem/ps /usr/share/doc/mbsystem-doc/docs/ +usr/share/doc/mbsystem/docs/html /usr/share/doc/mbsystem-doc/docs/ +usr/share/doc/mbsystem/docs/ps /usr/share/doc/mbsystem-doc/docs/ Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2014-03-16 01:09:27 UTC (rev 3139) +++ packages/mbsystem/trunk/debian/rules2014-03-22 09:35:46 UTC (rev 3140) @@ -7,20 +7,16 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ --parallel --with autoreconf + dh $@ --parallel -override_dh_autoreconf: - [ ! -x ./autogen.sh ] || ./autogen.sh - dh_autoreconf - override_dh_auto_configure: + $(shell dpkg-buildflags --export=configure) \ dh_auto_configure -- \ --includedir=/usr/include/mbsystem \ --docdir=/usr/share/doc/mbsystem/docs \ --with-gmt-include=/usr/include/gmt \ - --without-gsf \ - $(shell dpkg-buildflags --export=configure) + --without-gsf # dpkg-buildflags needed for hardening support if compat is held at '8'. # The --exp=config doesn't exist on Squeeze, remove the line when building ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3138 - in packages/opencpn/trunk/debian: . patches
Author: hamish-guest Date: 2014-03-16 00:54:44 + (Sun, 16 Mar 2014) New Revision: 3138 Modified: packages/opencpn/trunk/debian/changelog packages/opencpn/trunk/debian/patches/series Log: activate patches for libgps20 support and hardening flags for plugins Modified: packages/opencpn/trunk/debian/changelog === --- packages/opencpn/trunk/debian/changelog 2014-03-03 19:31:27 UTC (rev 3137) +++ packages/opencpn/trunk/debian/changelog 2014-03-16 00:54:44 UTC (rev 3138) @@ -9,12 +9,15 @@ * Suggests xtide and zygrib * Add DEP-5 comments to copyright file explaining embedded copies * Policy bumped to 3.9.3, without changes. + * Compile main program with hardening flags and -fPIC. + * Patch adding support for libgps20, backported from upstream 3.0.0 release. + * Patch allowing hardening CFLAGS to make it through to plugin builds. * Closing ITP. (Closes: #538067) [ Anton Martchukov ] * Additional copyright file auditing - -- M. Hamish Bowman hamis...@yahoo.com Thu, 01 Mar 2012 12:53:43 +1300 + -- M. Hamish Bowman hamis...@yahoo.com Sun, 16 Mar 2014 13:51:34 +1300 opencpn (2.4.708-0) unstable; urgency=low Modified: packages/opencpn/trunk/debian/patches/series === --- packages/opencpn/trunk/debian/patches/series2014-03-03 19:31:27 UTC (rev 3137) +++ packages/opencpn/trunk/debian/patches/series2014-03-16 00:54:44 UTC (rev 3138) @@ -2,3 +2,5 @@ ref_debian_gpl2.patch ref_debian_doc_dir.patch use_pkg_tinyxml.patch +backport_libgps20_support.patch +allow_harden_plugins.patch ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3139 - packages/opencpn/trunk/debian
Author: hamish-guest
Date: 2014-03-16 01:09:27 + (Sun, 16 Mar 2014)
New Revision: 3139
Modified:
packages/opencpn/trunk/debian/control
Log:
bump libgps version
Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control 2014-03-16 00:54:44 UTC (rev
3138)
+++ packages/opencpn/trunk/debian/control 2014-03-16 01:09:27 UTC (rev
3139)
@@ -13,7 +13,7 @@
Package: opencpn
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgps20
Recommends: gpsd, opencpn-data, opencpn-doc, xtide-coastline
Suggests: opencpn-plugins, gpsd-clients, xcalib, xtide, zygrib
Description: GPS ChartPlotter/Navigator
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#741004: rfe: add support for WebP format
Package: gdal-bin Version: 1.10.1+dfsg-3 Severity: wishlist Hi, it would be nice if support for WebP was built in to GDAL. WebP is a modern JPEG-alike from Google, based on the VP8 codec. The libwebp package in Debian is BSD licensed. needed: GDAL Version = 1.9.0 control: Build-Depends: libwebp-dev rules: ./configure --with-webp more info at http://www.gdal.org/frmt_webp.html thanks, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#735814: ossim: FTBFS: configure: error: libtiff support required!
Hi, I thought I'd do an info drop. So in the past years Frankie maintained the package from DebianGIS git on Alioth (now the git repo on spawn-of-Alioth). http://anonscm.debian.org/gitweb/?p=pkg-grass/ossim.git;a=summary and you'll see there that he started on packaging the newer 1.8 version, with libtiff updated, but I think he found the build system too much of a mess so stopped working on it in favour of letting someone else on the DebianGIS team try. Since then OSSIM has moved to cmake and the build system is much improved. A fine Google of Code student named M. Rashad worked on OSSIM last summer, and after the summer was over started on new-generation OSSIM deb packages. Hopefully me Massimo can convince him to join DebianGIS and continue the work there. :-) Anyway it is his packages you'll find in UbuntuGIS's ppa, and yes, they'll be a good starting point for the Mk III version of the OSSIM package in Debian. (see also ancient ossim-old/ in alioth pkg-grass svn repo for MkI) regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#728150: grass: FTBFS on ia64, preventing migration to testing
I hope you are aware of the current build failure on ia64: ... which prevents the migration of grass to testing. I will try to look into it, but the experience of grass maintainers might be a lot more useful than my eyes. Hi, yes, we're aware of it; sorry not much insight so far on how to fix it. also I'm a little surprised that the ppc64 and s390x big-endian error* seems to have fixed itself without us applying our patch-from-trunk to it yet. (??) [*] http://bugs.debian.org/672719 thanks, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#672719: grass: FTBFS on s390x
It's still happening with the 6.4.3-2 package on s390x. build log: https://buildd.debian.org/status/package.php?p=grass copied upstream as https://trac.osgeo.org/grass/ticket/2085 Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#723974: grass FTBFS on buildds because it build depends on versioned virtual package
thanks, suggest to revise instructions in the libtiff transition guide: http://lists.debian.org/debian-release/2013/05/msg00127.html * If your package depended on libtiff5-dev, change it to depend on libtiff-dev, or to help future backporters, on libtiff-dev ( 4.0.3-1~). see also http://lists-archives.com/debian-devel/190135-libtiff-borken-cannot-build-anymore.html note the suggested README.Debian in the libtiff5-alt-dev package doesn't seem to exist. regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-127-g0b309cf
The following commit has been merged in the master branch:
commit 0b309cfaa2e8a9f0bebe3a438885770f412830fe
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Sat Sep 21 15:51:12 2013 +1200
Sort out watch file
diff --git a/debian/changelog b/debian/changelog
index 70b5de5..15b638f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (6.4.3-2) unstable; urgency=low
+
+ * Sort out watch file.
+
+ -- M. Hamish Bowman hamis...@yahoo.com Sat, 21 Sep 2013 15:46:48 +1200
+
grass (6.4.3-1) unstable; urgency=low
[ M. Hamish Bowman ]
diff --git a/debian/watch b/debian/watch
index 64b3f2a..c1a57e8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://grass.osgeo.org/grass64/source/grass-([\d\.]*(?:RC\d){0,1}).tar.gz
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+ http://grass.osgeo.org/grass64/source/grass-([\d\.]*(?:RC\d){0,1}).tar.gz
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, alioth/alioth/svn-import/6.4, created. debian/6.2.2-2-13-g046df71
The branch, alioth/alioth/svn-import/6.4 has been created at 046df71ea78fc1c7d324792f9ed84acc061f30ad (commit) - Shortlog --- -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-123-g45a1edf
The following commit has been merged in the master branch: commit 45a1edfd95de061ec2df5cc21693297edbe7d5a8 Author: M. Hamish Bowman hamis...@yahoo.com Date: Wed Sep 11 21:05:55 2013 +1200 autoconf isn't run by rules, so patch configure too diff --git a/debian/patches/svn-any-version b/debian/patches/svn-any-version index 681675a..c37d578 100644 --- a/debian/patches/svn-any-version +++ b/debian/patches/svn-any-version @@ -11,3 +11,16 @@ Index: grass/configure.in GRASS_VERSION_SVN= fi fi +Index: grass/configure +=== +--- grass.orig/configure grass/configure +@@ -1313,7 +1313,7 @@ fi + + if test $SVN_VERSION != no ; then +GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:` +- if test $GRASS_VERSION_SVN = exported ; then ++ if test $GRASS_VERSION_SVN = exported -o $GRASS_VERSION_SVN = Unversioned directory ; then + GRASS_VERSION_SVN= +fi + fi -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-124-g3e0161d
The following commit has been merged in the master branch: commit 3e0161dac38aa759e00e04b351772e8900239b2f Author: M. Hamish Bowman hamis...@yahoo.com Date: Wed Sep 11 21:18:25 2013 +1200 Prepare for libtiff-dev transition. Keep libtiff5-dev first in the OR series otherwise it auto-pulls in libtiff4-dev which doesn't support BigTiff. (see http://debian-release/2013/05/msg00127.html) diff --git a/debian/changelog b/debian/changelog index a7ba1bc..1d49914 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ grass (6.4.3-1) unstable; urgency=low * Build-Depends on libmotif-dev for Motif transition. (closes: #714679) * Partial enable of the hardening flags. + * Prepare for libtiff-dev transition. (debian-release/2013/05/msg00127.html) - -- M. Hamish Bowman hamis...@yahoo.com Tue, 10 Sep 2013 12:50:42 +1200 + -- M. Hamish Bowman hamis...@yahoo.com Wed, 11 Sep 2013 14:17:50 +1200 grass (6.4.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index c0e8c56..159729a 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-depends: libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, - libtiff5-dev | libtiff4-dev, + libtiff5-dev | libtiff-dev | libtiff4-dev, libmysqlclient-dev | libmysqlclient15-dev, libncurses5-dev, libpq-dev, -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-121-gabf5aac
The following commit has been merged in the master branch: commit abf5aacc0f86043b950fc9258af750441bc08ba8 Author: M. Hamish Bowman hamis...@yahoo.com Date: Tue Sep 10 18:35:11 2013 +1200 Subversion 1.7 changed strings on us, adjust tests to match new behaviour (grass ticket #587) diff --git a/debian/patches/series b/debian/patches/series index ee9d410..88de269 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ xterm instdir check4dev barscale_ui +svn-any-version diff --git a/debian/patches/svn-any-version b/debian/patches/svn-any-version new file mode 100644 index 000..681675a --- /dev/null +++ b/debian/patches/svn-any-version @@ -0,0 +1,13 @@ +Index: grass/configure.in +=== +--- grass.orig/configure.in grass/configure.in +@@ -130,7 +130,7 @@ + AC_PATH_PROG(SVN_VERSION, svnversion, no) + if test $SVN_VERSION != no ; then +GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:` +- if test $GRASS_VERSION_SVN = exported ; then ++ if test $GRASS_VERSION_SVN = exported -o $GRASS_VERSION_SVN = Unversioned directory ; then + GRASS_VERSION_SVN= +fi + fi -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3124 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-09-09 23:48:24 + (Mon, 09 Sep 2013) New Revision: 3124 Added: packages/mbsystem/trunk/debian/gmt_path-MBSys.sh Modified: packages/mbsystem/trunk/debian/TODO packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/mbsystem.install Log: add GMT binaries to the PATH if needed Modified: packages/mbsystem/trunk/debian/TODO === --- packages/mbsystem/trunk/debian/TODO 2013-07-16 18:57:45 UTC (rev 3123) +++ packages/mbsystem/trunk/debian/TODO 2013-09-09 23:48:24 UTC (rev 3124) @@ -1,8 +1,5 @@ TODO: -* GMT binaries are not in the $PATH by default. Deal with that or - make a large patch adding it to the PATH at the start of each - of the MB scripts and hardcoding the full path into the C code. * Integrate the GMT coastline(s) * Audit remove bundled libraries (libproj) * Remove GSF code until license statement is made clear Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-07-16 18:57:45 UTC (rev 3123) +++ packages/mbsystem/trunk/debian/changelog2013-09-09 23:48:24 UTC (rev 3124) @@ -1,4 +1,4 @@ -mbsystem (5.4.2128-0) UNRELEASED; urgency=low +mbsystem (5.4.2149-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages Added: packages/mbsystem/trunk/debian/gmt_path-MBSys.sh === --- packages/mbsystem/trunk/debian/gmt_path-MBSys.sh (rev 0) +++ packages/mbsystem/trunk/debian/gmt_path-MBSys.sh2013-09-09 23:48:24 UTC (rev 3124) @@ -0,0 +1,7 @@ +# add GMT binaries to the PATH if needed + +GMTBIN=/usr/lib/gmt/bin + +if [ `echo $PATH | grep -c $GMTBIN` -eq 0 ] ; then + PATH=$PATH:$GMTBIN +fi Property changes on: packages/mbsystem/trunk/debian/gmt_path-MBSys.sh ___ Added: svn:mime-type + text/x-sh Added: svn:eol-style + native Modified: packages/mbsystem/trunk/debian/mbsystem.install === --- packages/mbsystem/trunk/debian/mbsystem.install 2013-07-16 18:57:45 UTC (rev 3123) +++ packages/mbsystem/trunk/debian/mbsystem.install 2013-09-09 23:48:24 UTC (rev 3124) @@ -1,3 +1,4 @@ usr/bin usr/lib/*.so.* usr/share/man +debian/gmt_path-MBSys.sh /etc/profile.d/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-120-g3c0ae9c
The following commit has been merged in the master branch:
commit d44d5848119b1b507f81e2ad1d24638273b570d4
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Tue Sep 10 12:59:18 2013 +1200
prepare for 6.4.3
diff --git a/debian/changelog b/debian/changelog
index 1a83be0..a7ba1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-grass (6.4.2-3) unstable; urgency=low
+grass (6.4.3-1) unstable; urgency=low
+ * Packaged new upstream version.
* Build-Depends on libpng-dev for LibPNG transition.
(closes: #662361)
* grass-dev needs to depend on libfreetype6-dev for building addons.
- * Enable GEOS support
+ * Enable GEOS support.
* Build-Depends on libmotif-dev for Motif transition.
(closes: #714679)
- * Partial enable of the hardening flags
+ * Partial enable of the hardening flags.
- -- M. Hamish Bowman hamis...@yahoo.com Mon, 05 Aug 2013 08:22:19 +1200
+ -- M. Hamish Bowman hamis...@yahoo.com Tue, 10 Sep 2013 12:50:42 +1200
grass (6.4.2-2) unstable; urgency=low
diff --git a/debian/patches/iostream_cpp470 b/debian/patches/iostream_cpp470
deleted file mode 100644
index 35b1b12..000
--- a/debian/patches/iostream_cpp470
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: grass/lib/iostream/mm.cc
-===
grass.orig/lib/iostream/mm.cc (revision 48704)
-+++ grass/lib/iostream/mm.cc (revision 51638)
-@@ -254,11 +254,11 @@
- }
-
-
-
- /* */
--void* operator new[] (size_t sz) {
-+void* operator new[] (size_t sz) throw(std::bad_alloc) {
- void *p;
-
- MM_DEBUG cout new: sz= sz , register
-sz+SIZE_SPACE B ,;
-
-@@ -305,11 +305,11 @@
- }
-
-
-
- /* */
--void* operator new (size_t sz) {
-+void* operator new (size_t sz) throw(std::bad_alloc) {
- void *p;
-
- MM_DEBUG cout new: sz= sz , register
-sz+SIZE_SPACE B ,;
-
-@@ -357,11 +357,11 @@
-
-
-
-
- /* -- */
--void operator delete (void *ptr) {
-+void operator delete (void *ptr) throw() {
- size_t sz;
- void *p;
-
- MM_DEBUG cout delete: ptr= ptr ,;
-
-@@ -397,11 +397,11 @@
-
-
-
-
- /* -- */
--void operator delete[] (void *ptr) {
-+void operator delete[] (void *ptr) throw() {
- size_t sz;
- void *p;
-
- MM_DEBUG cout delete[]: ptr= ptr ,;
-
-Index: grass/include/iostream/mm.h
-===
grass.orig/include/iostream/mm.h (revision 32629)
-+++ grass/include/iostream/mm.h(revision 51638)
-@@ -108,14 +108,14 @@
- intspace_overhead ();
-
- void print();
-
- friend class mm_register_init;
-- friend void * operator new(size_t);
-- friend void * operator new[](size_t);
-- friend void operator delete(void *);
-- friend void operator delete[](void *);
-+ friend void * operator new(size_t) throw(std::bad_alloc);
-+ friend void * operator new[](size_t) throw(std::bad_alloc);
-+ friend void operator delete(void *) throw();
-+ friend void operator delete[](void *) throw();
- };
-
-
-
-
-Index: grass/include/iostream/minmaxheap.h
-===
grass.orig/include/iostream/minmaxheap.h (revision 41531)
-+++ grass/include/iostream/minmaxheap.h(revision 51638)
-@@ -742,11 +742,11 @@
- HeapIndex MinMaxHeapT::fill(T* arr, HeapIndex n) {
- HeapIndex i;
- //heap must be empty
- assert(this-size()==0);
- for (i = 0; !full() in; i++) {
--insert(arr[i]);
-+this-insert(arr[i]);
- }
- if (i n) {
- assert(i == this-maxsize);
- return n - i;
- } else {
-@@ -775,17 +775,17 @@
-
- assert(this-maxsize 0);
-
- if(old) {
- HeapIndex n = this-size();
-- this-A = allocateHeap(this-maxsize); /* allocate a new array */
-+ this-A = this-allocateHeap(this-maxsize); /* allocate a new array */
- /* copy over the old values */
- assert(this-maxsize n);
- for(HeapIndex i=0; i=n; i++) { /* why extra value? -RW */
- this-A[i] = old[i];
- }
-- freeHeap(old); /* free up old storage */
-+ this-freeHeap(old);/* free up old storage */
- }
-
- }
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 2272ff9..ee9d410 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@ pager
xterm
instdir
check4dev
-iostream_cpp470
+barscale_ui
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-118-gd94988b
The following commit has been merged in the master branch:
commit d94988be2956049262fcf8dd06118d9a60ec218e
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Mon Aug 5 08:25:31 2013 +1200
add patch for 6.4.3 barscale set options traceback #2054 (deactivated until
6.4.3 is master), note previous hardening flags partial-enable in changelog
diff --git a/debian/changelog b/debian/changelog
index de5ea0d..1a83be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ grass (6.4.2-3) unstable; urgency=low
* Enable GEOS support
* Build-Depends on libmotif-dev for Motif transition.
(closes: #714679)
+ * Partial enable of the hardening flags
- -- M. Hamish Bowman hamis...@yahoo.com Sun, 14 Jul 2013 10:18:40 +1200
+ -- M. Hamish Bowman hamis...@yahoo.com Mon, 05 Aug 2013 08:22:19 +1200
grass (6.4.2-2) unstable; urgency=low
diff --git a/debian/patches/barscale_ui b/debian/patches/barscale_ui
new file mode 100644
index 000..9e33dd6
--- /dev/null
+++ b/debian/patches/barscale_ui
@@ -0,0 +1,99 @@
+Index: grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py
+===
+--- grass.orig/gui/wxpython/gui_core/forms.py
grass/gui/wxpython/gui_core/forms.py
+@@ -1256,49 +1256,47 @@
+ default_color, label_color = color_resolve(p['value'])
+ if p.get('prompt', '') == 'color_none' or
p.get('multiple', False):
+ this_sizer = wx.BoxSizer(orient = wx.HORIZONTAL)
+ else:
+ this_sizer = which_sizer
+ colorSize = 150
+ # For color selectors, this is a three-member array,
holding the IDs of
+-# the text control for multiple colors (or None),
+-# the selector proper and either a transparent checkbox
or None
++# the color picker, the text control for multiple colors
(or None),
++# and either a transparent checkbox or None
++p['wxId'] = [None] * 3
+ if p.get('multiple', False):
+ txt = wx.TextCtrl(parent = which_panel, id =
wx.ID_ANY)
+ this_sizer.Add(item = txt, proportion = 1,
+flag = wx.ADJUST_MINSIZE | wx.LEFT |
wx.TOP, border = 5)
+ txt.Bind(wx.EVT_TEXT, self.OnSetValue)
+ colorSize = 40
+ label_color = ''
+-p['wxId'] = [txt.GetId(),]
++p['wxId'][1] = txt.GetId()
+ which_sizer.Add(this_sizer, flag = wx.EXPAND |
wx.RIGHT, border = 5)
+-else:
+-p['wxId'] = [None,]
+
+ btn_colour = csel.ColourSelect(parent = which_panel, id =
wx.ID_ANY,
+label = label_color,
colour = default_color,
+pos = wx.DefaultPosition,
size = (colorSize,-1))
+ this_sizer.Add(item = btn_colour, proportion = 0,
+flag = wx.ADJUST_MINSIZE | wx.BOTTOM |
wx.LEFT, border = 5)
+ btn_colour.Bind(csel.EVT_COLOURSELECT,
self.OnColorChange)
+-p['wxId'].append(btn_colour.GetId())
++p['wxId'][0] = btn_colour.GetId()
+
+ if p.get('prompt', '') == 'color_none':
+ none_check = wx.CheckBox(which_panel, wx.ID_ANY,
_(Transparent))
+ if p.get('value','') != '' and
p.get('value',[''])[0] == none:
+ none_check.SetValue(True)
+ else:
+ none_check.SetValue(False)
+ this_sizer.Add(item = none_check, proportion = 0,
+flag = wx.ADJUST_MINSIZE | wx.LEFT |
wx.RIGHT | wx.TOP, border = 5)
+ which_sizer.Add(this_sizer)
+ none_check.Bind(wx.EVT_CHECKBOX, self.OnColorChange)
+-p['wxId'].append(none_check.GetId())
+-else:
+-p['wxId'].append(None)
++p['wxId'][2] = none_check.GetId()
++
+ # file selector
+ elif p.get('prompt','') != 'color' and p.get('element', '')
== 'file':
+ if p.get('age', 'new_file') == 'new_file':
+ fmode = wx.SAVE
+ else:
+ fmode = wx.OPEN
+ fbb = filebrowse.FileBrowseButton(parent = which_panel,
id = wx.ID_ANY, fileMask = '*',
+@@ -1627,33 +1625,33 @@
+
+ self.Layout()
+
+ def OnColorChange(self, event):
+ myId = event.GetId()
+ for p
[SCM] grass branch, master, updated. upstream/6.4.1-117-g54d8f6f
The following commit has been merged in the master branch: commit 54d8f6f75fa685c0069c7c24819bd39d734d88dc Author: M. Hamish Bowman hamis...@yahoo.com Date: Mon Jul 29 21:53:51 2013 +1200 add hardening flags, but keep format-security non-fatal for now diff --git a/debian/rules b/debian/rules index 7e4f5e2..fd4e4e7 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,16 @@ ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/ BASE_NAME=grass$(VERSION) PKG_NAME=grass -CFLAGS=-Wall -g +include /usr/share/hardening-includes/hardening.make +CFLAGS=$(shell dpkg-buildflags --get CFLAGS) +LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) +CFLAGS+=$(HARDENING_CFLAGS) +LDFLAGS+=$(HARDENING_LDFLAGS) + +# TODO: fix these +CFLAGS+=-Wno-error=format-security + +CFLAGS+=-Wall ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-116-g73d6803
The following commit has been merged in the master branch: commit 73d6803711429f66e48f2c760f6a0ba098e36a94 Author: M. Hamish Bowman hamis...@yahoo.com Date: Mon Jul 29 16:34:03 2013 +1200 escape minus signs which are command line options (not hyphens) to make lintian happy diff --git a/debian/rules b/debian/rules index 965f021..7e4f5e2 100755 --- a/debian/rules +++ b/debian/rules @@ -187,7 +187,18 @@ install: build for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do \ n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \ - sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done + sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done + + # escape minus signs which are command line options not hyphens + for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \ + sed -i -e 's/\([ ([]\)-\([a-z]\)/\1\\-\2/g' \ + -e 's/\([ []\)--\([a-z]\)/\1\\-\\-\2/g' \ + -e 's/\[-\\fB/[\\-\\fB/' \ + -e 's/\[--\\fB/[\\-\\-\\fB/g' \ + -e 's/\\fB-\([a-zA-Z0-9]\)/\\fB\\-\1/' \ + -e 's/\\fB--\([a-zA-Z0-9]\)/\\fB\\-\\-\1/' \ + -e 's/\\fI-\([a-zA-Z0-9]\)/\\fI\-\1/g' \ + $$m; done # adjust from build-server build dir to end-user's install dir sed -i -e s+^\(GRASS_HOME[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+ \ -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-115-g0241031
The following commit has been merged in the master branch: commit 0241031cca15fc2aae1c845cda100e2877ce8dc2 Author: M. Hamish Bowman hamis...@yahoo.com Date: Sun Jul 14 10:21:10 2013 +1200 Build-Depends on libmotif-dev for Motif transition (#714679) diff --git a/debian/changelog b/debian/changelog index fb7e31c..de5ea0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ grass (6.4.2-3) unstable; urgency=low (closes: #662361) * grass-dev needs to depend on libfreetype6-dev for building addons. * Enable GEOS support + * Build-Depends on libmotif-dev for Motif transition. +(closes: #714679) - -- M. Hamish Bowman hamis...@yahoo.com Sun, 16 Jun 2013 14:27:59 +1200 + -- M. Hamish Bowman hamis...@yahoo.com Sun, 14 Jul 2013 10:18:40 +1200 grass (6.4.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 20b7d74..c0e8c56 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-depends: fakeroot, flex, bison, graphviz, - lesstif2-dev, + libmotif-dev | lesstif2-dev, libcairo2-dev, libfftw3-dev, libfreetype6-dev, diff --git a/debian/control.in b/debian/control.in index b309f67..2cb89b8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,7 +10,7 @@ Build-depends: fakeroot, flex, bison, graphviz, - lesstif2-dev, + libmotif-dev | lesstif2-dev, libcairo2-dev, libfftw3-dev, libfreetype6-dev, diff --git a/debian/rules b/debian/rules index cf12a95..965f021 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,9 @@ ifneq $(wildcard /usr/share/misc/config.guess) endif # Add here commands to configure the package. - CFLAGS=$(CFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + CFLAGS=$(CFLAGS) ./configure \ +--host=$(DEB_HOST_GNU_TYPE) \ +--build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr/lib \ --sysconfdir=/etc \ --sharedstatedir=/var \ -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#714679: [grass] please transition from lesstif2 to motif
Hi, the change has now been applied in DebianGIS's git packaging repo and will come live with the next upload of the package. regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3109 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-26 23:57:21 + (Wed, 26 Jun 2013) New Revision: 3109 Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/rules Log: disable GSF support (copyright issues), remove perl shebang fix now merged upstream, rules file chmod +x Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-06-23 19:51:17 UTC (rev 3108) +++ packages/mbsystem/trunk/debian/changelog2013-06-26 23:57:21 UTC (rev 3109) @@ -1,8 +1,9 @@ -mbsystem (5.4.2120-0) UNRELEASED; urgency=low +mbsystem (5.4.2128-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages * Added doc-base registration + * GSF support disabled (unclear SAIC copyright status) -- Hamish Bowman hamish_b yahoo.com Sun, 02 Jun 2013 13:09:24 +1200 Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2013-06-23 19:51:17 UTC (rev 3108) +++ packages/mbsystem/trunk/debian/rules2013-06-26 23:57:21 UTC (rev 3109) @@ -19,6 +19,7 @@ --includedir=/usr/include/mbsystem \ --docdir=/usr/share/doc/mbsystem/docs \ --with-gmt-include=/usr/include/gmt \ + --without-gsf \ $(shell dpkg-buildflags --export=configure) # dpkg-buildflags needed for hardening support if compat is held at '8'. @@ -29,8 +30,6 @@ dh_installchangelogs ChangeLog override_dh_install: - # add some missing shebangs to Perl scripts - sed -i 1i #!/usr/bin/perl `find $(CURDIR)/debian/tmp/usr/bin -type f -executable -name 'mbm_*'` # take care of lintian tag: non-empty-dependency_libs-in-la-file sed -i /dependency_libs/ s/'.*'/''/ `find $(CURDIR)/debian/tmp/usr/lib -name '*.la'` dh_install Property changes on: packages/mbsystem/trunk/debian/rules ___ Added: svn:executable + * Added: svn:mime-type + text/x-makefile ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-114-g1142402
The following commit has been merged in the master branch: commit 1142402fc53e05442918c096adee1b5fb5953176 Author: M. Hamish Bowman hamis...@yahoo.com Date: Sun Jun 16 14:32:54 2013 +1200 Enable GEOS support diff --git a/debian/changelog b/debian/changelog index 5b2db56..fb7e31c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ grass (6.4.2-3) unstable; urgency=low * Build-Depends on libpng-dev for LibPNG transition. (closes: #662361) * grass-dev needs to depend on libfreetype6-dev for building addons. + * Enable GEOS support - -- M. Hamish Bowman hamis...@yahoo.com Sun, 17 Feb 2013 21:30:53 +1300 + -- M. Hamish Bowman hamis...@yahoo.com Sun, 16 Jun 2013 14:27:59 +1200 grass (6.4.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 0c79949..20b7d74 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-depends: libfftw3-dev, libfreetype6-dev, libgdal-dev | libgdal1-dev (= 1.5.0), + libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, diff --git a/debian/control.in b/debian/control.in index d47e109..b309f67 100644 --- a/debian/control.in +++ b/debian/control.in @@ -15,6 +15,7 @@ Build-depends: libfftw3-dev, libfreetype6-dev, libgdal-dev | libgdal1-dev (= 1.5.0), + libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, diff --git a/debian/rules b/debian/rules index 147d6ca..cf12a95 100755 --- a/debian/rules +++ b/debian/rules @@ -63,6 +63,7 @@ endif --with-cxx \ --with-x \ --with-gdal \ +--with-geos \ --with-freetype \ --with-motif \ --with-readline \ -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3103 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest Date: 2013-06-08 00:46:15 + (Sat, 08 Jun 2013) New Revision: 3103 Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/mbsystem-doc.dirs packages/mbsystem/trunk/debian/mbsystem-doc.install packages/mbsystem/trunk/debian/patches/system_proj4.patch packages/mbsystem/trunk/debian/rules Log: sync patches and doc install to upstream changes Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-06-07 03:05:25 UTC (rev 3102) +++ packages/mbsystem/trunk/debian/changelog2013-06-08 00:46:15 UTC (rev 3103) @@ -1,4 +1,4 @@ -mbsystem (5.4.2111-0) UNRELEASED; urgency=low +mbsystem (5.4.2120-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs === --- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-07 03:05:25 UTC (rev 3102) +++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-08 00:46:15 UTC (rev 3103) @@ -1,2 +1 @@ -usr/share/doc/mbsystem-doc/docs/html -usr/share/doc/mbsystem-doc/docs/ps +usr/share/doc/mbsystem-doc/docs Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install === --- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-07 03:05:25 UTC (rev 3102) +++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-08 00:46:15 UTC (rev 3103) @@ -1,3 +1,2 @@ -usr/share/doc/mbsystem/docs/*.html /usr/share/doc/mbsystem-doc/docs/html/ -usr/share/doc/mbsystem/docs/*.gif /usr/share/doc/mbsystem-doc/docs/html/ -usr/share/doc/mbsystem/docs/*.ps /usr/share/doc/mbsystem-doc/docs/ps/ +usr/share/doc/mbsystem/html /usr/share/doc/mbsystem-doc/docs/ +usr/share/doc/mbsystem/ps /usr/share/doc/mbsystem-doc/docs/ Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch === --- packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-07 03:05:25 UTC (rev 3102) +++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-08 00:46:15 UTC (rev 3103) @@ -28,12 +28,12 @@ lib_LTLIBRARIES = libmbproj.la a/src/man/man1/Makefile.am (revision 2098) +--- a/src/man/man1/Makefile.am (revision 2120) +++ b/src/man/man1/Makefile.am (working copy) @@ -1,4 +1,4 @@ -man_MANS = geod.1 \ +man_MANS = \ - hsdump.1 \ + mbhsdump.1 \ mb7k2jstar.1 \ mb7k2ss.1 \ @@ -76,7 +76,6 @@ @@ -41,7 +41,7 @@ mbsystem.1 \ mbtime.1 \ -mbvelocitytool.1 \ --proj.1 +-proj.1 +mbvelocitytool.1 EXTRA_DIST = $(man_MANS) Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2013-06-07 03:05:25 UTC (rev 3102) +++ packages/mbsystem/trunk/debian/rules2013-06-08 00:46:15 UTC (rev 3103) @@ -32,6 +32,7 @@ # uscan --noconf --destdir=. --download-current-version --rename --verbose -# cleaner doc install -# ps2pdf + pdftk cat all .ps man pages into a single PDF document. +# PDF doc generation and install: +# ps2pdf + 'pdftk cat' to combine all .ps man pages into a single +# PDF document. # use ReStructured text to PDF or TeX to make the cover page. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3104 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-08 02:52:53 + (Sat, 08 Jun 2013) New Revision: 3104 Modified: packages/mbsystem/trunk/debian/TODO Log: todone Modified: packages/mbsystem/trunk/debian/TODO === --- packages/mbsystem/trunk/debian/TODO 2013-06-08 00:46:15 UTC (rev 3103) +++ packages/mbsystem/trunk/debian/TODO 2013-06-08 02:52:53 UTC (rev 3104) @@ -1,10 +1,12 @@ TODO: -* GMT binaries - $PATH ? -* Integrate GMT coastline(s) -* adapt these beginnings of a Debian build script into full packaging rules: -* https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh -* Audit for bundled libraries (libproj) -* document Copyright for LevitusAnnual82.dat global water properties database +* GMT binaries are not in the $PATH by default. Deal with that or + make a large patch adding it to the PATH at the start of each + of the MB scripts and hardcoding the full path into the C code. +* Integrate the GMT coastline(s) +* Audit remove bundled libraries (libproj) +* Remove GSF code until license statement is made clear +* Document copyright for LevitusAnnual82.dat global water properties + database (US Fed. Gov't product, NOAA) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3105 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-08 03:33:34 + (Sat, 08 Jun 2013) New Revision: 3105 Modified: packages/mbsystem/trunk/debian/rules Log: take care of some lintian issues Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2013-06-08 02:52:53 UTC (rev 3104) +++ packages/mbsystem/trunk/debian/rules2013-06-08 03:33:34 UTC (rev 3105) @@ -23,7 +23,14 @@ override_dh_installchangelogs: dh_installchangelogs ChangeLog +override_dh_install: + # add some missing shebangs to Perl scripts + sed -i 1i #!/usr/bin/perl `find $(CURDIR)/debian/tmp/usr/bin -type f -executable -name 'mbm_*'` + # take care of lintian tag: non-empty-dependency_libs-in-la-file + sed -i /dependency_libs/ s/'.*'/''/ `find $(CURDIR)/debian/tmp/usr/lib -name '*.la'` + dh_install + # problematic: the upstream tarball is officially pkg-latest.tar.gz, # which is then symlinked to an exact pkg-x.y.svn_rev.tar.gz filename. # but sometimes there are newer x.y.svn_rev versions there for testing, ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3106 - packages/mbsystem/trunk/debian
Author: hamish-guest
Date: 2013-06-08 04:11:29 + (Sat, 08 Jun 2013)
New Revision: 3106
Modified:
packages/mbsystem/trunk/debian/control
Log:
tweak depends/recommends/suggests
Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control 2013-06-08 03:33:34 UTC (rev
3105)
+++ packages/mbsystem/trunk/debian/control 2013-06-08 04:11:29 UTC (rev
3106)
@@ -14,9 +14,10 @@
Package: mbsystem
Section: science
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, csh, gmt
-Recommends: mbsystem-doc, mbsystem-data, gv, libparallel-forkmanager-perl
-Suggests: ghostscript, proj-bin
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ csh, gmt, libparallel-forkmanager-perl
+Recommends: mbsystem-doc, mbsystem-data, gv
+Suggests: proj-bin, gimp
Description: Processing tools for multibeam and sidescan sonar data
MB-System is an open source software package for the processing and
display of bathymetry and backscatter imagery data derived from
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3107 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest
Date: 2013-06-08 05:08:25 + (Sat, 08 Jun 2013)
New Revision: 3107
Modified:
packages/mbsystem/trunk/debian/control
packages/mbsystem/trunk/debian/patches/system_proj4.patch
packages/mbsystem/trunk/debian/rules
Log:
add perl:Depends, add'l embedded proj4 cleanout, hardening flags for sid
Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control 2013-06-08 04:11:29 UTC (rev
3106)
+++ packages/mbsystem/trunk/debian/control 2013-06-08 05:08:25 UTC (rev
3107)
@@ -14,7 +14,7 @@
Package: mbsystem
Section: science
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
csh, gmt, libparallel-forkmanager-perl
Recommends: mbsystem-doc, mbsystem-data, gv
Suggests: proj-bin, gimp
Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-08
04:11:29 UTC (rev 3106)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-08
05:08:25 UTC (rev 3107)
@@ -53,3 +53,18 @@
EXTRA_DIST = $(man_MANS)
+--- a/src/man/whatis (revision 2120)
b/src/man/whatis (working copy)
+@@ -1,6 +1,5 @@
+ MBeditviz(1) - 3D visualization-based editing of swath bathymetry
soundings
+ MBgrdviz(1) - Simple interactive 2D/3D visualization of GMT grids
+-geod(1) - direct geodesic computations invgeod - inverse
geodesic computations
+ hsdump(1)- hsdump lists the information contained in
Hydrosweep DS data files
+ mb7k2jstar(1)- extracts subbottom profiler and/or sidescan sonar
data from Reson 7k format data files into Edgetech Jstar format data files
+ mb7k2ss(1) - extracts sidescan sonar data from Reson 7k format
data, bins and lays the sidescan onto the seafloor, and outputs files in the
MBF_MBLDEOIH formst (MBIO format id 71)
+@@ -78,5 +77,3 @@
+ mbsystem(1) - A set of utilities for manipulating and processing
swath sonar bathymetry, amplitude, and sidescan data
+ mbtime(1)- Translate between calendar time values and unix
time
+ mbvelocitytool(1)- Interactive water sound velocity profile editor
+-pj_init(3) - initialize cartographic projection pj_init_plus -
initialize cartographic projection pj_fwd - forward cartographic projection
pj_inv - inverse cartographic projection pj_transform - transform between
coordinate systems pj_free - de-initialize projection
+-proj(1) - forward cartographic projection filter invproj -
inverse cartographic projection filter
Modified: packages/mbsystem/trunk/debian/rules
===
--- packages/mbsystem/trunk/debian/rules2013-06-08 04:11:29 UTC (rev
3106)
+++ packages/mbsystem/trunk/debian/rules2013-06-08 05:08:25 UTC (rev
3107)
@@ -18,8 +18,13 @@
dh_auto_configure -- \
--includedir=/usr/include/mbsystem \
--docdir=/usr/share/doc/mbsystem/docs \
- --with-gmt-include=/usr/include/gmt
+ --with-gmt-include=/usr/include/gmt \
+ $(shell dpkg-buildflags --export=configure)
+# dpkg-buildflags needed for hardening support if compat is held at '8'.
+# The --exp=config doesn't exist on Squeeze, remove the line when building
+# there and live without hardening. It's ok on ubuntu 12.04 though.
+
override_dh_installchangelogs:
dh_installchangelogs ChangeLog
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3102 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-07 03:05:25 + (Fri, 07 Jun 2013) New Revision: 3102 Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/mbsystem-doc.dirs packages/mbsystem/trunk/debian/mbsystem-doc.doc-base packages/mbsystem/trunk/debian/mbsystem-doc.install packages/mbsystem/trunk/debian/mbsystem.docs packages/mbsystem/trunk/debian/rules Log: cleanup doc install, better handling of upstream changelog Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-06-06 03:45:50 UTC (rev 3101) +++ packages/mbsystem/trunk/debian/changelog2013-06-07 03:05:25 UTC (rev 3102) @@ -1,4 +1,4 @@ -mbsystem (5.4.2098-0) UNRELEASED; urgency=low +mbsystem (5.4.2111-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs === --- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-06 03:45:50 UTC (rev 3101) +++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-07 03:05:25 UTC (rev 3102) @@ -1 +1,2 @@ -usr/share/doc/mbsystem-doc/docs +usr/share/doc/mbsystem-doc/docs/html +usr/share/doc/mbsystem-doc/docs/ps Modified: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base === --- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-06 03:45:50 UTC (rev 3101) +++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-07 03:05:25 UTC (rev 3102) @@ -6,8 +6,8 @@ Section: Science/Geoscience Format: HTML -Index: /usr/share/doc/mbsystem-doc/docs/index.html -Files: /usr/share/doc/mbsystem-doc/docs/*.html /usr/share/doc/mbsystem-doc/docs/*.gif +Index: /usr/share/doc/mbsystem-doc/docs/html/index.html +Files: /usr/share/doc/mbsystem-doc/docs/html/*.html /usr/share/doc/mbsystem-doc/docs/html/*.gif Format: PostScript -Files: /usr/share/doc/mbsystem-doc/docs/*.ps.gz +Files: /usr/share/doc/mbsystem-doc/docs/ps/*.ps.gz Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install === --- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-06 03:45:50 UTC (rev 3101) +++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-07 03:05:25 UTC (rev 3102) @@ -1 +1,3 @@ -usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem-doc +usr/share/doc/mbsystem/docs/*.html /usr/share/doc/mbsystem-doc/docs/html/ +usr/share/doc/mbsystem/docs/*.gif /usr/share/doc/mbsystem-doc/docs/html/ +usr/share/doc/mbsystem/docs/*.ps /usr/share/doc/mbsystem-doc/docs/ps/ Modified: packages/mbsystem/trunk/debian/mbsystem.docs === --- packages/mbsystem/trunk/debian/mbsystem.docs2013-06-06 03:45:50 UTC (rev 3101) +++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-07 03:05:25 UTC (rev 3102) @@ -1,5 +1,4 @@ AUTHORS COPYING -ChangeLog NOTES README Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2013-06-06 03:45:50 UTC (rev 3101) +++ packages/mbsystem/trunk/debian/rules2013-06-07 03:05:25 UTC (rev 3102) @@ -20,14 +20,18 @@ --docdir=/usr/share/doc/mbsystem/docs \ --with-gmt-include=/usr/include/gmt -#todo: +override_dh_installchangelogs: + dh_installchangelogs ChangeLog + + +# problematic: the upstream tarball is officially pkg-latest.tar.gz, +# which is then symlinked to an exact pkg-x.y.svn_rev.tar.gz filename. +# but sometimes there are newer x.y.svn_rev versions there for testing, +# so we can't rely on the biggest number there being a real release. #get-orig-source: # uscan --noconf --destdir=. --download-current-version --rename --verbose # cleaner doc install -# install --mode=644 html /usr/share/doc/mbsystem-doc/html -# install --mode=644 ps /usr/share/doc/mbsystem-doc/ps # ps2pdf + pdftk cat all .ps man pages into a single PDF document. -# see the osgeolive mb-system build script for the code. - +# use ReStructured text to PDF or TeX to make the cover page. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3101 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest Date: 2013-06-06 03:45:50 + (Thu, 06 Jun 2013) New Revision: 3101 Removed: packages/mbsystem/trunk/debian/patches/older_autoconf.patch Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/patches/series packages/mbsystem/trunk/debian/patches/system_proj4.patch Log: sync to latest upstream (patch applied) Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-06-05 14:52:26 UTC (rev 3100) +++ packages/mbsystem/trunk/debian/changelog2013-06-06 03:45:50 UTC (rev 3101) @@ -1,4 +1,4 @@ -mbsystem (5.4.2097-0) UNRELEASED; urgency=low +mbsystem (5.4.2098-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages Deleted: packages/mbsystem/trunk/debian/patches/older_autoconf.patch === --- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-05 14:52:26 UTC (rev 3100) +++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-06 03:45:50 UTC (rev 3101) @@ -1,18 +0,0 @@ -Last-Update: 2013-06-02 -Author: Hamish Bowman hamish_b yahoo.com -Applied-Upstream: no -Forwarded: yes -Bug-MC: -Description: Allow build to continue on Squeeze - - a/configure.in (revision 2083) -+++ b/configure.in (working copy) -@@ -1,6 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. - dnl configure.in for mbsystem --AC_PREREQ([2.69]) -+AC_PREREQ([2.67]) - - dnl Disable configure caching - define([AC_CACHE_LOAD], ) Modified: packages/mbsystem/trunk/debian/patches/series === --- packages/mbsystem/trunk/debian/patches/series 2013-06-05 14:52:26 UTC (rev 3100) +++ packages/mbsystem/trunk/debian/patches/series 2013-06-06 03:45:50 UTC (rev 3101) @@ -1,2 +1 @@ -older_autoconf.patch system_proj4.patch Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch === --- packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-05 14:52:26 UTC (rev 3100) +++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-06 03:45:50 UTC (rev 3101) @@ -6,13 +6,13 @@ Description: Use Debian's PROJ.4 programs instead of bundled ones a/src/proj/Makefile.am (revision 2097) +--- a/src/proj/Makefile.am (revision 2098) +++ b/src/proj/Makefile.am (working copy) @@ -1,14 +1,14 @@ -bin_PROGRAMS = proj geod +#bin_PROGRAMS = proj geod - AM_CPPFLAGS = -I@top_srcdir@/src + AM_CPPFLAGS = -I@top_srcdir@/src/mbio include_HEADERS = proj_api.h @@ -28,7 +28,7 @@ lib_LTLIBRARIES = libmbproj.la a/src/man/man1/Makefile.am (revision 2083) +--- a/src/man/man1/Makefile.am (revision 2098) +++ b/src/man/man1/Makefile.am (working copy) @@ -1,4 +1,4 @@ -man_MANS = geod.1 \ @@ -45,7 +45,7 @@ +mbvelocitytool.1 EXTRA_DIST = $(man_MANS) a/src/man/man3/Makefile.am (revision 2083) +--- a/src/man/man3/Makefile.am (revision 2098) +++ b/src/man/man3/Makefile.am (working copy) @@ -1,4 +1,4 @@ -man_MANS = mbio.3 pj_init.3 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3093 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest
Date: 2013-06-05 01:15:15 + (Wed, 05 Jun 2013)
New Revision: 3093
Removed:
packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
Modified:
packages/mbsystem/trunk/debian/changelog
packages/mbsystem/trunk/debian/patches/older_autoconf.patch
packages/mbsystem/trunk/debian/patches/series
packages/mbsystem/trunk/debian/patches/system_proj4.patch
Log:
drop patches merged upstream
Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-02 08:59:33 UTC (rev
3092)
+++ packages/mbsystem/trunk/debian/changelog2013-06-05 01:15:15 UTC (rev
3093)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2083-0) UNRELEASED; urgency=low
+mbsystem (5.4.2097-0) UNRELEASED; urgency=low
* Initial packaging incorporating upstream support for shared libs
* Split off -dev, -doc, -data packages
Deleted: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
===
--- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
2013-06-05 01:15:15 UTC (rev 3093)
@@ -1,20 +0,0 @@
-Last-Update: 2013-06-02
-Author: Hamish Bowman hamish_b yahoo.com
-Applied-Upstream: no
-Forwarded: yes
-Bug-MC:
-Description: Add missing GMT includes dir
-
-
a/src/mbview/Makefile.am (revision 2083)
-+++ b/src/mbview/Makefile.am (working copy)
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = mbgrdviz mbeditviz
-
--AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
--LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
-+AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
@GMT_INC_DIR@
-+LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@ ${libgmt_LIBS}
-
- include_HEADERS = mbview.h
-
Modified: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02
08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-05
01:15:15 UTC (rev 3093)
@@ -16,12 +16,3 @@
dnl Disable configure caching
define([AC_CACHE_LOAD], )
-@@ -191,7 +191,7 @@
- dnl Package check failed so check manually
- if test $GOT_GMT = no ; then
-
--libgmt_LIBS=-lgmt
-+libgmt_LIBS=-lgmt -lgmtps -lpsl
- dnl arg for command line
- AC_ARG_WITH(gmt-lib, [ --with-gmt-lib=DIRLocation of GMT library],
- [libgmt_CFLAGS=-L${withval}] [GOT_GMT=yes], [GOT_GMT=no])
Modified: packages/mbsystem/trunk/debian/patches/series
===
--- packages/mbsystem/trunk/debian/patches/series 2013-06-02 08:59:33 UTC
(rev 3092)
+++ packages/mbsystem/trunk/debian/patches/series 2013-06-05 01:15:15 UTC
(rev 3093)
@@ -1,4 +1,3 @@
# patches to apply
#older_autoconf.patch
-mbview_makefile.patch
system_proj4.patch
Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-02
08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-05
01:15:15 UTC (rev 3093)
@@ -6,13 +6,13 @@
Description: Use Debian's PROJ.4 programs instead of bundled ones
a/src/proj/Makefile.am (revision 2083)
+--- a/src/proj/Makefile.am (revision 2097)
+++ b/src/proj/Makefile.am (working copy)
@@ -1,14 +1,14 @@
-bin_PROGRAMS = proj geod
+#bin_PROGRAMS = proj geod
- AM_CPPFLAGS = -I..
+ AM_CPPFLAGS = -I@top_srcdir@/src
include_HEADERS = proj_api.h
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3094 - packages/mbsystem/trunk/debian/patches
Author: hamish-guest Date: 2013-06-05 01:32:55 + (Wed, 05 Jun 2013) New Revision: 3094 Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch Log: fix patch Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch === --- packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-05 01:15:15 UTC (rev 3093) +++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-05 01:32:55 UTC (rev 3094) @@ -14,7 +14,7 @@ AM_CPPFLAGS = -I@top_srcdir@/src - include_HEADERS = proj_api.h + include_HEADERS = proj_api.h -proj_SOURCES = proj.c gen_cheb.c p_series.c -geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3095 - packages/mbsystem/trunk/debian/patches
Author: hamish-guest Date: 2013-06-05 03:28:35 + (Wed, 05 Jun 2013) New Revision: 3095 Modified: packages/mbsystem/trunk/debian/patches/series Log: rm comment, enable squeeze patch Modified: packages/mbsystem/trunk/debian/patches/series === --- packages/mbsystem/trunk/debian/patches/series 2013-06-05 01:32:55 UTC (rev 3094) +++ packages/mbsystem/trunk/debian/patches/series 2013-06-05 03:28:35 UTC (rev 3095) @@ -1,3 +1,2 @@ -# patches to apply -#older_autoconf.patch +older_autoconf.patch system_proj4.patch ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#709343: gmt-coast-low: installs files with bogus owner+group
Hi, it's not in the package itself, it's in the included download script: /usr/sbin/gmt-coastline-download echo $GET_HIGH $GET_HIGH tar xojvf $TMPDIR/GSHHS_high.tar.bz2 -C $SHARE_DIR/coast --strip 2 share/coast echo $GET_FULL $GET_FULL tar xojvf $TMPDIR/GSHHS_full.tar.bz2 -C $SHARE_DIR/coast --strip 2 share/coast when tar is run as root it restores the UID,GID that were in the tarball packager's system. adding --no-same-owner to the tar command might help, but I'm not sure if that gets the GID too. the included -o flag should do that, but it no longer appears in the Debian tar man page so maybe it went away? It is listed in Compatibility options with tar --help. Maybe -o not working is the real bug there. (you can see it listed in the FreeBSD man page, http://www.freebsd.org/cgi/man.cgi?query=tar) Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3086 - packages/mbsystem/trunk/debian/patches
Author: hamish-guest
Date: 2013-06-02 05:25:03 + (Sun, 02 Jun 2013)
New Revision: 3086
Modified:
packages/mbsystem/trunk/debian/patches/older_autoconf.patch
Log:
patch to fix missing library spec
Modified: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02
05:08:51 UTC (rev 3085)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02
05:25:03 UTC (rev 3086)
@@ -16,3 +16,12 @@
dnl Disable configure caching
define([AC_CACHE_LOAD], )
+@@ -191,7 +191,7 @@
+ dnl Package check failed so check manually
+ if test $GOT_GMT = no ; then
+
+-libgmt_LIBS=-lgmt
++libgmt_LIBS=-lgmt -lgmtps -lpsl
+ dnl arg for command line
+ AC_ARG_WITH(gmt-lib, [ --with-gmt-lib=DIRLocation of GMT library],
+ [libgmt_CFLAGS=-L${withval}] [GOT_GMT=yes], [GOT_GMT=no])
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3088 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 07:42:08 + (Sun, 02 Jun 2013) New Revision: 3088 Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs packages/mbsystem/trunk/debian/mbsystem-doc.doc-base packages/mbsystem/trunk/debian/mbsystem-doc.install packages/mbsystem/trunk/debian/mbsystem-doc.links Log: further doc install fixes Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs === --- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:42:08 UTC (rev 3088) @@ -1,2 +1 @@ -usr/share/doc/mbsystem/docs usr/share/doc/mbsystem-doc/docs Modified: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base === --- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 07:42:08 UTC (rev 3088) @@ -10,4 +10,4 @@ Files: /usr/share/doc/mbsystem-doc/docs/*.html /usr/share/doc/mbsystem-doc/docs/*.gif Format: PostScript -Files: /usr/share/doc/mbsystem-doc/docs/*.ps +Files: /usr/share/doc/mbsystem-doc/docs/*.ps.gz Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install === --- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-02 07:42:08 UTC (rev 3088) @@ -1 +1 @@ -usr/share/doc/mbsystem/docs +usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem-doc Modified: packages/mbsystem/trunk/debian/mbsystem-doc.links === --- packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:42:08 UTC (rev 3088) @@ -1 +1 @@ -usr/share/doc/mbsystem/docs/usr/share/doc/mbsystem/docs +usr/share/doc/mbsystem-doc/docsusr/share/doc/mbsystem/docs ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3092 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:59:33 + (Sun, 02 Jun 2013) New Revision: 3092 Modified: packages/mbsystem/trunk/debian/mbsystem.docs Log: omit placeholder file Modified: packages/mbsystem/trunk/debian/mbsystem.docs === --- packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:48:07 UTC (rev 3091) +++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:59:33 UTC (rev 3092) @@ -1,6 +1,5 @@ AUTHORS COPYING ChangeLog -NEWS NOTES README ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3091 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:48:07 + (Sun, 02 Jun 2013) New Revision: 3091 Added: packages/mbsystem/trunk/debian/mbsystem.docs Log: include tarball readmes Added: packages/mbsystem/trunk/debian/mbsystem.docs === --- packages/mbsystem/trunk/debian/mbsystem.docs (rev 0) +++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:48:07 UTC (rev 3091) @@ -0,0 +1,6 @@ +AUTHORS +COPYING +ChangeLog +NEWS +NOTES +README ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3087 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest Date: 2013-06-02 07:05:12 + (Sun, 02 Jun 2013) New Revision: 3087 Added: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base packages/mbsystem/trunk/debian/mbsystem-doc.links packages/mbsystem/trunk/debian/patches/system_proj4.patch Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/mbsystem-doc.dirs packages/mbsystem/trunk/debian/patches/series Log: further proj4 and doc install fixes Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-06-02 05:25:03 UTC (rev 3086) +++ packages/mbsystem/trunk/debian/changelog2013-06-02 07:05:12 UTC (rev 3087) @@ -1,7 +1,8 @@ -mbsystem (5.4.2081-0) UNRELEASED; urgency=low +mbsystem (5.4.2083-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages + * Added doc-base registration -- Hamish Bowman hamish_b yahoo.com Sun, 02 Jun 2013 13:09:24 +1200 Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs === --- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 05:25:03 UTC (rev 3086) +++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:05:12 UTC (rev 3087) @@ -1 +1,2 @@ usr/share/doc/mbsystem/docs +usr/share/doc/mbsystem-doc/docs Added: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base === --- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base (rev 0) +++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 07:05:12 UTC (rev 3087) @@ -0,0 +1,13 @@ +Document: mbsystem-manual +Title: The MB-System User Manual +Author: David Caress, Dale Chayes, Val Schmidt +Abstract: This is everything you'll need to know to get + up and running with the MB-System software. +Section: Science/Geoscience + +Format: HTML +Index: /usr/share/doc/mbsystem-doc/docs/index.html +Files: /usr/share/doc/mbsystem-doc/docs/*.html /usr/share/doc/mbsystem-doc/docs/*.gif + +Format: PostScript +Files: /usr/share/doc/mbsystem-doc/docs/*.ps Added: packages/mbsystem/trunk/debian/mbsystem-doc.links === --- packages/mbsystem/trunk/debian/mbsystem-doc.links (rev 0) +++ packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:05:12 UTC (rev 3087) @@ -0,0 +1 @@ +usr/share/doc/mbsystem/docs/usr/share/doc/mbsystem/docs Modified: packages/mbsystem/trunk/debian/patches/series === --- packages/mbsystem/trunk/debian/patches/series 2013-06-02 05:25:03 UTC (rev 3086) +++ packages/mbsystem/trunk/debian/patches/series 2013-06-02 07:05:12 UTC (rev 3087) @@ -1,3 +1,4 @@ # patches to apply #older_autoconf.patch mbview_makefile.patch +system_proj4.patch Added: packages/mbsystem/trunk/debian/patches/system_proj4.patch === --- packages/mbsystem/trunk/debian/patches/system_proj4.patch (rev 0) +++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-02 07:05:12 UTC (rev 3087) @@ -0,0 +1,55 @@ +Last-Update: 2013-06-02 +Author: Hamish Bowman hamish_b yahoo.com +Applied-Upstream: no +Forwarded: no +Bug-MC: +Description: Use Debian's PROJ.4 programs instead of bundled ones + + +--- a/src/proj/Makefile.am (revision 2083) b/src/proj/Makefile.am (working copy) +@@ -1,14 +1,14 @@ +-bin_PROGRAMS = proj geod ++#bin_PROGRAMS = proj geod + + AM_CPPFLAGS = -I.. + + include_HEADERS = proj_api.h + +-proj_SOURCES = proj.c gen_cheb.c p_series.c +-geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h ++#proj_SOURCES = proj.c gen_cheb.c p_series.c ++#geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h + +-proj_LDADD = libmbproj.la +-geod_LDADD = libmbproj.la ++#proj_LDADD = libmbproj.la ++#geod_LDADD = libmbproj.la + + lib_LTLIBRARIES = libmbproj.la + +--- a/src/man/man1/Makefile.am (revision 2083) b/src/man/man1/Makefile.am (working copy) +@@ -1,4 +1,4 @@ +-man_MANS = geod.1 \ ++man_MANS = \ + hsdump.1 \ + mb7k2jstar.1 \ + mb7k2ss.1 \ +@@ -76,7 +76,6 @@ + mbswath.1 \ + mbsystem.1 \ + mbtime.1 \ +-mbvelocitytool.1 \ +-proj.1 ++mbvelocitytool.1 + + EXTRA_DIST = $(man_MANS) +--- a/src/man/man3/Makefile.am (revision 2083) b/src/man/man3/Makefile.am (working copy) +@@ -1,4 +1,4 @@ +-man_MANS = mbio.3 pj_init.3 ++man_MANS = mbio.3 + + EXTRA_DIST = $(man_MANS) + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3090 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:34:27 + (Sun, 02 Jun 2013) New Revision: 3090 Modified: packages/mbsystem/trunk/debian/copyright Log: update copyright statement Modified: packages/mbsystem/trunk/debian/copyright === --- packages/mbsystem/trunk/debian/copyright2013-06-02 08:11:25 UTC (rev 3089) +++ packages/mbsystem/trunk/debian/copyright2013-06-02 08:34:27 UTC (rev 3090) @@ -1,4 +1,98 @@ -GPL 3 +MB-System Copyright +=== -http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html +MB-System Copyright (C) 1993-2013 by +David W. Caress (car...@mbari.org) + Monterey Bay Aquarium Research Institute + Moss Landing, CA 95039 +Dale N. Chayes (d...@ldeo.columbia.edu) + Lamont-Doherty Earth Observatory + Palisades, NY 10964mbbackangle.manl + +All Rights Reserved. +All Wrongs Remembered. + + http://www.ldeo.columbia.edu/res/pi/MB-System/html/mbsystem_copyright.html + http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html + +For the full text of the GPLv3 see /usr/share/common-licenses/GPL-3 + + +MB-System Licensing +--- + +The MB-System source code is distributed under the GNU General Public +License (version 3) as formulated by the Free Software Foundation. Early +MB-System distributions were described as public domain, which meant +there was no restriction whatsoever on the use of the code. For over a +decade we have adopted the more restrictive GNU GPL license in order to +insure that anyone who distributes software based in whole or in part on +MB-System also distributes the modified MB-System source code and any +additional source code. + +The GNU GPL also prohibits the distribution of proprietary executables +linked with MB-System libraries unless the source code is also distributed. +We waive this restriction on distributing proprietary compiled programs for +specific software products if and only if those software products meet the +following two conditions: + + 1) The software product was created, sold, and delivered to customers +using source code derived from MB-System release 4.6 distributions. + + 2) The software product was sold and delivered to customers prior to +January 1, 2001. + + +Acknowledgment of Source Code Derived From Other Sources + + +The MB-System distribution includes some source code derived from packages +that are distributed separately and have been authored by programmers other +than the MB-System team. This includes: + + - The Generic Sensor Format (GSF) library source located in +mbsystem/src/gsf. The GSF package is distributed by the Science +Applications International Corporation under contract to the Naval +Oceanographic Office. + + - The SURF API (SAPI) library source located in mbsystem/src/surf. The +SAPI package has been released under the GNU General Public License by +Atlas Hydrographic. + + - The MR1PR library source located in mbsystem/src/mr1pr. This package has +been openly released by the Hawaii Mapping Research Group. + + - The PROJ.4 library source located in mbsystem/src/proj. This package was +originally developed by Gerald Evenden of the United States Geological +Survey, and is now maintained and distributed under an MIT license (that is +very close to public domain) by Frank Warmerdam in association with the +Open Source Geospational Foundation + + - The mb_mergesort() function found in mbsystem/src/mbio/mb_esf.c derives +from the GNU-Darwin Distribution. This code is released under both the +Apple Public Source License Version 1.1 and the BSD license, with original +copyright by the Regents of the University of California. + + +MB-System Caveat + + +The MB-System software package does not come with any warranties, nor is it +guarenteed to work on your computer or to do anything useful. The user +assumes full responsibility for the use of this software. In particular, +David W. Caress, Dale N. Chayes, the Lamont-Doherty Earth Observatory of +Columbia University, the Monterey Bay Aquarium Research Institute, or any +other individuals or organizations involved in the design and maintenance +of the MB-System software package are NOT responsible for any damage that +may follow from correct or incorrect use of these programs. + + +Debian packaging + + +This package was debianized by M. Hamish Bowman, Depts. of Geology and +Marine Science, University of Otago, Dunedin, New Zealand. +Debian packaging (c) 2010-2013 the MB-System Development Team and the +DebianGIS project under the same terms as the MB-System source package. + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3089 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:11:25 + (Sun, 02 Jun 2013) New Revision: 3089 Modified: packages/mbsystem/trunk/debian/rules Log: clear out some comment cruft Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2013-06-02 07:42:08 UTC (rev 3088) +++ packages/mbsystem/trunk/debian/rules2013-06-02 08:11:25 UTC (rev 3089) @@ -3,13 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# -# # These are used for cross-compiling and for saving the configure script -# # from having to guess our platform (since we know it already) -# DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -# DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: @@ -31,26 +25,9 @@ # uscan --noconf --destdir=. --download-current-version --rename --verbose +# cleaner doc install +# install --mode=644 html /usr/share/doc/mbsystem-doc/html +# install --mode=644 ps /usr/share/doc/mbsystem-doc/ps +# ps2pdf + pdftk cat all .ps man pages into a single PDF document. +# see the osgeolive mb-system build script for the code. -# # apply patches -# include /usr/share/dpatch/dpatch.make -# -# -# # install -# ## sort of modeled after GMT packaging: -# install bin/* /usr/lib/mbsystem/bin -# install --mode=644 lib/* /usr/lib/mbsystem -# install --mode=644 man/manl/* /usr/share/man/man1 -# install --mode=644 html /usr/share/doc/mbsystem/html -# install --mode=644 ps /usr/share/doc/mbsystem/ps -# install --mode=644 share /usr/share/mbsystem -# install --mode=644 include /usr/lib/mbsystem/include -# -#now integrated: -# # get Levitus annual water temperature profile database (binary blob) -# # needed for mblevitus program, uncompressed it is 16mb. -# # -# wget -nv ftp://ftp.ldeo.columbia.edu/pub/MB-System/annual.gz -# gzip -d annual.gz -# \mv annual LevitusAnnual82.dat -# install --mode=644 LevitusAnnual82.data /usr/share/mbsystem/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3083 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest
Date: 2013-06-02 01:48:43 + (Sun, 02 Jun 2013)
New Revision: 3083
Added:
packages/mbsystem/trunk/debian/patches/mbview_makefile
packages/mbsystem/trunk/debian/patches/older_autoconf
packages/mbsystem/trunk/debian/patches/series
Removed:
packages/mbsystem/trunk/debian/patches/00list
packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
Modified:
packages/mbsystem/trunk/debian/TODO
packages/mbsystem/trunk/debian/changelog
packages/mbsystem/trunk/debian/control
packages/mbsystem/trunk/debian/rules
packages/mbsystem/trunk/debian/watch
Log:
Initial packaging with upstream support for shared libs
Modified: packages/mbsystem/trunk/debian/TODO
===
--- packages/mbsystem/trunk/debian/TODO 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/TODO 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,6 +1,10 @@
-TODO: adapt these beginnings of a Debian build script into full packaging
rules:
+TODO:
-https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+* GMT binaries - $PATH ?
+* Integrate GMT coastline(s)
+* adapt these beginnings of a Debian build script into full packaging rules:
+*
https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+* Audit for bundled libraries (libproj)
+* document Copyright for LevitusAnnual82.dat global water properties database
-
Property changes on: packages/mbsystem/trunk/debian/TODO
___
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2012-07-05 07:40:44 UTC (rev
3082)
+++ packages/mbsystem/trunk/debian/changelog2013-06-02 01:48:43 UTC (rev
3083)
@@ -1,3 +1,9 @@
+mbsystem (5.4.2081-0) UNRELEASED; urgency=low
+
+ * Initial packaging with upstream support for shared libs
+
+ -- Hamish Bowman hamish_b yahoo.com Sun, 02 Jun 2013 13:09:24 +1200
+
mbsystem (5.1.2-0) UNRELEASED; urgency=low
* Initial packaging
Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control 2012-07-05 07:40:44 UTC (rev
3082)
+++ packages/mbsystem/trunk/debian/control 2013-06-02 01:48:43 UTC (rev
3083)
@@ -2,19 +2,21 @@
Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders:
-Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
+Uploaders: M. Hamish Bowman hamis...@yahoo.com
+Build-depends: debhelper (= 8), dh-autoreconf,
+ libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
libgl1-mesa-dev, libfftw3-dev, libproj-dev
-Standards-Version:
+Standards-Version: 3.9.4
Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mbsystem/trunk/
+Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/mbsystem/trunk/debian/
Package: mbsystem
Section: science
Architecture: any
-Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx,
- libglu1-mesa, libfftw3-3, libproj0
-Suggests: ghostscript, proj-bin, xv
-Recommends:
+Depends: ${shlibs:Depends}, ${misc:Depends}, csh, gmt
+Recommends: gv, libparallel-forkmanager-perl
+Suggests: ghostscript, proj-bin
Description: Processing tools for multibeam and sidescan sonar data
MB-System is an open source software package for the processing and
display of bathymetry and backscatter imagery data derived from
Deleted: packages/mbsystem/trunk/debian/patches/00list
===
--- packages/mbsystem/trunk/debian/patches/00list 2012-07-05 07:40:44 UTC
(rev 3082)
+++ packages/mbsystem/trunk/debian/patches/00list 2013-06-02 01:48:43 UTC
(rev 3083)
@@ -1 +0,0 @@
-install_makefiles
Deleted: packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
===
--- packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install_makefiles.dpatch by Hamish Bowman hamish_b yahoo com
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefile adjustments suitable for Debian
-
-@DPATCH@
install_makefiles.ORIG 2010-01-01 20:16:22.0 +1300
-+++ install_makefiles 2010-01-01 21:33:37.0 +1300
-@@ -102,27 +102,26 @@
- #
- #
- # Required parameters
r3084 - in packages/mbsystem/trunk/debian: . patches source
Author: hamish-guest Date: 2013-06-02 02:20:44 + (Sun, 02 Jun 2013) New Revision: 3084 Added: packages/mbsystem/trunk/debian/compat packages/mbsystem/trunk/debian/patches/mbview_makefile.patch packages/mbsystem/trunk/debian/patches/older_autoconf.patch packages/mbsystem/trunk/debian/source/ packages/mbsystem/trunk/debian/source/format Removed: packages/mbsystem/trunk/debian/patches/mbview_makefile packages/mbsystem/trunk/debian/patches/older_autoconf Modified: packages/mbsystem/trunk/debian/patches/series Log: fixes to patching Added: packages/mbsystem/trunk/debian/compat === --- packages/mbsystem/trunk/debian/compat (rev 0) +++ packages/mbsystem/trunk/debian/compat 2013-06-02 02:20:44 UTC (rev 3084) @@ -0,0 +1 @@ +8 Deleted: packages/mbsystem/trunk/debian/patches/mbview_makefile === --- packages/mbsystem/trunk/debian/patches/mbview_makefile 2013-06-02 01:48:43 UTC (rev 3083) +++ packages/mbsystem/trunk/debian/patches/mbview_makefile 2013-06-02 02:20:44 UTC (rev 3084) @@ -1,12 +0,0 @@ -Index: src/mbview/Makefile.am -=== src/mbview/Makefile.am (revision 2083) -+++ src/mbview/Makefile.am (working copy) -@@ -1,6 +1,6 @@ - bin_PROGRAMS = mbgrdviz mbeditviz - --AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ -+AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ @GMT_INC_DIR@ - LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@ - - include_HEADERS = mbview.h Copied: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch (from rev 3083, packages/mbsystem/trunk/debian/patches/mbview_makefile) === --- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch (rev 0) +++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch 2013-06-02 02:20:44 UTC (rev 3084) @@ -0,0 +1,18 @@ +Last-Update: 2013-06-02 +Author: Hamish Bowman hamish_b yahoo.com +Applied-Upstream: no +Forwarded: yes +Bug-MC: +Description: Add missing GMT includes dir + + +--- a/src/mbview/Makefile.am (revision 2083) b/src/mbview/Makefile.am (working copy) +@@ -1,6 +1,6 @@ + bin_PROGRAMS = mbgrdviz mbeditviz + +-AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ ++AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ @GMT_INC_DIR@ + LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@ + + include_HEADERS = mbview.h Deleted: packages/mbsystem/trunk/debian/patches/older_autoconf === --- packages/mbsystem/trunk/debian/patches/older_autoconf 2013-06-02 01:48:43 UTC (rev 3083) +++ packages/mbsystem/trunk/debian/patches/older_autoconf 2013-06-02 02:20:44 UTC (rev 3084) @@ -1,12 +0,0 @@ -Index: configure.in -=== configure.in (revision 2083) -+++ configure.in (working copy) -@@ -1,6 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. - dnl configure.in for mbsystem --AC_PREREQ([2.69]) -+AC_PREREQ([2.67]) - - dnl Disable configure caching - define([AC_CACHE_LOAD], ) Copied: packages/mbsystem/trunk/debian/patches/older_autoconf.patch (from rev 3083, packages/mbsystem/trunk/debian/patches/older_autoconf) === --- packages/mbsystem/trunk/debian/patches/older_autoconf.patch (rev 0) +++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02 02:20:44 UTC (rev 3084) @@ -0,0 +1,18 @@ +Last-Update: 2013-06-02 +Author: Hamish Bowman hamish_b yahoo.com +Applied-Upstream: no +Forwarded: yes +Bug-MC: +Description: Allow build to continue on Squeeze + + +--- a/configure.in (revision 2083) b/configure.in (working copy) +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + dnl configure.in for mbsystem +-AC_PREREQ([2.69]) ++AC_PREREQ([2.67]) + + dnl Disable configure caching + define([AC_CACHE_LOAD], ) Modified: packages/mbsystem/trunk/debian/patches/series === --- packages/mbsystem/trunk/debian/patches/series 2013-06-02 01:48:43 UTC (rev 3083) +++ packages/mbsystem/trunk/debian/patches/series 2013-06-02 02:20:44 UTC (rev 3084) @@ -1,3 +1,3 @@ # patches to apply -older_autoconf -mbview_makefile +older_autoconf.patch +mbview_makefile.patch Added: packages/mbsystem/trunk/debian/source/format === --- packages/mbsystem/trunk/debian/source/format (rev 0) +++ packages/mbsystem/trunk/debian/source/format2013-06-02 02
[SCM] gmt-gshhs branch, master, updated. 959921b712644b023d1cb8a61b9ea07d18f06b22
The following commit has been merged in the master branch: commit 959921b712644b023d1cb8a61b9ea07d18f06b22 Author: M. Hamish Bowman hamis...@yahoo.com Date: Tue May 21 17:58:23 2013 +1200 minor spelling fixes (lintian) diff --git a/debian/NEWS b/debian/NEWS index e064bf5..301c717 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -2,7 +2,7 @@ gmt-gshhs (2.2.0-1) unstable; urgency=low This package contains all resolutions of coastline, rivers and borders used by GMT for rendering maps. The old gmt-coastline-low has been -superseeded by this new package with a new compact format. +superseded by this new package with a new compact format. -- Francesco Paolo Lovergine fran...@debian.org Tue, 13 Mar 2012 11:53:04 +0100 diff --git a/debian/changelog b/debian/changelog index 067f3cc..b384d09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ gmt-gshhs (2.2.0-2) unstable; urgency=low gmt-gshhs (2.2.0-1) unstable; urgency=low * New upstream release for GMT 4.5.7+ - * This new source package includes and superseeds gmt-coast-low source. It + * This new source package includes and supersedes gmt-coast-low source. It includes all resolutions of the GHSSHS coastline for GMT. Past package included only the low-res flavor. Also it adds rivers, and borders data set. -- GMT GSHHS data ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-113-gecc923a
The following commit has been merged in the master branch: commit ecc923a1200098efb3b7ecb5a78c3355ae72ad87 Author: M. Hamish Bowman hamis...@yahoo.com Date: Mon May 20 17:54:16 2013 +1200 avoid hardcoded version number diff --git a/debian/rules b/debian/rules index c717d65..147d6ca 100755 --- a/debian/rules +++ b/debian/rules @@ -275,7 +275,7 @@ binary-arch: install dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a dh_link -a dh_python2 - dh_python2 /usr/lib/grass64/etc + dh_python2 /usr/lib/$(BASE_NAME)/etc dh_strip -a dh_compress -a -XAUTHORS dh_fixperms -a -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#674213: gpsdrive: not installable in sid
Hi, It's too late for wheezy, but I will cut a new upstream version from svn (just one.last.commit I'd like to get in), it's been pretty stable for a while, must be about time to do it. :) I believe the patches for 2.11 are too much, most of the recent development has been me putting out small fires / keeping up with API changes in dependency libs rather than new features.. The old version needs to be put to rest. for a reference vision of what the modern version looks like when firing on all cylinders, with live OpenStreetMap tile rendering from a PostGIS database and Mapnik rendering engine, see http:// live.osgeo.org (based on ubu 12.04, I just rebuilt the pkgs for that with all the latest fixes). regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-112-g762e739
The following commit has been merged in the master branch:
commit 762e739059129fde2db021242352ec1cafc29c65
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Sun Feb 17 21:33:53 2013 +1300
grass-dev needs to depend on libfreetype6-dev to build addon modules
diff --git a/debian/changelog b/debian/changelog
index a7049ca..5b2db56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ grass (6.4.2-3) unstable; urgency=low
* Build-Depends on libpng-dev for LibPNG transition.
(closes: #662361)
+ * grass-dev needs to depend on libfreetype6-dev for building addons.
- -- M. Hamish Bowman hamis...@yahoo.com Sat, 09 Jun 2012 17:15:10 +1200
+ -- M. Hamish Bowman hamis...@yahoo.com Sun, 17 Feb 2013 21:30:53 +1300
grass (6.4.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b97bf1a..0c79949 100644
--- a/debian/control
+++ b/debian/control
@@ -164,7 +164,9 @@ Depends:
grass-core (= ${binary:Version}),
# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for
5.7.0+6.0.0beta2-2
fakeroot,
- libproj-dev, libgdal-dev | libgdal1-dev (= 1.5.0),
+ libproj-dev,
+ libgdal-dev | libgdal1-dev (= 1.5.0),
+ libfreetype6-dev,
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
diff --git a/debian/control.in b/debian/control.in
index 10d6ce3..d47e109 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -164,7 +164,9 @@ Depends:
grass-core (= ${binary:Version}),
# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for
5.7.0+6.0.0beta2-2
fakeroot,
- libproj-dev, libgdal-dev | libgdal1-dev (= 1.5.0),
+ libproj-dev,
+ libgdal-dev | libgdal1-dev (= 1.5.0),
+ libfreetype6-dev,
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#699079: libmapnik2-2.0: rfe: make AsBinary() forward compatible with the PostGIS 2.0 API
Package: libmapnik2-2.0 Version: 2.0.0+ds1-3+b4 Severity: wishlist Hi, the libmapnik2-2.0 package currently in Sid includes a bug fixed in later versions of libmapnik but not yet in the Debian archives. Namely, it's not actually compatible with PostGIS 2.0 due to the presence of an old API call. AsBinary() should be renamed ST_AsBinary() for /usr/lib/mapnik/2.0/input/postgis.input. Since Wheezy is shipping PostGIS 1.5 this isn't a RC bug by any means, but over the life of Wheezy it will cause confusion and force installation of 3rd party updates for people using the newer PostGIS, who think the library will be compatible but it actually isn't. So probably a wontfix for the current release, but at least a head's up to anyone else banging their head against the wall searching the BTS when trying to use it with PostGIS 2.0. The easy work around by the way is to run psql -f legacy.sql or legacy_minimal.sql which comes with PostGIS 2.0. regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#534254: gosmore: build dep on libgps-dev
Hi, gosmore should build-dep on libgps-dev, but first apparently needs to be updated from the libgps19 api to libgps20 api. If libgps-dev is installed on the system, gosmore will not BFS. You need to edit Makefile and Makefile.in to remove the test for it so it doesn't try to build with the libgps19 api, and fail because libgps20's gps.h is found. Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3082 - packages/gpsdrive/trunk/debian
Author: hamish-guest
Date: 2012-07-05 07:40:44 + (Thu, 05 Jul 2012)
New Revision: 3082
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/control
Log:
whitespace reorg of control file for easier to read diffs; notes about upcoming
version into the changelog file
Modified: packages/gpsdrive/trunk/debian/changelog
===
--- packages/gpsdrive/trunk/debian/changelog2012-07-02 08:42:46 UTC (rev
3081)
+++ packages/gpsdrive/trunk/debian/changelog2012-07-05 07:40:44 UTC (rev
3082)
@@ -1,3 +1,16 @@
+gpsdrive (2.12+svn2702-1) unstable; urgency=low
+
+ * Modernize Debian package with many changes
+ (closes: #287845, #456149, #498428, #508595, #585866, #589718, #591260,
#672229, #674213)
+ * Sync'd to modern location of packaged OSM icons
+ * TMS and tiled WMS server support upgrade
+ * Include osm2poidb utility in utils package
+ * Move gpsdrive-data (maps) into main build system
+ * Update debian/copyright file
+ * Bundle simplified Natural Earth world coastline and cities
+
+ -- M. Hamish Bowman hamis...@yahoo.com Thu, 05 Jul 2012 16:56:49 +1200
+
gpsdrive (2.10~pre4-6.dfsg-6) unstable; urgency=low
[ Francesco Paolo Lovergine ]
Modified: packages/gpsdrive/trunk/debian/control
===
--- packages/gpsdrive/trunk/debian/control 2012-07-02 08:42:46 UTC (rev
3081)
+++ packages/gpsdrive/trunk/debian/control 2012-07-05 07:40:44 UTC (rev
3082)
@@ -4,9 +4,24 @@
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine
fran...@debian.org, M. Hamish Bowman hamis...@yahoo.com
DM-Upload-Allowed: yes
-Build-Depends: debhelper (= 7), automake1.9, libtool, pkg-config,
libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev,
- autotools-dev, dpatch, libmapnik2-dev (= 0.6), libboost-dev,
libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev,
- libxcursor-dev, libswitch-perl | perl ( 5.10.1-13)
+Build-Depends: debhelper (= 7),
+ automake1.9,
+ autotools-dev,
+ dpatch,
+ libart-2.0-dev,
+ libboost-dev,
+ libboost-filesystem-dev,
+ libboost-serialization-dev,
+ libdbus-glib-1-dev,
+ libgtk2.0-dev,
+ libmapnik2-dev (= 0.6),
+ libmysqlclient-dev,
+ libpcre3-dev,
+ libswitch-perl | perl ( 5.10.1-13),
+ libtool,
+ libxcursor-dev,
+ libxml2-dev,
+ pkg-config
Standards-Version: 3.8.4
Homepage: http://gpsdrive.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/trunk
@@ -14,9 +29,17 @@
Package: gpsdrive
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data,
openstreetmap-map-icons-square, openstreetmap-map-icons-classic
-Recommends: gpsd, gpsdrive-utils
-Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.4-postgis
+Depends: ${shlibs:Depends},
+${misc:Depends},
+gpsdrive-data,
+openstreetmap-map-icons-classic,
+openstreetmap-map-icons-square
+Recommends: gpsd,
+gpsdrive-utils
+Suggests: flite | festival,
+osm2pgsql,
+mysql-server,
+postgresql-8.4-postgis
Description: Car navigation system
Map-based navigation system that displays the current
position provided by a GPS receiver on a zoomable map.
@@ -40,9 +63,25 @@
Package: gpsdrive-utils
Architecture: all
-Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik2,
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl,
- libmime-base64-perl, libtime-local-perl, libwww-curl-perl,
libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl,
libxml-twig-perl,
- libxml-writer-perl, perlmagick, perl-tk
+Depends: gpsdrive,
+${perl:Depends},
+libdate-manip-perl,
+libdbd-mysql-perl,
+libdbi-perl,
+libfile-slurp-perl,
+libmime-base64-perl,
+libtime-local-perl,
+libwww-curl-perl,
+libwww-mechanize-perl,
+libxml-parser-perl,
+libxml-simple-perl,
+libxml-twig-perl,
+libxml-writer-perl,
+perl-tk,
+perlmagick,
+python,
+python-imaging,
+python-mapnik2
Description: Various scripts for gpsdrive
Gpsdrive is a car (bike, ship, plane) navigation system.
.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3079 - packages/gpsdrive/trunk/debian
Author: hamish-guest Date: 2012-07-02 08:37:17 + (Mon, 02 Jul 2012) New Revision: 3079 Modified: packages/gpsdrive/trunk/debian/TODO packages/gpsdrive/trunk/debian/examples packages/gpsdrive/trunk/debian/gpsdrive-scripts.install packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages packages/gpsdrive/trunk/debian/gpsdrive.install Log: rm refs to old files no longer relevant for gpsdrive 2.12 Modified: packages/gpsdrive/trunk/debian/TODO === --- packages/gpsdrive/trunk/debian/TODO 2012-07-02 08:23:29 UTC (rev 3078) +++ packages/gpsdrive/trunk/debian/TODO 2012-07-02 08:37:17 UTC (rev 3079) @@ -1,18 +1,10 @@ Debian maintainers TODO list +* Package modern version (2.12svn) * Help upstream to get the perl module namespace organized. * Remove the following patches on next release as they are fixed upstream -- 01-make (upstream switched to cmake) - 03-manpage - 20-homedir (~/.gpsdrive/osm.xml no longer overwritten) -- 40-backported (bugfixes backported from upstream vcs) -- 60-sql (uses sqlite now) -- 90-usage (fixed upstream) -- 95-newapi (should be fixed) -- 96-mapnik-plugins-dir (should be fixed) -- 98-mapnik-exception (fixed upstream) -- 99-autobestmap (fixed upstream) -* Create a bpo package for 2.4.10pre5 +* Create a bpo package for 2.12 --- Andreas Putzo andr...@putzo.net at Tue Jul 15 20:56:13 UTC 2008 Modified: packages/gpsdrive/trunk/debian/examples === --- packages/gpsdrive/trunk/debian/examples 2012-07-02 08:23:29 UTC (rev 3078) +++ packages/gpsdrive/trunk/debian/examples 2012-07-02 08:37:17 UTC (rev 3079) @@ -1,6 +1 @@ -scripts/gpssql_backup.sh -scripts/gpssql_restore.sh scripts/nasaconv.sh -scripts/wp2sql -scripts/wpcvt -scripts/wpget Modified: packages/gpsdrive/trunk/debian/gpsdrive-scripts.install === --- packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02 08:23:29 UTC (rev 3078) +++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02 08:37:17 UTC (rev 3079) @@ -1,10 +1,7 @@ usr/bin/convert-waypoints.pl -usr/bin/geo-code usr/bin/geocache2way -usr/bin/geoinfo.pl usr/bin/gpspoint2gpsdrive.pl usr/bin/gpsreplay -usr/bin/poi-manager.pl usr/bin/gpsdrive_mapnik_gentiles.py usr/share/perl5/Geo/Filter/*usr/share/perl5/Geo/Gpsdrive/Filter usr/share/perl5/Geo/GPX/* usr/share/perl5/Geo/Gpsdrive/GPX Modified: packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages === --- packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02 08:23:29 UTC (rev 3078) +++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02 08:37:17 UTC (rev 3079) @@ -1,6 +1,3 @@ man/convert-waypoints.pl.1 -man/geo-code.1 -man/geoinfo.pl.1 debian/man/gpsfetchmap.1 man/gpspoint2gpsdrive.pl.1 -man/poi-manager.pl.1 Modified: packages/gpsdrive/trunk/debian/gpsdrive.install === --- packages/gpsdrive/trunk/debian/gpsdrive.install 2012-07-02 08:23:29 UTC (rev 3078) +++ packages/gpsdrive/trunk/debian/gpsdrive.install 2012-07-02 08:37:17 UTC (rev 3079) @@ -3,4 +3,3 @@ usr/share/applications/gpsdrive.desktop usr/share/gpsdrive/map_koord.txt usr/share/gpsdrive/mapnik/osm.xml -usr/share/map-icons/icons.xml usr/share/gpsdrive/map-icons/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3080 - packages/gpsdrive/trunk/debian
Author: hamish-guest
Date: 2012-07-02 08:40:07 + (Mon, 02 Jul 2012)
New Revision: 3080
Added:
packages/gpsdrive/trunk/debian/gpsdrive-utils.install
packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages
Removed:
packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages
Modified:
packages/gpsdrive/trunk/debian/control
packages/gpsdrive/trunk/debian/rules
Log:
gpsdrive-scripts is renamed to gpsdrive-utils
Modified: packages/gpsdrive/trunk/debian/control
===
--- packages/gpsdrive/trunk/debian/control 2012-07-02 08:37:17 UTC (rev
3079)
+++ packages/gpsdrive/trunk/debian/control 2012-07-02 08:40:07 UTC (rev
3080)
@@ -15,7 +15,7 @@
Package: gpsdrive
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data,
openstreetmap-map-icons-square, openstreetmap-map-icons-classic
-Recommends: gpsd, gpsdrive-scripts
+Recommends: gpsd, gpsdrive-utils
Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.4-postgis
Description: Car navigation system
Map-based navigation system that displays the current
@@ -38,7 +38,7 @@
.
This package contains the data files.
-Package: gpsdrive-scripts
+Package: gpsdrive-utils
Architecture: all
Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik2,
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl,
libmime-base64-perl, libtime-local-perl, libwww-curl-perl,
libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl,
libxml-twig-perl,
Deleted: packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
===
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02
08:37:17 UTC (rev 3079)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02
08:40:07 UTC (rev 3080)
@@ -1,11 +0,0 @@
-usr/bin/convert-waypoints.pl
-usr/bin/geocache2way
-usr/bin/gpspoint2gpsdrive.pl
-usr/bin/gpsreplay
-usr/bin/gpsdrive_mapnik_gentiles.py
-usr/share/perl5/Geo/Filter/*usr/share/perl5/Geo/Gpsdrive/Filter
-usr/share/perl5/Geo/GPX/* usr/share/perl5/Geo/Gpsdrive/GPX
-usr/share/perl5/Geo/Geometry.pm usr/share/perl5/Geo/Gpsdrive
-usr/share/perl5/Geo/Gpsdrive/*
-usr/share/perl5/Geo/OSM/Planet.pm usr/share/perl5/Geo/Gpsdrive/OSM
-usr/share/perl5/Utils/* usr/share/perl5/Geo/Gpsdrive/Utils
Deleted: packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages
===
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02
08:37:17 UTC (rev 3079)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02
08:40:07 UTC (rev 3080)
@@ -1,3 +0,0 @@
-man/convert-waypoints.pl.1
-debian/man/gpsfetchmap.1
-man/gpspoint2gpsdrive.pl.1
Copied: packages/gpsdrive/trunk/debian/gpsdrive-utils.install (from rev 3079,
packages/gpsdrive/trunk/debian/gpsdrive-scripts.install)
===
--- packages/gpsdrive/trunk/debian/gpsdrive-utils.install
(rev 0)
+++ packages/gpsdrive/trunk/debian/gpsdrive-utils.install 2012-07-02
08:40:07 UTC (rev 3080)
@@ -0,0 +1,11 @@
+usr/bin/convert-waypoints.pl
+usr/bin/geocache2way
+usr/bin/gpspoint2gpsdrive.pl
+usr/bin/gpsreplay
+usr/bin/gpsdrive_mapnik_gentiles.py
+usr/share/perl5/Geo/Filter/*usr/share/perl5/Geo/Gpsdrive/Filter
+usr/share/perl5/Geo/GPX/* usr/share/perl5/Geo/Gpsdrive/GPX
+usr/share/perl5/Geo/Geometry.pm usr/share/perl5/Geo/Gpsdrive
+usr/share/perl5/Geo/Gpsdrive/*
+usr/share/perl5/Geo/OSM/Planet.pm usr/share/perl5/Geo/Gpsdrive/OSM
+usr/share/perl5/Utils/* usr/share/perl5/Geo/Gpsdrive/Utils
Copied: packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages (from rev 3079,
packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages)
===
--- packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages
(rev 0)
+++ packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages 2012-07-02
08:40:07 UTC (rev 3080)
@@ -0,0 +1,3 @@
+man/convert-waypoints.pl.1
+debian/man/gpsfetchmap.1
+man/gpspoint2gpsdrive.pl.1
Modified: packages/gpsdrive/trunk/debian/rules
===
--- packages/gpsdrive/trunk/debian/rules2012-07-02 08:37:17 UTC (rev
3079)
+++ packages/gpsdrive/trunk/debian/rules2012-07-02 08:40:07 UTC (rev
3080)
@@ -115,21 +115,21 @@
dh_fixperms -i
dh_installdeb -i
# strip language extensions
- mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints.pl
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints
- mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo.pl
$(CURDIR)/debian/gpsdrive
r3081 - packages/gpsdrive/trunk/debian
Author: hamish-guest Date: 2012-07-02 08:42:46 + (Mon, 02 Jul 2012) New Revision: 3081 Added: packages/gpsdrive/trunk/debian/menu Log: +menu file Added: packages/gpsdrive/trunk/debian/menu === --- packages/gpsdrive/trunk/debian/menu (rev 0) +++ packages/gpsdrive/trunk/debian/menu 2012-07-02 08:42:46 UTC (rev 3081) @@ -0,0 +1,5 @@ +?package(gpsdrive):needs=x11\ + section=Applications/Science/Geoscience\ + longtitle=GpsDrive: A car (bike, ship, plane, foot) navigation system\ + title=GpsDrive command=gpsdrive\ + icon=/usr/share/icons/hicolor/32x32/apps/gpsdrive.xpm ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: r3078 - packages/gpsdrive/trunk/debian/patches
Hamish: Removed: packages/gpsdrive/trunk/debian/patches/01-make.dpatch Francesco: note that dpatch is now considered obsolete. yeah, I'm just deleting/minimizing the old patches one by one as I checking off that they've been merged upstream. Before I start merging in the new from upstream I want to ensure that I'm not accidentally overwriting anything which never made it back up, and it's easier to see the signal if you first remove the noise. Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3077 - packages/gpsdrive/branches
Author: hamish-guest Date: 2012-06-29 08:29:04 + (Fri, 29 Jun 2012) New Revision: 3077 Added: packages/gpsdrive/branches/squeeze/ Log: copy over old build files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3076 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2012-06-28 07:55:50 + (Thu, 28 Jun 2012) New Revision: 3076 Modified: packages/opencpn/trunk/debian/rules Log: put hardening flags in place, ready for activation upon demand Modified: packages/opencpn/trunk/debian/rules === --- packages/opencpn/trunk/debian/rules 2012-06-16 05:06:02 UTC (rev 3075) +++ packages/opencpn/trunk/debian/rules 2012-06-28 07:55:50 UTC (rev 3076) @@ -10,6 +10,20 @@ CFLAGS=-Wall CXXFLAGS=-Wall -O3 +# comment out the above and uncomment the following to enable hardening +#include /usr/share/hardening-includes/hardening.make +#DEB_CFLAGS_MAINT_APPEND=-O3 +#CFLAGS=$(shell dpkg-buildflags --get CFLAGS) +#CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS) +#CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS) +#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) +#CFLAGS+=$(HARDENING_CFLAGS) +#CXXFLAGS+=$(HARDENING_CXXFLAGS) +#LDFLAGS+=$(HARDENING_LDFLAGS) +#CXXFLAGS+=-fPIC +#export DEB_CFLAGS_MAINT_APPEND CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + + %: dh $@ --parallel ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-111-g6d11595
The following commit has been merged in the master branch: commit 6d1159522b58cf204ec29b976f13c7b3793ea7d7 Author: M. Hamish Bowman hamis...@yahoo.com Date: Wed Jun 27 08:48:05 2012 +1200 minor whitespace diff --git a/debian/control b/debian/control index 710eba1..b97bf1a 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev| libgdal1-dev (= 1.5.0), + libgdal-dev | libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, diff --git a/debian/control.in b/debian/control.in index 4297976..10d6ce3 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev| libgdal1-dev (= 1.5.0), + libgdal-dev | libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3072 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2012-06-10 21:44:17 + (Sun, 10 Jun 2012) New Revision: 3072 Modified: packages/opencpn/trunk/debian/copyright Log: a few more stragglers Modified: packages/opencpn/trunk/debian/copyright === --- packages/opencpn/trunk/debian/copyright 2012-06-10 02:09:21 UTC (rev 3071) +++ packages/opencpn/trunk/debian/copyright 2012-06-10 21:44:17 UTC (rev 3072) @@ -87,6 +87,12 @@ It does not exist in elsewhere in Debian; the code here has been specifically tailored/reworked by the OpenCPN lead author and is maintained within the OpenCPN source tree. + . + Samuel Blackburn's original source license: + You can use it any way you like. + More recent (2010) license statement from Samuel: + It is BSD license, do with it what you will + (and what Dave's decided to do with it is make our copy of it GPLv2+) Files: plugins/grib_pi/src/Grib* plugins/grib_pi/src/Iso* plugins/grib_pi/src/ZuFile* Copyright: 2008 Jacques Zaninetti http://www.zygrib.org @@ -98,7 +104,7 @@ Copyright: 2010 David S Register bdb...@yahoo.com License: GPL-2.0+ -Files: src/scrollingdialog.* src/bbox.cpp +Files: src/scrollingdialog.* include/scrollingdialog.h src/bbox.cpp include/bbox.h Copyright: 2000 Klaas Holwerda 2007 Julian Smart License: WXwindows @@ -125,7 +131,7 @@ This code is in the public domain. Specifically, we give to the public domain all rights for future licensing of the source code, all resale rights, and all publishing rights. - + . UNC-CH GIVES NO WARRANTY, EXPRESSED OR IMPLIED, FOR THE SOFTWARE AND/OR DOCUMENTATION PROVIDED, INCLUDING, WITHOUT LIMITATION, WARRANTY OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3073 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2012-06-11 04:28:13 + (Mon, 11 Jun 2012) New Revision: 3073 Modified: packages/opencpn/trunk/debian/copyright Log: Dave confirms that icons.cpp/.h (generated) are covered by the project's GPLv2 copyright Modified: packages/opencpn/trunk/debian/copyright === --- packages/opencpn/trunk/debian/copyright 2012-06-10 21:44:17 UTC (rev 3072) +++ packages/opencpn/trunk/debian/copyright 2012-06-11 04:28:13 UTC (rev 3073) @@ -100,7 +100,7 @@ Comment: Built into a separate binary package which is only Suggested by the main (GPL=2) package. -Files: plugins/grib_pi/src/icons.sh plugins/dashboard_pi/src/icons.sh src/bitmaps/*.sh src/bitmaps/*/*.sh src/bitmaps/*/*/*.sh +Files: src/bitmaps/icons.* plugins/grib_pi/src/icons.* plugins/dashboard_pi/src/icons.* src/bitmaps/*.sh src/bitmaps/*/*.sh src/bitmaps/*/*/*.sh Copyright: 2010 David S Register bdb...@yahoo.com License: GPL-2.0+ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3070 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2012-06-10 01:25:08 + (Sun, 10 Jun 2012) New Revision: 3070 Modified: packages/opencpn/trunk/debian/copyright Log: document remaining copyrights noticed missing by Mike O'Connor ftpmas...@debian.org Modified: packages/opencpn/trunk/debian/copyright === --- packages/opencpn/trunk/debian/copyright 2012-05-19 08:06:34 UTC (rev 3069) +++ packages/opencpn/trunk/debian/copyright 2012-06-10 01:25:08 UTC (rev 3070) @@ -16,6 +16,17 @@ Copyright: 2006-2008 The EVEmu Team http://trac.evemu.org License: GPL-2.0+ +Files: Findgps.cmake +Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium + 2006-2009 Kitware, Inc. + 2006 Alexander Neundorf neund...@kde.org + 2010 David Register bdb...@yahoo.com +License: BSD-3-clause + +Files: CMakeLists.txt plugins/CMakeLists.txt plugins/grib_pi/CMakeLists.txt plugins/demo_pi_sample/src/CMakeLists.txt plugins/demo_pi_sample/CMakeLists.txt plugins/dashboard_pi/CMakeLists.txt +Copyright: 2010-2011 David S Register bdb...@yahoo.com +License: WXwindows + Files: src/garmin/jeeps/* Copyright: 2004-2006 Robert Lipe robertl...@usa.net 2010 David S Register bdb...@yahoo.com @@ -336,6 +347,33 @@ . 3. This notice may not be removed or altered from any source distribution. +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of Kitware, Inc., the Insight Software Consortium, + nor the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS + IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License: BSD-4-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3071 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2012-06-10 02:09:21 + (Sun, 10 Jun 2012) New Revision: 3071 Modified: packages/opencpn/trunk/debian/copyright Log: add'l copyright file refinement Modified: packages/opencpn/trunk/debian/copyright === --- packages/opencpn/trunk/debian/copyright 2012-06-10 01:25:08 UTC (rev 3070) +++ packages/opencpn/trunk/debian/copyright 2012-06-10 02:09:21 UTC (rev 3071) @@ -27,11 +27,19 @@ Copyright: 2010-2011 David S Register bdb...@yahoo.com License: WXwindows -Files: src/garmin/jeeps/* +Files: src/garmin/jeeps/garmin* src/garmin/jeeps/gpsdevice.* src/garmin/jeeps/gpsusb* Copyright: 2004-2006 Robert Lipe robertl...@usa.net 2010 David S Register bdb...@yahoo.com License: GPL-2.0+ +Files: src/garmin/jeeps/gps[acf-s]* src/garmin/jeeps/gpsdatum.h src/garmin/jeeps/gpsutil.* +Copyright: 1999-2000 Alan Bleasby + 2004-2006 Robert Lipe robertl...@usa.net + 2007 Achim Schumacher + 2010 Martin Buck + 2010 David S Register bdb...@yahoo.com +License: LGPL-2.0+ + Files: src/garmin/jeeps/gpsprot.c src/garmin/jeeps/gpscom.c src/garmin/jeeps/gpsapp.c src/garmin/jeeps/gpsmath.c src/garmin/jeeps/gpsrqst.c src/garmin/jeeps/gpsutil.c src/garmin/jeeps/gpsread.c src/garmin/jeeps/gpssend.c src/garmin/jeeps/gpsserial.c src/garmin/jeeps/gpsmem.c Copyright: 1999-2000 Alan Bleasby 2004-2006 Robert Lipe robertl...@usa.net @@ -86,6 +94,10 @@ Comment: Built into a separate binary package which is only Suggested by the main (GPL=2) package. +Files: plugins/grib_pi/src/icons.sh plugins/dashboard_pi/src/icons.sh src/bitmaps/*.sh src/bitmaps/*/*.sh src/bitmaps/*/*/*.sh +Copyright: 2010 David S Register bdb...@yahoo.com +License: GPL-2.0+ + Files: src/scrollingdialog.* src/bbox.cpp Copyright: 2000 Klaas Holwerda 2007 Julian Smart ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#585866: gpsdrive 2.10pre7 incompatible with gpsd 2.92+
Hi, moreover, gpsd changed their API a second time for version 2.96+. the latest upstream svn for GpsDrive now handles any of the three at compile time through #ifdef checks, but this awaits a new debian package. Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#590690: gpsdrive does not find gpsd (status: no gps)
hi, this is very likely a duplicate of the issue described in bug #585866, which has now been fixed upstream with the auto-selection of the gpsd API version at compile time. direct connection to /dev/ttyS0 or ttyUSB0 only works with NMEA GPSs. If yours has a SiRF chip or similar you'll have to put it into NMEA mode first to get that ASCII protocol, not the new binary protocol. More hints on how to do that at the gpsd website/help pages. regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#591260: (no subject)
[reposted from bug #674213] Hi, I've now fixed this upstream, it required both updating debian/control and some cmake,#ifdefs on the version number in the code due to the changed API with mapnik 2.0. Also the osm.xml setup file had a number of changes within it, I had to make a sed script to adapt those. I hope to do a svn snapshot release of GpsDrive soon, it complies and starts cleanly now, but I still need to test the PostGIS + Mapnik support a bit better before calling it ready. Even with the upstream version ready there will be some significant work to merge the DebianGIS and upstream debian/ dirs into something modern and clean. So far I've been focusing on the upstream code rather than the packaging, but in that I've also managed to get the lintian count rather low. If that will be ready for the Wheezy freeze or not probably depends on if I get any help or not, right now it is just me and I've other commitments to juggle. see the SourceForge project page for svn checkouts of the latest upstream efforts, http://gpsdrive.sf.net regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#672229: No plugin found for type 'postgis'
Hi, now fixed in upstream svn (auto-selects at compile time), awaiting an updated debian package. Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#676190: grass-gui: gcpmanager fails to list source mapsets if non-ascii characters in grass data dir path
Hi, filed as upstream grass bug #1672 https://trac.osgeo.org/grass/ticket/1672 see also a similar class of bugs their solution: https://trac.osgeo.org/grass/search?q=UnicodeEncodeErrornoquickjump=1ticket=on thanks, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-99-g26bbad0
The following commit has been merged in the master branch:
commit 26bbad08712b038c593adaf79ffa441708c2bafc
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Wed May 30 00:08:37 2012 +1200
fix filename refs in patch
diff --git a/debian/patches/iostream_cpp470 b/debian/patches/iostream_cpp470
index d1e7a4a..35b1b12 100644
--- a/debian/patches/iostream_cpp470
+++ b/debian/patches/iostream_cpp470
@@ -1,7 +1,7 @@
-Index: /grass/branches/releasebranch_6_4/lib/iostream/mm.cc
+Index: grass/lib/iostream/mm.cc
===
/grass/branches/releasebranch_6_4/lib/iostream/mm.cc (revision 48704)
-+++ /grass/branches/releasebranch_6_4/lib/iostream/mm.cc (revision 51638)
+--- grass.orig/lib/iostream/mm.cc (revision 48704)
grass/lib/iostream/mm.cc (revision 51638)
@@ -254,11 +254,11 @@
}
@@ -54,10 +54,10 @@ Index: /grass/branches/releasebranch_6_4/lib/iostream/mm.cc
MM_DEBUG cout delete[]: ptr= ptr ,;
-Index: /grass/branches/releasebranch_6_4/include/iostream/mm.h
+Index: grass/include/iostream/mm.h
===
/grass/branches/releasebranch_6_4/include/iostream/mm.h(revision 32629)
-+++ /grass/branches/releasebranch_6_4/include/iostream/mm.h(revision 51638)
+--- grass.orig/include/iostream/mm.h (revision 32629)
grass/include/iostream/mm.h(revision 51638)
@@ -108,14 +108,14 @@
intspace_overhead ();
@@ -77,10 +77,10 @@ Index:
/grass/branches/releasebranch_6_4/include/iostream/mm.h
-Index: /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
+Index: grass/include/iostream/minmaxheap.h
===
/grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
(revision 41531)
-+++ /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
(revision 51638)
+--- grass.orig/include/iostream/minmaxheap.h (revision 41531)
grass/include/iostream/minmaxheap.h(revision 51638)
@@ -742,11 +742,11 @@
HeapIndex MinMaxHeapT::fill(T* arr, HeapIndex n) {
HeapIndex i;
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-100-g7448d4a
The following commit has been merged in the master branch: commit 7448d4a5cb65d223d6b2e104e990a64943f71ec3 Author: M. Hamish Bowman hamis...@yahoo.com Date: Wed May 30 00:24:31 2012 +1200 add back python-dev dep diff --git a/debian/control b/debian/control index 2a00888..a4b6c74 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-depends: libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python (= 2.6.6-3~), + python (= 2.6.6-3~), python-dev, python-wxgtk2.8, libwxgtk2.8-dev, tcl-dev (= 8.5), tk-dev (= 8.5), unixodbc-dev diff --git a/debian/control.in b/debian/control.in index 9c7d880..aec5b85 100644 --- a/debian/control.in +++ b/debian/control.in @@ -27,7 +27,7 @@ Build-depends: libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python (= 2.6.6-3~), + python (= 2.6.6-3~), python-dev, python-wxgtk2.8, libwxgtk2.8-dev, tcl-dev (= 8.5), tk-dev (= 8.5), unixodbc-dev -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#591260: gpdrive-2.11 needs packaging
Hi, Johan wrote: It might be useful to know that the osgeo live dvd (based on debian/xubuntu) is also using a more recent gpsdrive version. I have no time to review the installation script, but perhaps it contains things which might be useful for the debian package: it does, the author. :-) I'm the author of the osgeo livedvd build script (which just patches the upstream svn's debian/ dir to keep up with the ubuntu ver used there and a local tweak of the PostGIS db name). I'm also one of the upstream maintainers of GpsDrive. And at this point I guess I'm going to be the DebianGIS representative to maintain the package too. The upstream debian/ dir is much more modern than the DebianGIS svn one, basically I think I need to wipe the slate clean and repackage the modern version of the program (2.11+svn as seen in the OSGeo Live DVD script) from scratch. But that's work. stay tuned... first I'll work on getting mapnik2 and libgps20 support working. As Johan mentioned, I have it working on Ubuntu 11.04 natty for the livedvd, and locally I have it working on Squeeze. I'll post my working 2.11svn packages for Squeeze ASAP. They've been working fine on my laptop for many months. The Ubuntu packages used on the live dvd can be found here: http://download.osgeo.org/livedvd/data/gpsdrive/ regards, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3069 - packages/gpsdrive/trunk/debian
Author: hamish-guest
Date: 2012-05-19 08:06:34 + (Sat, 19 May 2012)
New Revision: 3069
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/control
Log:
updated build dep to mapnik2, added myself to uploaders
Modified: packages/gpsdrive/trunk/debian/changelog
===
--- packages/gpsdrive/trunk/debian/changelog2012-05-15 13:24:12 UTC (rev
3068)
+++ packages/gpsdrive/trunk/debian/changelog2012-05-19 08:06:34 UTC (rev
3069)
@@ -1,12 +1,17 @@
gpsdrive (2.10~pre4-6.dfsg-6) unstable; urgency=low
- * Added libxcursor-dev build-dep.
+ [ Francesco Paolo Lovergine ]
+ * Added libxcursor-dev build-dep.
(closes: #615653, #628310)
* Switch perl module is now deprecated, added a suitable build-dep.
(closes: #629338)
- -- Francesco Paolo Lovergine fran...@debian.org Mon, 06 Jun 2011 10:28:49
+0200
+ [ Hamish Bowman ]
+ * Updated build dep to Mapnik2.
+ * Add myself to uploaders.
+ -- M. Hamish Bowman hamis...@yahoo.com Sat, 19 May 2012 19:26:54 +1200
+
gpsdrive (2.10~pre4-6.dfsg-5) unstable; urgency=low
* Added 103-no-textquery patch to remove Text::Query use. Removed
Modified: packages/gpsdrive/trunk/debian/control
===
--- packages/gpsdrive/trunk/debian/control 2012-05-15 13:24:12 UTC (rev
3068)
+++ packages/gpsdrive/trunk/debian/control 2012-05-19 08:06:34 UTC (rev
3069)
@@ -2,10 +2,10 @@
Section: utils
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine
fran...@debian.org
+Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine
fran...@debian.org, M. Hamish Bowman hamis...@yahoo.com
DM-Upload-Allowed: yes
Build-Depends: debhelper (= 7), automake1.9, libtool, pkg-config,
libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev,
- autotools-dev, dpatch, libmapnik-dev (= 0.6), libboost-dev,
libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev,
+ autotools-dev, dpatch, libmapnik2-dev (= 0.6), libboost-dev,
libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev,
libxcursor-dev, libswitch-perl | perl ( 5.10.1-13)
Standards-Version: 3.8.4
Homepage: http://gpsdrive.de
@@ -40,7 +40,7 @@
Package: gpsdrive-scripts
Architecture: all
-Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik,
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl,
+Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik2,
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl,
libmime-base64-perl, libtime-local-perl, libwww-curl-perl,
libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl,
libxml-twig-perl,
libxml-writer-perl, perlmagick, perl-tk
Description: Various scripts for gpsdrive
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#672229: No plugin found for type 'postgis'
Yeah, the mapnik dir is hardcoded in the C code and needs to be changed. see the patch applied via sed here: https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/tags/release_20120228_osgeolive_5_5_0/bin/install_gpsdrive.sh#L139 I am using Debian squeeze. I'll post a URL to modern binaries for Squeeze to this ticket ASAP. (I've had them on my laptop for months) Longer term I'll work on updated packages of modern GpsDrive for sid in DebianGIS svn and GpsDrive svn. regards, Hamish . GpsDrive dev team DebianGIS team ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#589718: gpsdrive: incorrect debian section
Hi, this has been fixed upstream 20 months ago. http://gpsdrive.svn.sourceforge.net/viewvc/gpsdrive/trunk/data/gpsdrive.desktop just awaits the upload of a new package in Debian, stay tuned thanks, Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#590690: gpsdrive does not find gpsd (status: no gps)
Hi, GpsDrive has to be compiled with option(LIBGPS_OLD Build with old libgps version (2.90) OFF) in DefineOptions.cmake to use the newer Gpsd API (ie libgps19, not 20), but I suspect that the version currently in Debian is too old for that. (AFAICT this bug report was for Lenny) stay tuned for a newer package and I'll post a url to working packages for Squeeze ASAP too. Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-96-gb0d7a25
The following commit has been merged in the master branch:
commit ae5c9deff2c6a4a61020d32749c15164ce9bf5bc
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Thu May 17 20:08:36 2012 +1200
Add patch to fix C++ FTBFS for gcc 4.7.0; fix -dev pkg warning message
patch, was giving false negatives for previously-installed but now removed pkgs
diff --git a/debian/patches/check4dev b/debian/patches/check4dev
index 2c87afb..0c905e5 100644
--- a/debian/patches/check4dev
+++ b/debian/patches/check4dev
@@ -8,7 +8,7 @@ Index: grass/scripts/g.extension/g.extension
+
+# check if we have the grass include and Make files
-+dpkg-query -W grass-dev /dev/null 2 /dev/null
++dpkg-query -l grass-dev | grep '^ii' /dev/null 2 /dev/null
+if [ $? -ne 0 ] ; then
+ g.message -w This module requires the \grass-dev\ package
+fi
diff --git a/debian/patches/iostream_cpp470 b/debian/patches/iostream_cpp470
new file mode 100644
index 000..d1e7a4a
--- /dev/null
+++ b/debian/patches/iostream_cpp470
@@ -0,0 +1,116 @@
+Index: /grass/branches/releasebranch_6_4/lib/iostream/mm.cc
+===
+--- /grass/branches/releasebranch_6_4/lib/iostream/mm.cc (revision 48704)
/grass/branches/releasebranch_6_4/lib/iostream/mm.cc (revision 51638)
+@@ -254,11 +254,11 @@
+ }
+
+
+
+ /* */
+-void* operator new[] (size_t sz) {
++void* operator new[] (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout new: sz= sz , register
+sz+SIZE_SPACE B ,;
+
+@@ -305,11 +305,11 @@
+ }
+
+
+
+ /* */
+-void* operator new (size_t sz) {
++void* operator new (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout new: sz= sz , register
+sz+SIZE_SPACE B ,;
+
+@@ -357,11 +357,11 @@
+
+
+
+
+ /* -- */
+-void operator delete (void *ptr) {
++void operator delete (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout delete: ptr= ptr ,;
+
+@@ -397,11 +397,11 @@
+
+
+
+
+ /* -- */
+-void operator delete[] (void *ptr) {
++void operator delete[] (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout delete[]: ptr= ptr ,;
+
+Index: /grass/branches/releasebranch_6_4/include/iostream/mm.h
+===
+--- /grass/branches/releasebranch_6_4/include/iostream/mm.h(revision 32629)
/grass/branches/releasebranch_6_4/include/iostream/mm.h(revision 51638)
+@@ -108,14 +108,14 @@
+ intspace_overhead ();
+
+ void print();
+
+ friend class mm_register_init;
+- friend void * operator new(size_t);
+- friend void * operator new[](size_t);
+- friend void operator delete(void *);
+- friend void operator delete[](void *);
++ friend void * operator new(size_t) throw(std::bad_alloc);
++ friend void * operator new[](size_t) throw(std::bad_alloc);
++ friend void operator delete(void *) throw();
++ friend void operator delete[](void *) throw();
+ };
+
+
+
+
+Index: /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
+===
+--- /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
(revision 41531)
/grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
(revision 51638)
+@@ -742,11 +742,11 @@
+ HeapIndex MinMaxHeapT::fill(T* arr, HeapIndex n) {
+ HeapIndex i;
+ //heap must be empty
+ assert(this-size()==0);
+ for (i = 0; !full() in; i++) {
+-insert(arr[i]);
++this-insert(arr[i]);
+ }
+ if (i n) {
+ assert(i == this-maxsize);
+ return n - i;
+ } else {
+@@ -775,17 +775,17 @@
+
+ assert(this-maxsize 0);
+
+ if(old) {
+ HeapIndex n = this-size();
+- this-A = allocateHeap(this-maxsize); /* allocate a new array */
++ this-A = this-allocateHeap(this-maxsize); /* allocate a new array */
+ /* copy over the old values */
+ assert(this-maxsize n);
+ for(HeapIndex i=0; i=n; i++) { /* why extra value? -RW */
+ this-A[i] = old[i];
+ }
+- freeHeap(old); /* free up old storage */
++ this-freeHeap(old);/* free up old storage */
+ }
+
+ }
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e7797bd..2272ff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pager
xterm
instdir
check4dev
+iostream_cpp470
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass
[SCM] grass branch, master, updated. upstream/6.4.1-96-gb0d7a25
The following commit has been merged in the master branch: commit b0d7a25b984b061642c182500eca3145d4e0fc4a Author: M. Hamish Bowman hamis...@yahoo.com Date: Thu May 17 20:12:45 2012 +1200 bump changelog diff --git a/debian/changelog b/debian/changelog index 9f09794..6bdc572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,11 +12,13 @@ grass (6.4.2-1) unstable; urgency=low * Use xdg-open for GRASS_HTML_BROWSER when available. (closes: #615667) * Policy bumped to 3.9.3, using metapackages archive section for 'grass'. + * Fix g.extension.sh test for the grass-dev package. + * Add patch to fix C++ FTBFS for gcc 4.7.0. [ Francesco Paolo Lovergine ] * Moved to use TIFF 4.0.1 instead of the legacy flavor. - -- Francesco Paolo Lovergine fran...@debian.org Sat, 25 Feb 2012 19:21:24 +0100 + -- M. Hamish Bowman hamis...@yahoo.com Thu, 17 May 2012 20:09:15 +1200 grass (6.4.1-2) unstable; urgency=low -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-97-g195b177
The following commit has been merged in the master branch: commit 195b177ffe096bac731ef6dc23532100493f2003 Author: M. Hamish Bowman hamis...@yahoo.com Date: Thu May 17 20:33:10 2012 +1200 changelog diff --git a/debian/changelog b/debian/changelog index 6bdc572..854ff34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ grass (6.4.2-1) unstable; urgency=low * Policy bumped to 3.9.3, using metapackages archive section for 'grass'. * Fix g.extension.sh test for the grass-dev package. * Add patch to fix C++ FTBFS for gcc 4.7.0. +(closes: #671991) [ Francesco Paolo Lovergine ] * Moved to use TIFF 4.0.1 instead of the legacy flavor. -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#672719: grass: FTBFS on s390x
Perhaps the build failed due to an out-of-memory, or other system error? The build failed because a 'make test' style check was Killed by the OS.(?) here is the relevant section of the build log: [...] gcc -shared -o /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib/libgrass_dig2.6.4.1.so -L/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/g rass-6.4.1/dist.s390x-ibm-linux-gnu/lib -Wl,--export-dynamic -Wl,-rpath-link,/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib OBJ. s390x-ibm-linux-gnu/allocation.o OBJ.s390x-ibm-linux-gnu/angle.o OBJ.s390x-ibm-linux-gnu/box.o OBJ.s390x-ibm-linux-gnu/cindex.o OBJ.s390x-ibm-linux-gnu/cindex_rw.o OBJ. s390x-ibm-linux-gnu/file.o OBJ.s390x-ibm-linux-gnu/frmt.o OBJ.s390x-ibm-linux-gnu/head.o OBJ.s390x-ibm-linux-gnu/inside.o OBJ.s390x-ibm-linux-gnu/linecros.o OBJ.s390x-i bm-linux-gnu/line_dist.o OBJ.s390x-ibm-linux-gnu/list.o OBJ.s390x-ibm-linux-gnu/plus.o OBJ.s390x-ibm-linux-gnu/plus_area.o OBJ.s390x-ibm-linux-gnu/plus_line.o OBJ.s390x -ibm-linux-gnu/plus_node.o OBJ.s390x-ibm-linux-gnu/plus_struct.o OBJ.s390x-ibm-linux-gnu/poly.o OBJ.s390x-ibm-linux-gnu/port_init.o OBJ.s390x-ibm-linux-gnu/portable.o O BJ.s390x-ibm-linux-gnu/prune.o OBJ.s390x-ibm-linux-gnu/spindex.o OBJ.s390x-ibm-linux-gnu/spindex_rw.o OBJ.s390x-ibm-linux-gnu/struct_alloc.o OBJ.s390x-ibm-linux-gnu/typ e.o OBJ.s390x-ibm-linux-gnu/update.o -lgrass_gis -lgrass_datetime -lz -lgrass_rtree -lm amp;amp; \ (cd /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib; ln -f -s libgrass_dig2.6.4.1.so /build/buildd-grass_6.4.1-2.1-s390x-GTA LEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib/libgrass_dig2.so) /usr/bin/make OBJ.s390x-ibm-linux-gnu/test make[6]: Entering directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/diglib' echo quot;==TEST=quot; ==TEST= gcc -L/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib -Wl,--export-dynamic -Wl,-rpath-link,/build/buildd-grass_6.4.1-2.1-s390x-GTALE w/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib -Wall -g -O -I/usr/include/gdal -I/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/incl ude -o OBJ.s390x-ibm-linux-gnu/test test.c -lgrass_dig2 -lgrass_gis -lgrass_datetime -lz -lgrass_rtree -lgrass_rtree \ -lgrass_gis -lgrass_datetime -lz -lgrass_datetime -lm -lz cd OBJ.s390x-ibm-linux-gnu; LD_LIBRARY_PATH=quot;:/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/libquot; ./test; diff ./test.tmp ../ test.ok Killed make[6]: *** [OBJ.s390x-ibm-linux-gnu/test] Error 2 make[5]: *** [default] Error 2 Binary files ./test.tmp and ../test.ok differ make[6]: Leaving directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/diglib' make[5]: Leaving directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/diglib' /usr/bin/make -C Vlib || echo /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/Vlib gt;gt; /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/err or.log make[5]: Entering directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/Vlib' [...] try, try again? Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-94-g1b4bb00
The following commit has been merged in the master branch: commit 1b4bb00a3c002866bb610f95a486baa6adc1721a Author: M. Hamish Bowman hamis...@yahoo.com Date: Thu Mar 1 08:38:21 2012 +1300 prototype code for python-bytecode.prerm scripts (copied method from debian/rules) diff --git a/debian/TODO b/debian/TODO index 4e534e6..2e4106d 100644 --- a/debian/TODO +++ b/debian/TODO @@ -17,6 +17,34 @@ E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/.../*.pyc dh_python2 +grass-core.prerm[.in]: (adapted from debian/rules) +- +# delete python compiled bytecode files +for DIR in python/grass \ +python/grass/lib \ +python/grass/script \ + do +rm -f /usr/lib/grass@VERSION@/etc/$DIR/*.pyc +done + + +grass-gui.prerm[.in]: (adapted from debian/rules) + +# delete python compiled bytecode files +for DIR in wxpython \ +wxpython/compat \ +wxpython/gui_modules \ +wxpython/icons ; \ + do +rm -f /usr/lib/grass@VERSION@/etc/$DIR/*.pyc +done + + +... but how to do *.postinst with update-python-modules or dh_python2? + + + + * put Tcl/Tk NVIZ back into grass-core so that qgis users can use it? (that seems to be a popular use of the qgis-grass toolbox) -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3065 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2012-02-29 23:54:54 + (Wed, 29 Feb 2012) New Revision: 3065 Modified: packages/opencpn/trunk/debian/changelog packages/opencpn/trunk/debian/copyright Log: new address for the FSF Modified: packages/opencpn/trunk/debian/changelog === --- packages/opencpn/trunk/debian/changelog 2012-02-25 10:01:48 UTC (rev 3064) +++ packages/opencpn/trunk/debian/changelog 2012-02-29 23:54:54 UTC (rev 3065) @@ -11,8 +11,11 @@ * Policy bumped to 3.9.3, without changes. * Closing ITP. (Closes: #538067) - -- M. Hamish Bowman hamis...@yahoo.com Tue, 31 Jan 2012 14:36:54 +1300 + [ Anton Martchukov ] + * Additional copyright file auditing + -- M. Hamish Bowman hamis...@yahoo.com Thu, 01 Mar 2012 12:53:43 +1300 + opencpn (2.4.708-0) unstable; urgency=low [ Anton Martchukov ] Modified: packages/opencpn/trunk/debian/copyright === --- packages/opencpn/trunk/debian/copyright 2012-02-25 10:01:48 UTC (rev 3064) +++ packages/opencpn/trunk/debian/copyright 2012-02-29 23:54:54 UTC (rev 3065) @@ -288,8 +288,8 @@ . You should have received a copy of the GNU Library General Public Licence along with this software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA. + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA. . EXCEPTION NOTICE . ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-88-g323e591
The following commit has been merged in the master branch: commit 323e59141968ff6b25f43922ed700d5836f2d80b Author: M. Hamish Bowman hamis...@yahoo.com Date: Mon Feb 27 23:19:36 2012 +1300 allow older distro users to use the same pkg controls unmodified diff --git a/debian/control b/debian/control index 9f4a1fd..6a162f9 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-depends: libfreetype6-dev, libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, - libjpeg-dev, libpng12-dev, libtiff5-dev, - libmysqlclient-dev, + libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev, + libmysqlclient-dev | libmysqlclient15-dev, libncurses5-dev, libpq-dev, # proj-bin needed for nad2bin during config -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-61-g0a692d2
The following commit has been merged in the master branch: commit 0a692d2be3a17015a70031bf749766795049434f Author: M. Hamish Bowman hamis...@yahoo.com Date: Sat Feb 25 21:21:17 2012 +1300 more moving of GUI library depending stuff into the grass-gui pkg diff --git a/debian/grass-gui.install b/debian/grass-gui.install index b63fe7d..8d4aa01 100644 --- a/debian/grass-gui.install +++ b/debian/grass-gui.install @@ -7,3 +7,5 @@ usr/lib/grass64/etc/gtcltk usr/lib/grass64/etc/nviz2.2 usr/lib/grass64/etc/v.digit usr/lib/grass64/etc/wxpython +usr/lib/grass64/bin/v.digit +usr/lib/grass64/bin/xganim diff --git a/debian/grass-gui.install.in b/debian/grass-gui.install.in index 40d8914..046ab8f 100644 --- a/debian/grass-gui.install.in +++ b/debian/grass-gui.install.in @@ -7,3 +7,5 @@ usr/lib/grass@VERSION@/etc/gtcltk usr/lib/grass@VERSION@/etc/nviz2.2 usr/lib/grass@VERSION@/etc/v.digit usr/lib/grass@VERSION@/etc/wxpython +usr/lib/grass@VERSION@/bin/v.digit +usr/lib/grass@VERSION@/bin/xganim diff --git a/debian/rules b/debian/rules index d2c1f18..567e37d 100755 --- a/debian/rules +++ b/debian/rules @@ -270,7 +270,9 @@ binary-arch: install etc/gui \ etc/nviz2.2 \ etc/v.digit \ - etc/wxpython ; do \ + etc/wxpython \ + bin/v.digit \ + bin/xganim ; do \ rm -rf debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$$COMPONENT; \ done dh_installmenu -a -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.1-62-gcd842ed
The following commit has been merged in the master branch:
commit cd842ed076e79996f81593c9c0fb37dece993641
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Sat Feb 25 22:00:09 2012 +1300
use system's copy of jquery.js
diff --git a/debian/control b/debian/control
index 6a95a63..6f7a722 100644
--- a/debian/control
+++ b/debian/control
@@ -136,7 +136,7 @@ Description: GRASS GIS user documentation
Package: grass-dev-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
Suggests: grass
Description: GRASS GIS Programmers' Manual
Commonly referred to as GRASS, this is a Geographic Information
diff --git a/debian/grass-dev-doc.links b/debian/grass-dev-doc.links
new file mode 100644
index 000..39b8f7a
--- /dev/null
+++ b/debian/grass-dev-doc.links
@@ -0,0 +1,3 @@
+usr/share/javascript/jquery/jquery.js
usr/share/doc/grass-dev-doc/programming-manual/html/db/html/jquery.js
+usr/share/javascript/jquery/jquery.js
usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/jquery.js
+usr/share/javascript/jquery/jquery.js
usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/jquery.js
diff --git a/debian/rules b/debian/rules
index 567e37d..4ddf4a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,6 +141,10 @@ endif
lib/vector/latex \
rfc/html \
rfc/latex
+ # jquery.js provided by a symlink to the libjs-jquery package
+ rm -f debian/tmp/programming-manual/html/db/html/jquery.js
+ rm -f debian/tmp/programming-manual/html/vector/html/jquery.js
+ rm -f debian/tmp/programming-manual/html/gis/html/jquery.js
install: build
dh_testdir
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
