This is an automated email from the git hooks/post-receive script. frankie pushed a commit to branch master in repository ossim.
commit e69e4a57e4abdd6a0acd034c4f6f9fe49d29bfc3 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Fri Mar 7 18:14:31 2014 +0100 More changes for current binaries and better dh compliant rules file. --- debian/changelog | 11 ++++++----- debian/libossim-dev.install | 1 + debian/ossim-core.install | 16 ++++++++++++---- debian/rules | 34 +++++++++++++++------------------- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74e41e7..57be6a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ ossim (1.8.16-1) unstable; urgency=low * New upstream release. - (closes: #640010) + (closes: #640010, #735814) * Moved debian repository to git with new packaging style to simplify mantainership. New Vcs-* canonical fields set. * Policy bumped to 3.9.5. @@ -14,13 +14,14 @@ ossim (1.8.16-1) unstable; urgency=low * SONAME appears dummy, so better being pro-active and assigning a new one with strict version dependency. This is done in a new patch `soname'. - * Added support for kfreebsd with patch `kfreebsd' by updating - the configure file. + * Moved to cmake building system. The upstream building scripts have been + modified to generate both shared and static library. (closes: #628413) - * Fixed for libpng-dev b-d. + * Fixed for libpng-dev current b-d. (closes: #662460) * Removed cdbs use, now using modern dh_* methods. - * Removed obsoleted patches. + * Removed obsolete patches. + * Now also b-d on geos, c++ flavor. -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 04 Mar 2014 17:23:02 +0100 diff --git a/debian/libossim-dev.install b/debian/libossim-dev.install index 781d2b1..11b0f53 100644 --- a/debian/libossim-dev.install +++ b/debian/libossim-dev.install @@ -1,3 +1,4 @@ usr/lib/libossim.so usr/lib/libossim.a usr/include +usr/lib/libossim.a diff --git a/debian/ossim-core.install b/debian/ossim-core.install index 0c244d1..dd372fa 100644 --- a/debian/ossim-core.install +++ b/debian/ossim-core.install @@ -1,31 +1,39 @@ -usr/share/ossim/templates usr/bin/ossim-adrg-dump usr/bin/ossim-applanix2ogeom usr/bin/ossim-band-merge +usr/bin/ossim-batch-test usr/bin/ossim-btoa usr/bin/ossim-chgkwval +usr/bin/ossim-chipper usr/bin/ossim-cmm usr/bin/ossim-computeSrtmStats usr/bin/ossim-correl +usr/bin/ossim-create-bitmask usr/bin/ossim-create-cg usr/bin/ossim-create-histo +usr/bin/ossim-deg2dms +usr/bin/ossim-dem +usr/bin/ossim-dms2deg usr/bin/ossim-dump-ocg -#usr/bin/ossim-ecg2ocg usr/bin/ossim-extract-vertices -#usr/bin/ossim-height usr/bin/ossim-icp usr/bin/ossim-igen +usr/bin/ossim-image-compare usr/bin/ossim-img2md usr/bin/ossim-img2rr -#usr/bin/ossim-info +usr/bin/ossim-info usr/bin/ossim-modopt usr/bin/ossim-mosaic usr/bin/ossim-ogeom2ogeom usr/bin/ossim-orthoigen usr/bin/ossim-pixelflip +usr/bin/ossim-preproc usr/bin/ossim-prune usr/bin/ossim-rejout +usr/bin/ossim-rpf usr/bin/ossim-senint usr/bin/ossim-space-imaging +usr/bin/ossim-src2src usr/bin/ossim-swapbytes usr/bin/ossim-tfw2ogeom +usr/bin/ossim-ws-cmp diff --git a/debian/rules b/debian/rules index 3876e48..5cfed11 100755 --- a/debian/rules +++ b/debian/rules @@ -16,10 +16,6 @@ endif --sourcedirectory=$(CURDIR) \ --builddirectory=$(CURDIR)/debian/build -override_dh_auto_install: - -find debian/tmp/usr/share/ossim/templates -type f -exec chmod a-x {} \; - dh_auto_install - # Add here any variable or target overrides you need. CMAKE_OPTS = \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -41,22 +37,22 @@ CMAKE_OPTS = \ override_dh_auto_configure: [ -d debian/build ] || mkdir debian/build [ ! -e CMakeCache.txt ] || rm CMakeCache.txt - cd debian/build && \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \ - cmake $(CMAKE_OPTS) $(CURDIR) + dh_auto_configure -- $(CMAKE_OPTS) $(CURDIR) override_dh_auto_build: $(MAKE) -C debian/build -#override_dh_clean: -# [ -f Makefile ] || $(MAKE) clean; \ - find $(CURRENT) -name Makefile -delete; \ - find $(CURRENT) -name "*.o" -delete; \ - rm -f Makefile.common \ - config.status \ - include/ossim/ossimConfig.h \ - makelib.mak \ - makeprog.mak \ - ossim.spec \ - src/apps/ossim-config \ - src/apps/ossim-config-inst +overridd_dh_auto_install: + #$(MAKE) -C $(CURDIR)/debian/build install DESTDIR=$(CURDIR)/debian/tmp + dh_auto_install + install -d $(CURDIR)/debian/tmp/usr/share/ossim/templates/ + install -D $(CURDIR)/etc/templates/*.kwl $(CURDIR)/debian/tmp/usr/share/ossim/templates + install -T $(CURDIR)/etc/templates/ossim_preferences_template $(CURDIR)/debian/tmp/usr/share/ossim/templates/ossim_preferences + install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/ossim + find $(CURDIR)/debian/tmp/usr/share/ossim/templates -type f -exec chmod a-x {} \; + rm -f $(CURDIR)/debian/tmp/usr/include/ossimConfig.h + rm -f $(CURDIR)/debian/tmp/usr/include/ossimVersion.h + +override_dh_auto_clean: + rm -rf debian/build + dh_auto_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.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