[SCM] osgearth branch, master, updated. b60da0a9e92e0a5bbe97cb0ae6b628861de33e43
The following commit has been merged in the master branch: commit b60da0a9e92e0a5bbe97cb0ae6b628861de33e43 Author: Pirmin Kalberer Date: Tue Aug 2 23:00:01 2011 +0200 get-orig-source target diff --git a/debian/rules b/debian/rules index 3a72cf9..d7dae2c 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,9 @@ export DH_OPTIONS include /usr/share/quilt/quilt.make +PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') + LDFLAGS += -Wl,--as-needed CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -106,3 +109,18 @@ binary-arch: build-arch install-arch binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure get-orig-source + + +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=. + rm -rf $(PACKAGE)-$(VERSION) + tar -xf $(PACKAGE)_$(VERSION).orig.tar.gz + rm $(PACKAGE)_$(VERSION).orig.tar.gz + mv gwaldron-osgearth* $(PACKAGE)-$(VERSION) + #Remove data files with unknown license + find $(PACKAGE)-$(VERSION)/data -not -name world.tif -type f | xargs rm + mv $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).orig + GZIP=--best tar -cz --owner root --group root --mode a+rX \ + -f $(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz \ + $(PACKAGE)-$(VERSION).orig + rm -r $(PACKAGE)-$(VERSION).orig diff --git a/debian/watch b/debian/watch index 37288ef..4930e4d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://githubredir.debian.net/github/gwaldron/osgearth (.*).tar.gz +http://githubredir.debian.net/github/gwaldron/osgearth .*osgearth_(.*)_.*.tar.gz -- osgEarth terrain rendering toolkit ___ 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] hdf5 branch, master, updated. upstream/1.8.4-patch1-40-gbf76afa
The following commit has been merged in the master branch:
commit 4528e12e3d6bff9b6b378f1713917901656c9005
Author: Sylvestre Ledru
Date: Tue Aug 2 18:30:40 2011 +0200
Rename package from libhdf5-serial-1.8.7 to libhdf5-serial-7 since upstream
is now trying to manage correctly sonames and other abi/api changes
diff --git a/debian/changelog b/debian/changelog
index 3a5d863..1f9beda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ hdf5 (1.8.7-2) UNRELEASED; urgency=low
[ Sylvestre Ledru ]
* Support of hurd-i386. Thanks to Pino Toscano for doing the work.
(Closes: #627896)
- * Drop the useless lam4-dev dependency. Thanks to Pino Toscano.
-(Closes: #604714)
+ * Drop the useless lam4-dev dependency. Thanks to Pino Toscano & Adam C
+Powell IV (Closes: #604714)
* armel/arm added to the archs of libhdf5-openmpi-dev (Closes: #636185)
+ * .la file are no longer shipped
[ Francesco Paolo Lovergine ]
* Ready for unstable.
diff --git a/debian/control b/debian/control
index fd01aa0..6155703 100644
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,13 @@ Homepage: http://hdfgroup.org/HDF5/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git
-Package: libhdf5-serial-1.8.7
+Package: libhdf5-serial-7
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6,
libhdf5-serial-1.8.6
Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
HDF5 is a file format and library for storing scientific data.
@@ -32,7 +32,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime
files - serial version
Package: libhdf5-serial-dev
Section: libdevel
Architecture: any
-Depends: libhdf5-serial-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
${misc:Depends}
+Depends: libhdf5-serial-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
${misc:Depends}
Conflicts: libhdf5-dev
Provides: libhdf5-dev
Suggests: libhdf5-doc
@@ -44,14 +44,14 @@ Description: Hierarchical Data Format 5 (HDF5) -
development files - serial vers
.
This package contains development files for serial platforms.
-Package: libhdf5-openmpi-1.8.7
+Package: libhdf5-openmpi-7
Section: libs
Priority: extra
Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6,
libhdf5-openmpi-1.8.6
Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI
version
HDF5 is a file format and library for storing scientific data.
@@ -65,7 +65,7 @@ Package: libhdf5-openmpi-dev
Section: libdevel
Priority: extra
Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
hurd-i386
-Depends: libhdf5-openmpi-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
libopenmpi-dev, ${misc:Depends}
Conflicts: libhdf5-dev
Provides: libhdf5-dev
Suggests: libhdf5-doc
@@ -77,14 +77,14 @@ Description: Hierarchical Data Format 5 (HDF5) -
development files - OpenMPI ver
.
This package contains development files for use with OpenMPI.
-Package: libhdf5-mpich2-1.8.7
+Package: libhdf5-mpich2-7
Section: libs
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6,
libhdf5-openmpi-1.8.6
Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
HDF5 is a file format and library for storing scientific data.
@@ -99,7 +99,7 @@ Package: libhdf5-mpich2-dev
Section: libdevel
Priority: extra
Architecture: any
-Depends: libhdf5-mpich2-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
libmpich21.0-dev, ${misc:Depends}
Conflicts: libhdf5-dev
Provides: libhdf5-dev
Suggests: libhdf5-doc
diff --git a/debian/control.in b/debian/control.in
index 9a88e75..d3e1e1e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,13 +13,13 @@ Homepage: http://hdfgroup.org/HDF5/
Vcs-Browser
[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-40-gbf76afa
The following commit has been merged in the master branch:
commit bf76afa4efe2f67374900eb2a1aa3730f4ee3362
Author: Sylvestre Ledru
Date: Tue Aug 2 18:38:26 2011 +0200
Missing conflicts + replaces + description of the change in the changelog
diff --git a/debian/changelog b/debian/changelog
index 1f9beda..5338d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-hdf5 (1.8.7-2) UNRELEASED; urgency=low
+hdf5 (1.8.7-2) experimental; urgency=low
[ Sylvestre Ledru ]
+ * hdf5 packages renamed to use soname versionning. Upstream looks like ready
+to support them correctly. Therefor, here is the changes:
+libhdf5-serial-1.8.7 => libhdf5-serial-7
+libhdf5-openmpi-1.8.7 => libhdf5-openmpi-7
+libhdf5-mpich2-1.8.7 => libhdf5-mpich2-7
* Support of hurd-i386. Thanks to Pino Toscano for doing the work.
(Closes: #627896)
* Drop the useless lam4-dev dependency. Thanks to Pino Toscano & Adam C
diff --git a/debian/control.in b/debian/control.in
index d3e1e1e..4183b75 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,9 +18,10 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6
+ libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6,
libhdf5-serial-1.8.6
+Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6,
libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7
Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
HDF5 is a file format and library for storing scientific data.
HDF5 was designed and implemented to address the deficiencies of
@@ -50,9 +51,11 @@ Priority: extra
Architecture: @ARCHS@
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
+ libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6,
libhdf5-openmpi-1.8.6
+Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6,
libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI
version
HDF5 is a file format and library for storing scientific data.
HDF5 was designed and implemented to address the deficiencies of
@@ -83,9 +86,11 @@ Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
+ libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6,
libhdf5-openmpi-1.8.6
+Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6,
libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
HDF5 is a file format and library for storing scientific data.
HDF5 was designed and implemented to address the deficiencies of
--
Hierarchical Data Format 5 (HDF5)
___
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] hdf5 branch, master, updated. upstream/1.8.4-patch1-40-gbf76afa
The following commit has been merged in the master branch: commit 6b170ecf71c75f5e0f9e8b6f6ddc6a9591f6436f Author: Sylvestre Ledru Date: Tue Aug 2 18:26:47 2011 +0200 Remove the .la file from the distribution diff --git a/debian/install_devlib b/debian/install_devlib index 62110a3..ad156fa 100644 --- a/debian/install_devlib +++ b/debian/install_devlib @@ -1,5 +1,4 @@ usr/include usr/lib/libhdf5*.so usr/lib/libhdf5*.settings -usr/lib/libhdf5*.la usr/lib/libhdf5*.a -- Hierarchical Data Format 5 (HDF5) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3044 - packages/opencpn/trunk/debian
Author: hamish-guest Date: 2011-08-02 11:46:13 + (Tue, 02 Aug 2011) New Revision: 3044 Modified: packages/opencpn/trunk/debian/changelog packages/opencpn/trunk/debian/rules Log: CSS and JavaScript cruft now dropped upstream Modified: packages/opencpn/trunk/debian/changelog === --- packages/opencpn/trunk/debian/changelog 2011-08-02 11:35:46 UTC (rev 3043) +++ packages/opencpn/trunk/debian/changelog 2011-08-02 11:46:13 UTC (rev 3044) @@ -2,6 +2,7 @@ * Packaged for upstream version 2.5.0 * Drop most of TinyXML patch (superseded by upstream) + * CSS and JavaScript cruft now dropped upstream * Closing ITP. (Closes: #538067) -- Hamish B Tue, 02 Aug 2011 22:36:56 +1200 Modified: packages/opencpn/trunk/debian/rules === --- packages/opencpn/trunk/debian/rules 2011-08-02 11:35:46 UTC (rev 3043) +++ packages/opencpn/trunk/debian/rules 2011-08-02 11:46:13 UTC (rev 3044) @@ -37,8 +37,3 @@ #READMEs already installed to the opencpn-data/docs dir rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README.bells rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/tcdata/README.harmonics - -override_dh_installdocs: - dh_installdocs - rm -rf $(CURDIR)/debian/opencpn-doc/usr/share/doc/opencpn-doc/doc/css/ - rm -rf $(CURDIR)/debian/opencpn-doc/usr/share/doc/opencpn-doc/doc/js/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3043 - packages/opencpn/tarballs
Author: hamish-guest Date: 2011-08-02 11:35:46 + (Tue, 02 Aug 2011) New Revision: 3043 Added: packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM Modified: packages/opencpn/tarballs/get_latest_from_git.sh Log: Packaged for upstream version 2.5.0; use dfsg pruning for dfsg issues, not packaging cleanup (debian/rules is for that) Modified: packages/opencpn/tarballs/get_latest_from_git.sh === --- packages/opencpn/tarballs/get_latest_from_git.sh2011-08-02 11:29:51 UTC (rev 3042) +++ packages/opencpn/tarballs/get_latest_from_git.sh2011-08-02 11:35:46 UTC (rev 3043) @@ -8,8 +8,6 @@ rm -rf opencpn/buildosx/ rm -rf opencpn/buildwin/ rm -rf opencpn/wxWidgets/ -rm -rf opencpn/plugins/grib_pi/src/bzip2/ -rm -rf opencpn/plugins/grib_pi/src/zlib*/ VERS=`cat opencpn/VERSION.cmake | cut -f2 -d'"' | head -n 3 | \ tr '\n' '.' | sed -e 's/\.$//'` Added: packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM === --- packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM (rev 0) +++ packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM 2011-08-02 11:35:46 UTC (rev 3043) @@ -0,0 +1,2 @@ +# http://pkg-grass.alioth.debian.org/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz +db6f0b02e49179397abc8ff7983a2389 opencpn_2.5.0+dfsg.orig.tar.gz ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3042 - in packages/opencpn/trunk/debian: . patches
Author: hamish-guest
Date: 2011-08-02 11:29:51 + (Tue, 02 Aug 2011)
New Revision: 3042
Modified:
packages/opencpn/trunk/debian/changelog
packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Packaged for upstream version 2.5.0
Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-07-20 11:27:53 UTC (rev
3041)
+++ packages/opencpn/trunk/debian/changelog 2011-08-02 11:29:51 UTC (rev
3042)
@@ -1,11 +1,17 @@
-opencpn (2.4.708+dfsg-1) unstable; urgency=low
+opencpn (2.5.0-1) unstable; urgency=low
+ * Packaged for upstream version 2.5.0
+ * Drop most of TinyXML patch (superseded by upstream)
+ * Closing ITP. (Closes: #538067)
+
+ -- Hamish B Tue, 02 Aug 2011 22:36:56 +1200
+
+opencpn (2.4.708-0) unstable; urgency=low
+
[ Anton Martchukov ]
* Packaged for upstream git beta version 2.4.708
* Fixed use_pkg_tinyxml.patch to apply cleanly with upstream changes
- * Added "dfsg" to version number
* Added DEP-5 machine-readable copyright file
- * Closing ITP. (Closes: #538067)
[ Hamish B ]
* FindTinyXML.cmake now included by upstream
Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
2011-07-20 11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
2011-08-02 11:29:51 UTC (rev 3042)
@@ -2,8 +2,8 @@
Author: Hamish B
Index: opencpn/src/about.cpp
===
opencpn.orig/src/about.cpp 2011-06-20 20:53:28.910938614 +1200
-+++ opencpn/src/about.cpp 2011-06-20 20:53:34.422923130 +1200
+--- opencpn.orig/src/about.cpp 2011-08-02 22:59:00.202915243 +1200
opencpn/src/about.cpp 2011-08-02 22:59:00.210927964 +1200
@@ -452,7 +452,8 @@
wxString def_lang_canonical =
wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)->CanonicalName;
Modified: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
===
--- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-20
11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-08-02
11:29:51 UTC (rev 3042)
@@ -1,52 +1,16 @@
Description: Use system's copy of the TinyXML library
Author: Hamish B
-Index: opencpn/CMakeLists.txt
+Index: opencpn/include/gpxdocument.h
===
opencpn.orig/CMakeLists.txt2011-07-09 18:33:01.292126460 +0400
-+++ opencpn/CMakeLists.txt 2011-07-09 18:52:35.488126851 +0400
-@@ -178,7 +178,8 @@
- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
- FIND_PACKAGE(ZLIB REQUIRED)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--FIND_PACKAGE(TinyXML)
-+FIND_PACKAGE(TinyXML REQUIRED)
-+INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR})
- ENDIF(UNIX)
+--- opencpn.orig/include/gpxdocument.h 2011-08-02 23:09:19.967165256 +1200
opencpn/include/gpxdocument.h 2011-08-02 23:09:48.359953077 +1200
+@@ -29,7 +29,9 @@
- # For convenience we define the sources as a variable. You can add
-@@ -276,7 +277,6 @@
- include/ais.h
- include/pluginmanager.h
- include/ocpn_plugin.h
-- include/tinystr.h
- include/gpxdocument.h
- )
-
-@@ -303,7 +303,6 @@
- src/about.cpp
- src/ais.cpp
- src/pluginmanager.cpp
-- src/tinystr.cpp
- src/gpxdocument.cpp
- )
-
-@@ -670,6 +669,7 @@
- ${GETTEXT_LIBRARY}
- ${BZIP2_LIBRARIES}
- ${ZLIB_LIBRARY}
-+ ${TINYXML_LIBRARIES}
- )
-
- IF(TINYXML_FOUND)
-Index: opencpn-2.4.708/include/gpxdocument.h
-===
opencpn-2.4.708.orig/include/gpxdocument.h 2011-07-09 18:53:08.484126861
+0400
-+++ opencpn-2.4.708/include/gpxdocument.h 2011-07-09 18:53:19.240126866
+0400
-@@ -29,7 +29,6 @@
-
#include
#include
--#include
++#ifndef TIXML_USE_STL
+ #include
++#endif
#include
const wxString GpxxColorNames[] = { _("Black"), _("DarkRed"), _("DarkGreen"),
_("DarkYellow"), _("DarkBlue"), _("DarkMagenta"), _("DarkCyan"),
_("LightGray"), _("DarkGray"), _("Red"), _("Green"), _("Yellow"), _("Blue"),
_("Magenta"), _("Cyan"), _("White") };//The last color defined by Garmin is
transparent - we ignore it
Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
2011-
[SCM] pyepr tag, debian/0.5-1, created. upstream/0.5-4-gda79c23
The tag, debian/0.5-1 has been created at da79c2359fedfa3d5b744324f1b0f379972ecd3d (commit) - Shortlog commit da79c2359fedfa3d5b744324f1b0f379972ecd3d Author: Antonio Valentino Date: Mon Aug 1 11:11:25 2011 +0200 Copyright file converted to dep5 format --- -- Python ENVISAT Product Reader API ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
