Author: aboudreault-guest
Date: 2010-05-14 20:26:04 +0000 (Fri, 14 May 2010)
New Revision: 2872

Added:
   packages/gdal-mrsid/trunk/debian/libgdal-mrsid-src.install.in
   packages/gdal-mrsid/trunk/libgdal-mrsid-1.7.2.tar.gz
Removed:
   packages/gdal-mrsid/trunk/debian/gdal-mrsid-src.install.in
   packages/gdal-mrsid/trunk/gdal-mrsid-1.6.1.tar.gz
   packages/gdal-mrsid/trunk/patches/
Modified:
   packages/gdal-mrsid/trunk/debian/README.Debian
   packages/gdal-mrsid/trunk/debian/README.source
   packages/gdal-mrsid/trunk/debian/changelog
   packages/gdal-mrsid/trunk/debian/control
   packages/gdal-mrsid/trunk/debian/rules
   packages/gdal-mrsid/trunk/gdal-mrsid-build.in
Log:
Merging branch 1.7 into main trunk

Modified: packages/gdal-mrsid/trunk/debian/README.Debian
===================================================================
--- packages/gdal-mrsid/trunk/debian/README.Debian      2010-05-14 20:24:07 UTC 
(rev 2871)
+++ packages/gdal-mrsid/trunk/debian/README.Debian      2010-05-14 20:26:04 UTC 
(rev 2872)
@@ -11,7 +11,7 @@
 
  * run the GDAL MrSID building script /usr/bin/gdal-mrsid-build
    provided with this package in order to compile and install the
-   plugin under /usr/lib/gdal16plugins.
+   plugin under /usr/lib/gdal17plugins.
 
 After that, gdalinfo --formats should show a couple of new MrSID formats
 available.

Modified: packages/gdal-mrsid/trunk/debian/README.source
===================================================================
--- packages/gdal-mrsid/trunk/debian/README.source      2010-05-14 20:24:07 UTC 
(rev 2871)
+++ packages/gdal-mrsid/trunk/debian/README.source      2010-05-14 20:26:04 UTC 
(rev 2872)
@@ -2,7 +2,7 @@
 ----------------------------------------------------
 
 You need to use a patch under patches directory. The first
-patch is required in order to add plugin support for GDAL 1.6.1+
+patch is required in order to add plugin support for GDAL 1.7.1+
 to the MrSID formats.
 
 You need to apply patch to upstream tree and then run from there 

