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
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
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
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
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
RFS: postgis-2.0.3
Hi, recently, I've been working on packaging PostGIS 2.0 for Debian and now consider it ready for uploading to unstable. I'm a DM and would also appreciate upload rights for that package. Some notes: I took great care to ensure postgis-2.0.3 won't break existing installations of postgis-1.x. For that reason, the binary package names now include a version, i.e. 'postgis-2.0'. Effective upgrade from 1.x to 2.0 requires a dump/restore cycle and is left to the user. Upstream is mixed about liblwgeom. Basically, at the moment, there is no backwards-compatibility guarantee. Taking a conservative approach, I thus added the full version to the binary package name, i.e. liblwgeom-2.0.3. As postgis itself is currently the only user of that library in Debian, that shouldn't be much of an issue. However, spatialite for example may eventually use it as well. See upstream bugs on component liblwgeom: http://trac.osgeo.org/postgis/query?status=assigned&status=new&status=reopened&component=liblwgeom Please see the postgis alioth repository here: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git Regards Markus Wanner signature.asc Description: OpenPGP digital signature ___ 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] postgis branch, pgdg, created. upstream/2.0.1-49-gbc2dbed
The branch, pgdg has been created at bc2dbed306535d57a2cee5b86b9b779a90256ae4 (commit) - Shortlog commit bc2dbed306535d57a2cee5b86b9b779a90256ae4 Author: Markus Wanner Date: Fri Jun 7 16:53:09 2013 +0200 Bundle a pgdg package that additionally supports Postgres 8.4, 9.0 and 9.2. Default to suggest the Postgres 9.2 packages for pgdg, instead of 9.1. Adjust rules to build PostGIS for each Postgres version in a separate directory. --- -- PostGIS for PostgreSQL ___ 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] postgis branch, master, updated. upstream/2.0.1-48-g604bb4d
The following commit has been merged in the master branch:
commit 2291929d477935134fb862d5a2d77b608628ebf5
Author: Markus Wanner
Date: Wed Jun 5 22:59:26 2013 +0200
Add back the PostgreSQL version to the short description of the
postgresql-postgis-scripts package.
diff --git a/debian/control b/debian/control
index a4bbb9f..293c25d 100644
--- a/debian/control
+++ b/debian/control
@@ -120,7 +120,7 @@ Package: postgresql-9.1-postgis-2.0-scripts
Architecture: all
Depends: ${misc:Depends}
Recommends: postgresql-9.1-postgis-2.0
-Description: Geographic objects support for PostgreSQL -- scripts
+Description: Geographic objects support for PostgreSQL 9.1 -- scripts
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables"
the PostgreSQL server, allowing it to be used as a backend spatial
diff --git a/debian/control.in b/debian/control.in
index 4546148..1cf3c80 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -120,7 +120,7 @@ Package: postgresql-PGVERSION-postgis-2.0-scripts
Architecture: all
Depends: ${misc:Depends}
Recommends: postgresql-PGVERSION-postgis-2.0
-Description: Geographic objects support for PostgreSQL -- scripts
+Description: Geographic objects support for PostgreSQL PGVERSION -- scripts
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables"
the PostgreSQL server, allowing it to be used as a backend spatial
--
PostGIS for PostgreSQL
___
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] postgis branch, master, updated. upstream/2.0.1-48-g604bb4d
The following commit has been merged in the master branch: commit 604bb4dffdceea34e3ee3ac45f9a63bc9841e8c6 Author: Markus Wanner Date: Wed Jun 5 23:13:32 2013 +0200 debian/changelog: prepare for upload to unstable. diff --git a/debian/changelog b/debian/changelog index 136e66f..3c48562 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -postgis (2.0.3-1) UNRELEASED; urgency=low +postgis (2.0.3-1) unstable; urgency=low [Markus Wanner] * Team upload @@ -43,7 +43,7 @@ postgis (2.0.3-1) UNRELEASED; urgency=low * Removed old patches (generator, html_doc_resources, install) * Added patch fixmakedoc for doc/Makefile.comments. - -- Markus Wanner Mon, 15 Apr 2013 22:12:27 +0200 + -- Markus Wanner Wed, 05 Jun 2013 23:12:35 +0200 postgis (1.5.3-2) unstable; urgency=low -- PostGIS for PostgreSQL ___ 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] postgis branch, master, updated. upstream/2.0.1-48-g604bb4d
The following commit has been merged in the master branch: commit c91058587431fb57cfd8f63d738e8d095b0aafe2 Author: Markus Wanner Date: Wed Jun 5 23:01:11 2013 +0200 debian/rules: tweak some comments - no functional change. diff --git a/debian/rules b/debian/rules index 6d504a5..135f653 100755 --- a/debian/rules +++ b/debian/rules @@ -82,7 +82,7 @@ build-indep-stamp: configuration-stamp $(MAKE) -C raster/rt_pg rtpostgis.sql rtpostgis_upgrade_20_minor.sql $(MAKE) -C topology topology.sql topology_upgrade_20_minor.sql -# This create the required SQL scripts. Again, the Makefile is not +# This creates the required SQL scripts. Again, the Makefile is not # clever enough to run this before 'install'. $(MAKE) -C extensions @@ -132,6 +132,7 @@ install-indep: build-indep dh_prep -i dh_installdirs -i +# Install extensions $(MAKE) -C extensions install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C doc docs-install \ DESTDIR=$(CURDIR)/debian/tmp \ @@ -150,6 +151,7 @@ install-arch: build-arch dh_prep -s dh_installdirs -s +# Install docs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C doc man-install \ DESTDIR=$(CURDIR)/debian/tmp \ -- PostGIS for PostgreSQL ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
