The following commit has been merged in the master branch:
commit a58129fcec5d42ae1cae2bb2bda9a72d37ae8bef
Merge: e3d50a9bb6a95640b64ae7792bcb251452f63ae9
d38fa69827927e353528a7f3a584132d88c8a4ec
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Mon Nov 25 15:25:13 2013 +0100
Merge branch 'sid'
Conflicts:
config.guess
config.sub
debian/changelog
debian/control
debian/proj-bin.install
debian/rules
diff --combined config.guess
index 278f9e9,0f0fe71..11a9347
--- a/config.guess
+++ b/config.guess
@@@ -4,7 -4,7 +4,11 @@@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
++<<<<<<< HEAD
+timestamp='2007-07-22'
++=======
+ timestamp='2007-03-06'
++>>>>>>> sid
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@@ -330,7 -330,7 +334,11 @@@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
++<<<<<<< HEAD
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++=======
+ i86pc:SunOS:5.*:*)
++>>>>>>> sid
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@@ -793,7 -793,7 +801,11 @@@ EO
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
++<<<<<<< HEAD
+ x86)
++=======
+ x86)
++>>>>>>> sid
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --combined config.sub
index 1761d8b,5defff6..e01d92f
--- a/config.sub
+++ b/config.sub
@@@ -4,7 -4,7 +4,11 @@@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
++<<<<<<< HEAD
+timestamp='2007-06-28'
++=======
+ timestamp='2007-01-18'
++>>>>>>> sid
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@@ -475,8 -475,8 +479,13 @@@ case $basic_machine i
basic_machine=craynv-cray
os=-unicosmp
;;
++<<<<<<< HEAD
+ cr16)
+ basic_machine=cr16-unknown
++=======
+ cr16c)
+ basic_machine=cr16c-unknown
++>>>>>>> sid
os=-elf
;;
crds | unos)
@@@ -683,10 -683,6 +692,13 @@@
basic_machine=i386-pc
os=-mingw32
;;
++<<<<<<< HEAD
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
++=======
++>>>>>>> sid
miniframe)
basic_machine=m68000-convergent
;;
diff --combined debian/control
index 00968c0,66b9875..4e7d14b
--- a/debian/control
+++ b/debian/control
@@@ -2,36 -2,18 +2,18 @@@ Source: pro
Section: science
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
- Uploaders: Peter S Galbraith <p...@debian.org>, Francesco Paolo Lovergine
<fran...@debian.org>
- Build-Depends: debhelper (>= 7), sharutils, dpatch
- Standards-Version: 3.8.3
+ Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
+ Build-Depends: debhelper (>= 9), sharutils
+ Standards-Version: 3.9.3
Homepage: http://trac.osgeo.org/proj/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/proj/
- Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/proj/
-
- Package: proj
- Architecture: all
- Depends: libproj0 (>= 4.6.1-4), proj-bin (>= 4.6.1-4), libproj-dev (>=
4.6.1-4), ${misc:Depends}
- Description: Cartographic projection filter and library (transitional package)
- Proj and invproj perform respective forward and inverse transformation
- of cartographic data to or from Cartesian data with a wide range of
- selectable projection functions (over 100 projections).
- .
- Geod and invgeod perform geodesic (Great Circle) computations for
- determining latitude, longitude and back azimuth of a terminus point given
- a initial point latitude, longitude, azimuth and distance (direct) or the
- forward and back azimuths and distance between an initial and terminus
- point latitudes and longitudes (inverse).
- .
- This is a transitional meta-package. You can safely remove it after
upgrading.
+ Vcs-Browser: http://git.debian.org/?p=pkg-grass/proj.git
+ Vcs-Git: git://git.debian.org/pkg-grass/proj.git
Package: proj-data
Architecture: any
Section: libs
- Conflicts: proj (<= 4.6.1-3)
- Replaces: proj (<= 4.6.1-3)
Depends: ${misc:Depends}
- Description: Cartographic projection filter and library (transitional package)
+ Description: Cartographic projection filter and library (datum package)
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
selectable projection functions (over 100 projections).
@@@ -50,8 -32,6 +32,6 @@@ Architecture: an
Section: libs
Depends: proj-data, ${shlibs:Depends}, ${misc:Depends}
Suggests: proj-bin
- Conflicts: proj (<= 4.6.1-3)
- Replaces: proj (<= 4.6.1-3)
Description: Cartographic projection library
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
@@@ -71,8 -51,6 +51,6 @@@ Architecture: an
Section: libdevel
Depends: libproj0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: proj-bin
- Conflicts: proj (<= 4.6.1-3)
- Replaces: proj (<= 4.6.1-3)
Description: Cartographic projection library (development files)
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
@@@ -88,9 -66,8 +66,7 @@@
Package: proj-bin
Architecture: any
-Section: science
Depends: ${shlibs:Depends}, ${misc:Depends}
- Conflicts: proj (<= 4.6.1-3)
- Replaces: proj (<= 4.6.1-3)
Description: Cartographic projection library (tools)
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
diff --combined debian/rules
index 99c5750,37dbc1f..04a3472
--- a/debian/rules
+++ b/debian/rules
@@@ -6,23 -6,19 +6,21 @@@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DH_ALWAYS_EXCLUDE=CVS:.svn
+
CFLAGS=-O2 -Wall
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
# `nostrip' handled by dh_strip...
- include /usr/share/dpatch/dpatch.make
-
datumgrids: datumgrids-stamp
datumgrids-stamp:
unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids.shar
unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids-ch.shar
touch $@
- config: datumgrids patch config.status
+ config: datumgrids config.status
config.status:
./configure --prefix=/usr --infodir=/usr/share/info
--mandir=/usr/share/man
@@@ -32,7 -28,7 +30,7 @@@ build-stamp
$(MAKE) CFLAGS="$(CFLAGS)"
touch $@
- clean: unpatch
+ clean:
dh_testdir
dh_testroot
( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list
$(CURDIR)/debian/datumgrids-ch.list | xargs rm -f )
@@@ -71,7 -67,7 +69,7 @@@ install-data-stamp
binary-indep:
dh_testdir -i
dh_testroot -i
- dh_install -i
+ dh_install -i -X.svn
dh_installdocs -i
dh_installchangelogs -i
dh_installdeb -i
@@@ -83,7 -79,7 +81,7 @@@
binary-arch: install
dh_testdir -a
dh_testroot -a
- dh_install -a
+ dh_install -a -X.svn
dh_installdocs -a AUTHORS README
dh_installexamples -a
dh_installman -a
@@@ -92,9 -88,7 +90,8 @@@
dh_strip -a
dh_compress -a
dh_fixperms -a
- # dh_makeshlibs -a
- # Forces failure ignoring to collect new symbols
- dh_makeshlibs -- -c0
++# Forces failure ignoring to collect new symbols
+ dh_makeshlibs -a -- -c0
dh_shlibdeps -a
dh_installdeb -a
dh_gencontrol -a
--
Proj.4
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
