r3102 - packages/mbsystem/trunk/debian

2013-06-06 Thread hamish-guest 
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

[SCM] postgis branch, master, updated. upstream/2.0.1-45-gcfc45f3

2013-06-06 Thread Markus Wanner 
The following commit has been merged in the master branch:
commit cfc45f37bdbea590c8680d6f0cb27829c4421355
Author: Markus Wanner 
Date:   Wed Jun 5 22:55:40 2013 +0200

Be less specific in 
debian/postgresql-generic-postgis-2.0-scripts.install.in,
drop the perl utility scripts - those seem to be relevant at build time
exclusively.

diff --git a/debian/postgresql-generic-postgis-2.0-scripts.install.in 
b/debian/postgresql-generic-postgis-2.0-scripts.install.in
index 78b87a2..07d816f 100644
--- a/debian/postgresql-generic-postgis-2.0-scripts.install.in
+++ b/debian/postgresql-generic-postgis-2.0-scripts.install.in
@@ -1,2 +1 @@
-usr/share/postgresql/@PGVERSION@/extension/
-utils/*.pl /usr/share/postgresql/@PGVERSION@/extension/postgis-utils/
+usr/share/postgresql/@PGVERSION@

-- 
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-44-g8d5f68a

2013-06-06 Thread Markus Wanner 
The following commit has been merged in the master branch:
commit 5f9eaf4df3d1b53b6a4489b27226a58432368525
Author: Markus Wanner 
Date:   Wed Jun 5 09:14:27 2013 +0200

Auto-create required postgresql-$(PGVERSION)-postgis-2.0.install file
for the current Postgres version.

diff --git a/debian/postgresql-9.1-postgis-2.0.install 
b/debian/postgresql-9.1-postgis-2.0.install
deleted file mode 100644
index abf68bb..000
--- a/debian/postgresql-9.1-postgis-2.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/postgresql/9.1/extension
-usr/lib/postgresql/9.1/lib
diff --git a/debian/postgresql-generic-postgis-2.0.install.in 
b/debian/postgresql-generic-postgis-2.0.install.in
new file mode 100644
index 000..bf135b6
--- /dev/null
+++ b/debian/postgresql-generic-postgis-2.0.install.in
@@ -0,0 +1,2 @@
+usr/share/postgresql/@PGVERSION@/extension
+usr/lib/postgresql/@PGVERSION@/lib
diff --git a/debian/rules b/debian/rules
index 985be34..7d6a58a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,6 +121,7 @@ clean:
rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm
rm -f postgis/postgis_upgrade_20_minor.sql.in 
raster/rt_pg/rtpostgis_drop.sql \
raster/rt_pg/rtpostgis_upgrade_cleanup.sql
+   rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0.install
dh_clean
 
 install: install-indep install-arch
@@ -170,6 +171,11 @@ install-arch: build-arch
ln -sf 
/usr/share/postgis/$(POSTGIS_VERSION)/sql/$$BASENAME $$FILE; \
done
 
+#  Auto-create required .install file for the current Postgres version.
+   cat $(CURDIR)/debian/postgresql-generic-postgis-2.0.install.in \
+   | sed -e 's/@PGVERSION@/$(NEWEST_POSTGRES_VERSION)/' \
+   > 
$(CURDIR)/debian/postgresql-$(NEWEST_POSTGRES_VERSION)-postgis-2.0.install
+
dh_install -s
 
 check: install-arch

-- 
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-44-g8d5f68a

2013-06-06 Thread Markus Wanner 
The following commit has been merged in the master branch:
commit 8d5f68a54b21fce89e0438469e0aeb5c5c25624d
Author: Markus Wanner 
Date:   Wed Jun 5 22:48:50 2013 +0200

It turned out the SQL scripts differ between Postgres
versions. So we need a per-postgres-version package of the
scripts (while still architecture independent). This relieves us
from the symlink dance. Rename the script package as appropriate
and adjust the changelog.

Move down the package description of
postgresql-PGVERSION-postgis-2.0 in debian/control.in to match
the generated file.

diff --git a/debian/changelog b/debian/changelog
index c4e1a11..136e66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,7 @@ postgis (2.0.3-1) UNRELEASED; urgency=low
   * Compile the postgis jdbc java library again, using maven directly. Add
 required Build-Depends-Indeps.
   * Separate large SQL scripts and perl utils. Put them in their own
-architecture independent and (hopefully) PostgreSQL version
-indepentend package: postgis-scripts2.0.3. Provide symlinks from the
-extension package.
+architecture independent indepentend package (..-scripts).
   * Separate PostGIS documentation into a postgis-doc package, register its
 contents with doc-base.
   * Append the PostGIS version to postgresql-9.1-postgis, so multiple
@@ -28,7 +26,8 @@ postgis (2.0.3-1) UNRELEASED; urgency=low
 liblwgeom2 to liblwgeom-2.0.3.
   * Add patch java-version-fix: Corrects java jdbc jar version.
   * Policy updated to 3.9.4. No changes.
-  * Add pgversions and allow generation of debian/control based on it.
+  * Add pgversions and allow generation of debian/control and various
+install files based on it.
   * Update debian/copyright a bit.
   * Update and improve watchfile.
 
diff --git a/debian/control b/debian/control
index 4c28137..a4bbb9f 100644
--- a/debian/control
+++ b/debian/control
@@ -47,21 +47,6 @@ Description: Geographic objects support for PostgreSQL -- 
documentation
  .
  This package contains the PostGIS documentation.
 
-Package: postgis-scripts2.0.3
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: postgresql-9.1-postgis-2.0
-Description: Geographic objects support for PostgreSQL -- 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
- database for geographic information systems (GIS), much like ESRI's
- SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
- "Simple Features Specification for SQL".
- .
- This package contains SQL scripts to upgrade from earlier PostGIS
- versions as well as Perl utility scripts.
-
 Package: libpostgis-java
 Architecture: all
 Section: java
@@ -115,8 +100,9 @@ Description: PostGIS "Lightweight Geometry" library - 
Development files
  the development files.
 
 Package: postgresql-9.1-postgis-2.0
-Depends: ${shlibs:Depends}, postgresql-9.1, postgis-scripts2.0.3,
- liblwgeom-2.0.3, ${misc:Depends}
+Depends: ${shlibs:Depends}, postgresql-9.1,
+ postgresql-9.1-postgis-2.0-scripts, liblwgeom-2.0.3,
+ ${misc:Depends}
 Recommends: postgis
 Breaks: postgis (<< 1.2.1)
 Architecture: any
@@ -130,3 +116,18 @@ Description: Geographic objects support for PostgreSQL 9.1
  .
  This package supports PostgreSQL 9.1.
 
+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
+ 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
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.1 as well as Perl utility scripts.
+
diff --git a/debian/control.in b/debian/control.in
index 8aadf88..4546148 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,22 +18,6 @@ Homepage: http://postgis.refractions.net/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
 
-Package: postgresql-PGVERSION-postgis-2.0
-Depends: ${shlibs:Depends}, postgresql-PGVERSION, postgis-scripts2.0.3,
- liblwgeom-2.0.3, ${misc:Depends}
-Recommends: postgis
-Breaks: postgis (<< 1.2.1)
-Architecture: any
-Description: Geographic objects support for PostgreSQL PGVERSION
- 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
- database for geographic information systems (GIS), much like ESRI's
- SDE or Or