[grass] 05/16: New upstream release candidate.
Bas Couwenberg
sebastic at debian.org
Fri Oct 28 14:16:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit 9d29378b484d7d47f3cbd49ce299dd806b41dee8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 28 12:51:57 2016 +0200
New upstream release candidate.
Drop Conflicts/Provides/Replaces for old upstream GRASS 7.0 packages.
---
debian/changelog | 6 ++++--
debian/control | 42 +++---------------------------------------
debian/grass-core.dirs | 2 +-
debian/grass-core.install | 18 +++++++++---------
debian/grass-core.links | 24 ++++++++++++------------
debian/grass-core.manpages | 2 +-
debian/grass-dev.dirs | 6 +++---
debian/grass-dev.install | 4 ++--
debian/grass-dev.links | 2 +-
debian/grass-doc.install | 4 ++--
debian/grass-doc.links | 2 +-
debian/grass-gui.dirs | 2 +-
debian/grass-gui.install | 4 ++--
debian/grass-gui.links | 4 ++--
debian/patches/appstream.patch | 2 +-
debian/x-grass7 | 6 +++---
16 files changed, 48 insertions(+), 82 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 687b9fa..285ed49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-grass (7.0.5-3) UNRELEASED; urgency=medium
+grass (7.2.0~rc1-1) UNRELEASED; urgency=medium
+ * New upstream release candidate.
* Drop unused overrides for hardening-no-pie.
* Update watch file for 7.2.x releases.
+ * Drop Conflicts/Provides/Replaces for old upstream GRASS 7.0 packages.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 25 Oct 2016 20:36:48 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 12:44:55 +0200
grass (7.0.5-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b299093..bf8f4ae 100644
--- a/debian/control
+++ b/debian/control
@@ -61,12 +61,6 @@ Depends: grass-core,
${misc:Depends}
Recommends: grass-doc
Suggests: grass-dev
-Conflicts: grass70,
- grass7
-Provides: grass70,
- grass7
-Replaces: grass70,
- grass7
Description: Geographic Resources Analysis Support System (GRASS GIS)
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -103,14 +97,8 @@ Suggests: grass-doc,
python-rpy2,
python-termcolor
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-core,
- grass7-core
-Provides: grass705,
- grass70-core,
- grass7-core
-Replaces: grass70-core,
- grass7-core,
- grass (<< 6.4.2-1~)
+Provides: grass720-1,
+Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS core components
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -137,13 +125,7 @@ Recommends:
python-imaging,
python-matplotlib
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-gui,
- grass7-gui
-Provides: grass70-gui,
- grass7-gui
-Replaces: grass (<< 6.4.2-1~),
- grass70-gui,
- grass7-gui
+Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS graphical user interfaces
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -160,12 +142,6 @@ Architecture: all
Depends: ${misc:Depends}
Suggests: grass,
grass-dev-doc
-Conflicts: grass70-doc,
- grass7-doc
-Provides: grass70-doc,
- grass7-doc
-Replaces: grass70-doc,
- grass7-doc
Description: GRASS GIS user documentation
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -182,12 +158,6 @@ Architecture: all
Depends: libjs-jquery,
${misc:Depends}
Suggests: grass
-Conflicts: grass70-dev-doc,
- grass7-dev-doc
-Provides: grass70-dev-doc,
- grass7-dev-doc
-Replaces: grass70-dev-doc,
- grass7-dev-doc
Description: GRASS GIS Programmers' Manual
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -215,12 +185,6 @@ Depends: grass-core (= ${binary:Version}),
Recommends: subversion
Suggests: grass-dev-doc,
pkg-config
-Conflicts: grass70-dev,
- grass7-dev
-Provides: grass70-dev,
- grass7-dev
-Replaces: grass70-dev,
- grass7-dev
Description: GRASS GIS development files
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
diff --git a/debian/grass-core.dirs b/debian/grass-core.dirs
index 3cc00c1..3fdfc86 100644
--- a/debian/grass-core.dirs
+++ b/debian/grass-core.dirs
@@ -1,4 +1,4 @@
-usr/lib/grass70
+usr/lib/grass72
usr/bin
usr/share/doc/grass-core
usr/share/man
diff --git a/debian/grass-core.install b/debian/grass-core.install
index 0762943..a8f0d9d 100644
--- a/debian/grass-core.install
+++ b/debian/grass-core.install
@@ -1,12 +1,12 @@
-usr/bin/grass70
-usr/bin/x-grass70
-usr/lib/grass70/bin
-usr/lib/grass70/driver
-usr/lib/grass70/etc
-usr/lib/grass70/fonts
-usr/lib/grass70/lib
-usr/lib/grass70/locale
-usr/lib/grass70/scripts
+usr/bin/grass72
+usr/bin/x-grass72
+usr/lib/grass72/bin
+usr/lib/grass72/driver
+usr/lib/grass72/etc
+usr/lib/grass72/fonts
+usr/lib/grass72/lib
+usr/lib/grass72/locale
+usr/lib/grass72/scripts
usr/share/appdata
usr/share/applications
usr/share/icons/hicolor
diff --git a/debian/grass-core.links b/debian/grass-core.links
index ead2ca3..a5316c8 100644
--- a/debian/grass-core.links
+++ b/debian/grass-core.links
@@ -1,12 +1,12 @@
-usr/bin/grass70 usr/bin/grass
-usr/bin/x-grass70 usr/bin/x-grass
-usr/share/man/man1/grass70.1.gz usr/share/man/man1/grass.1.gz
-usr/share/man/man1/grass70.1.gz usr/share/man/man1/x-grass.1.gz
-usr/share/man/man1/grass70.1.gz usr/share/man/man1/x-grass70.1.gz
-usr/share/doc/grass-core/AUTHORS usr/lib/grass70/AUTHORS
-usr/share/doc/grass-core/CITING usr/lib/grass70/CITING
-usr/share/doc/grass-core/COPYING usr/lib/grass70/COPYING
-usr/share/doc/grass-core/contributors.csv usr/lib/grass70/contributors.csv
-usr/share/doc/grass-core/contributors_extra.csv usr/lib/grass70/contributors_extra.csv
-usr/share/doc/grass-core/translators.csv usr/lib/grass70/translators.csv
-usr/share/common-licenses/GPL-2 usr/lib/grass70/GPL.TXT
+usr/bin/grass72 usr/bin/grass
+usr/bin/x-grass72 usr/bin/x-grass
+usr/share/man/man1/grass72.1.gz usr/share/man/man1/grass.1.gz
+usr/share/man/man1/grass72.1.gz usr/share/man/man1/x-grass.1.gz
+usr/share/man/man1/grass72.1.gz usr/share/man/man1/x-grass72.1.gz
+usr/share/doc/grass-core/AUTHORS usr/lib/grass72/AUTHORS
+usr/share/doc/grass-core/CITING usr/lib/grass72/CITING
+usr/share/doc/grass-core/COPYING usr/lib/grass72/COPYING
+usr/share/doc/grass-core/contributors.csv usr/lib/grass72/contributors.csv
+usr/share/doc/grass-core/contributors_extra.csv usr/lib/grass72/contributors_extra.csv
+usr/share/doc/grass-core/translators.csv usr/lib/grass72/translators.csv
+usr/share/common-licenses/GPL-2 usr/lib/grass72/GPL.TXT
diff --git a/debian/grass-core.manpages b/debian/grass-core.manpages
index 78a8b30..0c0a838 100644
--- a/debian/grass-core.manpages
+++ b/debian/grass-core.manpages
@@ -1 +1 @@
-debian/grass70.1
+debian/grass72.1
diff --git a/debian/grass-dev.dirs b/debian/grass-dev.dirs
index 899e40c..0a95275 100644
--- a/debian/grass-dev.dirs
+++ b/debian/grass-dev.dirs
@@ -1,4 +1,4 @@
-usr/lib/grass70/include
-usr/lib/grass70/include/Make
-usr/lib/grass70/tools
+usr/lib/grass72/include
+usr/lib/grass72/include/Make
+usr/lib/grass72/tools
usr/share/pkgconfig
diff --git a/debian/grass-dev.install b/debian/grass-dev.install
index bf53a03..eb39e19 100644
--- a/debian/grass-dev.install
+++ b/debian/grass-dev.install
@@ -1,2 +1,2 @@
-usr/lib/grass70/include
-usr/lib/grass70/tools
+usr/lib/grass72/include
+usr/lib/grass72/tools
diff --git a/debian/grass-dev.links b/debian/grass-dev.links
index 803acb3..e936a3a 100644
--- a/debian/grass-dev.links
+++ b/debian/grass-dev.links
@@ -1 +1 @@
-usr/share/pkgconfig/grass70.pc usr/share/pkgconfig/grass.pc
+usr/share/pkgconfig/grass72.pc usr/share/pkgconfig/grass.pc
diff --git a/debian/grass-doc.install b/debian/grass-doc.install
index 8104095..e0f80cf 100644
--- a/debian/grass-doc.install
+++ b/debian/grass-doc.install
@@ -1,2 +1,2 @@
-usr/lib/grass70/docs/html usr/share/doc/grass-doc
-usr/lib/grass70/docs/man/man1 usr/share/man
+usr/lib/grass72/docs/html usr/share/doc/grass-doc
+usr/lib/grass72/docs/man/man1 usr/share/man
diff --git a/debian/grass-doc.links b/debian/grass-doc.links
index e1da1f5..4dfcf7d 100644
--- a/debian/grass-doc.links
+++ b/debian/grass-doc.links
@@ -1 +1 @@
-usr/share/doc/grass-doc/html usr/lib/grass70/docs/html
+usr/share/doc/grass-doc/html usr/lib/grass72/docs/html
diff --git a/debian/grass-gui.dirs b/debian/grass-gui.dirs
index c7b34fd..655f517 100644
--- a/debian/grass-gui.dirs
+++ b/debian/grass-gui.dirs
@@ -1 +1 @@
-usr/share/grass70
+usr/share/grass72
diff --git a/debian/grass-gui.install b/debian/grass-gui.install
index b2b0442..b5fabe7 100644
--- a/debian/grass-gui.install
+++ b/debian/grass-gui.install
@@ -1,2 +1,2 @@
-usr/lib/grass70/gui
-usr/share/grass70/gui
+usr/lib/grass72/gui
+usr/share/grass72/gui
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
index a7d7736..33b594d 100755
--- a/debian/grass-gui.links
+++ b/debian/grass-gui.links
@@ -1,8 +1,8 @@
#!/bin/sh
cat <<DIRS
-usr/share/grass70/gui/icons usr/lib/grass70/gui/icons
-usr/share/grass70/gui/images usr/lib/grass70/gui/images
+usr/share/grass72/gui/icons usr/lib/grass72/gui/icons
+usr/share/grass72/gui/images usr/lib/grass72/gui/images
DIRS
if [ -e debian/grass-gui.image-file-in-usr-lib.list ]; then \
diff --git a/debian/patches/appstream.patch b/debian/patches/appstream.patch
index 6df249e..8c90941 100644
--- a/debian/patches/appstream.patch
+++ b/debian/patches/appstream.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
<!-- Copyright 2014 Richard Hughes <richard at hughsie.com> -->
<component type="desktop">
- <id>grass.desktop</id>
-+ <id>grass70.desktop</id>
++ <id>grass72.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<summary>GRASS GIS, the Open Source Geographic Information System</summary>
diff --git a/debian/x-grass7 b/debian/x-grass7
index c5d59d0..fbb7a22 100755
--- a/debian/x-grass7
+++ b/debian/x-grass7
@@ -5,13 +5,13 @@
if [ -n "$DISPLAY" ]; then
if [ -n "$(tty)" ]; then
- exec /usr/bin/grass70 "$@"
+ exec /usr/bin/grass72 "$@"
else
- exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass70 $@"
+ exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass72 $@"
fi
else
if [ -n "$(tty)" ]; then
- exec /usr/bin/grass70 "$@"
+ exec /usr/bin/grass72 "$@"
fi
fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git
More information about the Pkg-grass-devel
mailing list