[Git][debian-gis-team/proj][master] 3 commits: Add upstream patch to rename 'PROJ.4 Projections' to 'PROJ'.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / proj


Commits:
48550bad by Bas Couwenberg at 2018-03-25T11:16:24+02:00
Add upstream patch to rename 'PROJ.4 Projections' to 'PROJ'.

- - - - -
738a9d20 by Bas Couwenberg at 2018-03-31T12:47:22+02:00
Update Vcs-* URLs for Salsa.

- - - - -
4de128da by Bas Couwenberg at 2018-03-31T12:47:43+02:00
Drop override for vcs-deprecated-in-debian-infrastructure.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/Rename-PACKAGE_NAME-PROJ.4-Projections-PROJ.patch
- + debian/patches/series
- − debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proj (5.0.1~rc1-1~exp2) UNRELEASED; urgency=medium
+
+  * Add upstream patch to rename 'PROJ.4 Projections' to 'PROJ'.
+  * Update Vcs-* URLs for Salsa.
+  * Drop override for vcs-deprecated-in-debian-infrastructure.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 25 Mar 2018 11:16:20 +0200
+
 proj (5.0.1~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 9),
                graphviz,
                xz-utils
 Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/proj.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/proj.git
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/proj
+Vcs-Git: https://salsa.debian.org/debian-gis-team/proj.git
 Homepage: http://proj4.org/
 
 Package: proj-data


=====================================
debian/patches/Rename-PACKAGE_NAME-PROJ.4-Projections-PROJ.patch
=====================================
--- /dev/null
+++ b/debian/patches/Rename-PACKAGE_NAME-PROJ.4-Projections-PROJ.patch
@@ -0,0 +1,29 @@
+Description: Rename PACKAGE_NAME: PROJ.4 Projections -> PROJ
+Author: mwtoews <mwtoews at gmail.com>
+Origin: https://github.com/OSGeo/proj.4/pull/900/commits/45b302f2aee121b882b23b1e1959f3f297835c39
+Bug: https://github.com/OSGeo/proj.4/pull/900
+
+--- a/cmake/Proj4Config.cmake
++++ b/cmake/Proj4Config.cmake
+@@ -31,8 +31,8 @@ check_library_exists(m ceil "" HAVE_LIBM
+ 
+ set(PACKAGE "proj")
+ set(PACKAGE_BUGREPORT "https://github.com/OSGeo/proj.4/issues")
+-set(PACKAGE_NAME "PROJ.4 Projections")
+-set(PACKAGE_STRING "PROJ.4 Projections ${${PROJECT_INTERN_NAME}_VERSION}")
++set(PACKAGE_NAME "PROJ")
++set(PACKAGE_STRING "PROJ ${${PROJECT_INTERN_NAME}_VERSION}")
+ set(PACKAGE_TARNAME "proj")
+ set(PACKAGE_VERSION "${${PROJECT_INTERN_NAME}_VERSION}")
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.59)
+-AC_INIT([PROJ.4 Projections], 5.0.1, [https://github.com/OSGeo/proj.4/issues], proj)
++AC_INIT([PROJ], 5.0.1, [https://github.com/OSGeo/proj.4/issues], proj)
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_LANG(C)
+ 


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Rename-PACKAGE_NAME-PROJ.4-Projections-PROJ.patch


=====================================
debian/source/lintian-overrides deleted
=====================================
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Package not officially migrated to Salsa yet.
-proj source: vcs-deprecated-in-debian-infrastructure * https://anonscm.debian.org/*
-



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/8e6455526b457c04fd903840f6db210cedffd3bd...4de128dadc7fe1823824db74fcd4b56468e76faa

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/8e6455526b457c04fd903840f6db210cedffd3bd...4de128dadc7fe1823824db74fcd4b56468e76faa
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180331/ce43f5c9/attachment-0001.html>