Modified: packages/gdal-mrsid/trunk/debian/changelog
===================================================================
--- packages/gdal-mrsid/trunk/debian/changelog  2010-05-14 20:24:07 UTC (rev 
2871)
+++ packages/gdal-mrsid/trunk/debian/changelog  2010-05-14 20:26:04 UTC (rev 
2872)
@@ -1,3 +1,18 @@
+libgdal-mrsid (1.7.2-1) unstable; urgency=low
+
+  * NOT RELEASED.
+  * New upstream release.
+
+ -- Alan Boudreault <aboudrea...@mapgears.com>  Fri, 14 May 2010 16:20:21 -0400
+
+libgdal-mrsid (1.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Files updated for 1.7.0.
+  * Modified package name to libgdal-mrsid.
+
+ -- Alan Boudreault <aboudrea...@mapgears.com>  Fri, 14 May 2010 16:20:19 -0400
+
 gdal-mrsid (1.6.1-3) experimental; urgency=low
 
   * Added missing library for JPEG2000 support.

Modified: packages/gdal-mrsid/trunk/debian/control
===================================================================
--- packages/gdal-mrsid/trunk/debian/control    2010-05-14 20:24:07 UTC (rev 
2871)
+++ packages/gdal-mrsid/trunk/debian/control    2010-05-14 20:26:04 UTC (rev 
2872)
@@ -1,16 +1,16 @@
-Source: gdal-mrsid
+Source: libgdal-mrsid
 Section: contrib/science
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
-Build-Depends: debhelper (>>5.0.0), libgdal1-dev (>=1.6.0), libgeotiff-dev
+Build-Depends: debhelper (>>5.0.0), libgdal1-dev (>=1.7.0), libgeotiff-dev
 Standards-Version: 3.7.3
 Uploaders: Alan Boudreault <aboudrea...@mapgears.com>
 Homepage: http://www.gdal.org/
 
-Package: gdal-mrsid-src
+Package: libgdal-mrsid-src
 Section: libs
 Architecture: all
-Depends: libgdal1-dev (>=1.6.0), build-essential, libgeotiff-dev
+Depends: libgdal1-dev (>=1.7.0), build-essential, libgeotiff-dev
 Recommends: gdal-bin
 Description: MrSID extension for the Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.

Deleted: packages/gdal-mrsid/trunk/debian/gdal-mrsid-src.install.in
===================================================================
--- packages/gdal-mrsid/trunk/debian/gdal-mrsid-src.install.in  2010-05-14 
20:24:07 UTC (rev 2871)
+++ packages/gdal-mrsid/trunk/debian/gdal-mrsid-src.install.in  2010-05-14 
20:26:04 UTC (rev 2872)
@@ -1,2 +0,0 @@
-usr/src/gdal-mrs...@version@.tar.gz
-usr/bin/gdal-mrsid-build

Copied: packages/gdal-mrsid/trunk/debian/libgdal-mrsid-src.install.in (from rev 
2871, packages/gdal-mrsid/branches/1.7/debian/libgdal-mrsid-src.install.in)
===================================================================
--- packages/gdal-mrsid/trunk/debian/libgdal-mrsid-src.install.in               
                (rev 0)
+++ packages/gdal-mrsid/trunk/debian/libgdal-mrsid-src.install.in       
2010-05-14 20:26:04 UTC (rev 2872)
@@ -0,0 +1,2 @@
+usr/src/libgdal-mrs...@version@.tar.gz
+usr/bin/gdal-mrsid-build

Modified: packages/gdal-mrsid/trunk/debian/rules
===================================================================
--- packages/gdal-mrsid/trunk/debian/rules      2010-05-14 20:24:07 UTC (rev 
2871)
+++ packages/gdal-mrsid/trunk/debian/rules      2010-05-14 20:26:04 UTC (rev 
2872)
@@ -5,21 +5,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-VERSION=$(shell ls gdal-mrsid-*.tar.gz|cut -d- -f3|cut -d. -f1,2,3)
+VERSION=$(shell ls libgdal-mrsid-*.tar.gz|cut -d- -f3|cut -d. -f1,2,3)
 
 untar: untar-stamp
 untar-stamp:
        dh_testdir
 
        mkdir $(CURDIR)/tmp || true
-       tar xzf $(CURDIR)/gdal-mrsid-$(VERSION).tar.gz -C $(CURDIR)/tmp
+       tar xzf $(CURDIR)/libgdal-mrsid-$(VERSION).tar.gz -C $(CURDIR)/tmp
 
        touch untar-stamp
 
 tar: untar-stamp patch-stamp
        mkdir -p $(CURDIR)/debian/tmp/usr/src $(CURDIR)/debian/tmp/usr/bin
-       tar czf $(CURDIR)/debian/tmp/usr/src/gdal-mrsid-$(VERSION).tar.gz -C 
$(CURDIR)/tmp gdal-mrsid-$(VERSION)
-       sed -e 's/@VERSION@/$(VERSION)/' 
$(CURDIR)/debian/gdal-mrsid-src.install.in 
>$(CURDIR)/debian/gdal-mrsid-src.install
+       tar czf $(CURDIR)/debian/tmp/usr/src/libgdal-mrsid-$(VERSION).tar.gz -C 
$(CURDIR)/tmp libgdal-mrsid-$(VERSION)
+       sed -e 's/@VERSION@/$(VERSION)/' 
$(CURDIR)/debian/libgdal-mrsid-src.install.in 
>$(CURDIR)/debian/libgdal-mrsid-src.install
        sed -e 's/@VERSION@/$(VERSION)/' $(CURDIR)/gdal-mrsid-build.in 
>$(CURDIR)/debian/tmp/usr/bin/gdal-mrsid-build
        chmod a+x $(CURDIR)/debian/tmp/usr/bin/gdal-mrsid-build
 
@@ -44,7 +44,7 @@
        dh_testdir
        dh_testroot
        dh_install --sourcedir=$(CURDIR)/debian/tmp
-       rm -f $(CURDIR)/debian/gdal-mrsid-src.install
+       rm -f $(CURDIR)/debian/libgdal-mrsid-src.install
        dh_installdocs
        dh_installchangelogs
        dh_compress

Deleted: packages/gdal-mrsid/trunk/gdal-mrsid-1.6.1.tar.gz
===================================================================
(Binary files differ)

Modified: packages/gdal-mrsid/trunk/gdal-mrsid-build.in
===================================================================
--- packages/gdal-mrsid/trunk/gdal-mrsid-build.in       2010-05-14 20:24:07 UTC 
(rev 2871)
+++ packages/gdal-mrsid/trunk/gdal-mrsid-build.in       2010-05-14 20:26:04 UTC 
(rev 2872)
@@ -23,8 +23,8 @@
 #
 
 versi...@version@
-PLUGINDIR=/usr/lib/gdal16plugins
-TARBALL=/usr/src/gdal-mrsid-$VERSION.tar.gz
+PLUGINDIR=/usr/lib/gdal17plugins
+TARBALL=/usr/src/libgdal-mrsid-$VERSION.tar.gz
 
 if [ `id -u` -ne 0 ]; then
         echo "Run this script as root"
@@ -55,13 +55,13 @@
     fi
 fi
 
-BUILDDIR=`mktemp -d /tmp/gdal-mrsid-build.XXXXXX`
+BUILDDIR=`mktemp -d /tmp/libgdal-mrsid-build.XXXXXX`
 
 echo "Extracting GDAL/MrSID tarball" 
 tar xzf $TARBALL -C $BUILDDIR
 
 echo "Building GDAL/MrSID plugin"
-( cd $BUILDDIR/gdal-mrsid-$VERSION && \
+( cd $BUILDDIR/libgdal-mrsid-$VERSION && \
          sh ./configure --with-mrsid=$GEOEXPRESSSDK --with-jp2mrsid=yes 
--with-autoload=$PLUGINDIR && \
         make && \
         make install && chown root:root $PLUGINDIR/gdal_MrSID.so && chmod 0644 
$PLUGINDIR/gdal_MrSID.so )

Copied: packages/gdal-mrsid/trunk/libgdal-mrsid-1.7.2.tar.gz (from rev 2871, 
packages/gdal-mrsid/branches/1.7/libgdal-mrsid-1.7.2.tar.gz)
===================================================================
(Binary files differ)


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to