This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master-svn in repository grass.
commit 8505c0721b4d02009f924f60ab44d8c494412b08 Author: Bas Couwenberg <[email protected]> Date: Sat Apr 9 13:04:49 2016 +0200 New upstream SVN snapshot. --- debian/changelog | 5 +++-- debian/control | 38 +++++++++++++++++++------------------- debian/grass-core.dirs | 2 +- debian/grass-core.install | 18 +++++++++--------- debian/grass-core.links | 22 +++++++++++----------- 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 | 40 ++++++++++++++++++++-------------------- debian/x-grass7 | 6 +++--- debian/{x-grass7 => x-grass7.in} | 6 +++--- 16 files changed, 82 insertions(+), 81 deletions(-) diff --git a/debian/changelog b/debian/changelog index c14e62e..3f4f2a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -grass (7.0.3-4) UNRELEASED; urgency=medium +grass (7.1.svn20160409-1) UNRELEASED; urgency=medium + * New upstream SVN snapshot. * Update watch file for SVN snapshots. * Exclude .svn directory from upstream tarball. - -- Bas Couwenberg <[email protected]> Sat, 09 Apr 2016 12:20:34 +0200 + -- Bas Couwenberg <[email protected]> Sat, 09 Apr 2016 12:50:12 +0200 grass (7.0.3-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 902f8c9..2e481c3 100644 --- a/debian/control +++ b/debian/control @@ -61,11 +61,11 @@ Depends: grass-core, ${misc:Depends} Recommends: grass-doc Suggests: grass-dev -Conflicts: grass70, +Conflicts: grass71, grass7 -Provides: grass70, +Provides: grass71, grass7 -Replaces: grass70, +Replaces: grass71, grass7 Description: Geographic Resources Analysis Support System (GRASS GIS) Commonly referred to as GRASS, this is a Geographic Information @@ -104,12 +104,12 @@ Suggests: grass-doc, # used by v.kridge python-rpy2 Breaks: grass (<< 6.4.2-1~) -Conflicts: grass70-core, +Conflicts: grass71-core, grass7-core -Provides: grass703, - grass70-core, +Provides: grass71svn, + grass71-core, grass7-core -Replaces: grass70-core, +Replaces: grass71-core, grass7-core, grass (<< 6.4.2-1~) Description: GRASS GIS core components @@ -137,12 +137,12 @@ Recommends: # PIL needed for wxPsmap preview python-imaging Breaks: grass (<< 6.4.2-1~) -Conflicts: grass70-gui, +Conflicts: grass71-gui, grass7-gui -Provides: grass70-gui, +Provides: grass71-gui, grass7-gui Replaces: grass (<< 6.4.2-1~), - grass70-gui, + grass71-gui, grass7-gui Description: GRASS GIS graphical user interfaces Commonly referred to as GRASS, this is a Geographic Information @@ -160,11 +160,11 @@ Architecture: all Depends: ${misc:Depends} Suggests: grass, grass-dev-doc -Conflicts: grass70-doc, +Conflicts: grass71-doc, grass7-doc -Provides: grass70-doc, +Provides: grass71-doc, grass7-doc -Replaces: grass70-doc, +Replaces: grass71-doc, grass7-doc Description: GRASS GIS user documentation Commonly referred to as GRASS, this is a Geographic Information @@ -182,11 +182,11 @@ Architecture: all Depends: ${misc:Depends}, libjs-jquery Suggests: grass -Conflicts: grass70-dev-doc, +Conflicts: grass71-dev-doc, grass7-dev-doc -Provides: grass70-dev-doc, +Provides: grass71-dev-doc, grass7-dev-doc -Replaces: grass70-dev-doc, +Replaces: grass71-dev-doc, grass7-dev-doc Description: GRASS GIS Programmers' Manual Commonly referred to as GRASS, this is a Geographic Information @@ -215,11 +215,11 @@ Depends: grass-core (= ${binary:Version}), Recommends: subversion Suggests: grass-dev-doc, pkg-config -Conflicts: grass70-dev, +Conflicts: grass71-dev, grass7-dev -Provides: grass70-dev, +Provides: grass71-dev, grass7-dev -Replaces: grass70-dev, +Replaces: grass71-dev, grass7-dev Description: GRASS GIS development files Commonly referred to as GRASS, this is a Geographic Information diff --git a/debian/grass-core.dirs b/debian/grass-core.dirs index 3cc00c1..8f4ac06 100644 --- a/debian/grass-core.dirs +++ b/debian/grass-core.dirs @@ -1,4 +1,4 @@ -usr/lib/grass70 +usr/lib/grass71 usr/bin usr/share/doc/grass-core usr/share/man diff --git a/debian/grass-core.install b/debian/grass-core.install index 0762943..3e05c9f 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/grass71 +usr/bin/x-grass71 +usr/lib/grass71/bin +usr/lib/grass71/driver +usr/lib/grass71/etc +usr/lib/grass71/fonts +usr/lib/grass71/lib +usr/lib/grass71/locale +usr/lib/grass71/scripts usr/share/appdata usr/share/applications usr/share/icons/hicolor diff --git a/debian/grass-core.links b/debian/grass-core.links index 4cf95ee..854b03c 100644 --- a/debian/grass-core.links +++ b/debian/grass-core.links @@ -1,11 +1,11 @@ -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/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/grass71 usr/bin/grass +usr/bin/x-grass71 usr/bin/x-grass +usr/share/man/man1/grass71.1.gz usr/share/man/man1/grass.1.gz +usr/share/man/man1/grass71.1.gz usr/share/man/man1/x-grass.1.gz +usr/share/man/man1/grass71.1.gz usr/share/man/man1/x-grass71.1.gz +usr/share/doc/grass-core/AUTHORS usr/lib/grass71/AUTHORS +usr/share/doc/grass-core/COPYING usr/lib/grass71/COPYING +usr/share/doc/grass-core/contributors.csv usr/lib/grass71/contributors.csv +usr/share/doc/grass-core/contributors_extra.csv usr/lib/grass71/contributors_extra.csv +usr/share/doc/grass-core/translators.csv usr/lib/grass71/translators.csv +usr/share/common-licenses/GPL-2 usr/lib/grass71/GPL.TXT diff --git a/debian/grass-core.manpages b/debian/grass-core.manpages index 78a8b30..6826f78 100644 --- a/debian/grass-core.manpages +++ b/debian/grass-core.manpages @@ -1 +1 @@ -debian/grass70.1 +debian/grass71.1 diff --git a/debian/grass-dev.dirs b/debian/grass-dev.dirs index 899e40c..8ae5de0 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/grass71/include +usr/lib/grass71/include/Make +usr/lib/grass71/tools usr/share/pkgconfig diff --git a/debian/grass-dev.install b/debian/grass-dev.install index bf53a03..2ef6597 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/grass71/include +usr/lib/grass71/tools diff --git a/debian/grass-dev.links b/debian/grass-dev.links index 803acb3..35d5e03 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/grass71.pc usr/share/pkgconfig/grass.pc diff --git a/debian/grass-doc.install b/debian/grass-doc.install index 8104095..1f205d0 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/grass71/docs/html usr/share/doc/grass-doc +usr/lib/grass71/docs/man/man1 usr/share/man diff --git a/debian/grass-doc.links b/debian/grass-doc.links index e1da1f5..62e0179 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/grass71/docs/html diff --git a/debian/grass-gui.dirs b/debian/grass-gui.dirs index c7b34fd..f4dc20c 100644 --- a/debian/grass-gui.dirs +++ b/debian/grass-gui.dirs @@ -1 +1 @@ -usr/share/grass70 +usr/share/grass71 diff --git a/debian/grass-gui.install b/debian/grass-gui.install index b2b0442..2edbc13 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/grass71/gui +usr/share/grass71/gui diff --git a/debian/grass-gui.links b/debian/grass-gui.links index b12ca07..1f7ad3b 100644 --- a/debian/grass-gui.links +++ b/debian/grass-gui.links @@ -1,21 +1,21 @@ -usr/share/grass70/gui/icons usr/lib/grass70/gui/icons -usr/share/grass70/gui/images usr/lib/grass70/gui/images +usr/share/grass71/gui/icons usr/lib/grass71/gui/icons +usr/share/grass71/gui/images usr/lib/grass71/gui/images -usr/share/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg -usr/share/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg -usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.png usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.png -usr/share/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass70/gui/wxpython/iclass/iclass_frame.jpg -usr/share/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg -usr/share/grass70/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass70/gui/wxpython/psmap/psmap_frame.jpg -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_1.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_1.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_2.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_2.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_3.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_3.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_4.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_4.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png -usr/share/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass70/gui/wxpython/timeline/timeline_2D.jpg -usr/share/grass70/gui/wxpython/tplot/tplot.png usr/lib/grass70/gui/wxpython/tplot/tplot.png -usr/share/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg +usr/share/grass71/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass71/gui/wxpython/animation/wxGUI_animation_tool.jpg +usr/share/grass71/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass71/gui/wxpython/dbmgr/dbmgr_frame.jpg +usr/share/grass71/gui/wxpython/gmodeler/gmodeler_frame.png usr/lib/grass71/gui/wxpython/gmodeler/gmodeler_frame.png +usr/share/grass71/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass71/gui/wxpython/iclass/iclass_frame.jpg +usr/share/grass71/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass71/gui/wxpython/mapswipe/mapswipe_tsunami.jpg +usr/share/grass71/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass71/gui/wxpython/psmap/psmap_frame.jpg +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_1.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_1.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_2.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_2.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_3.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_3.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_4.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_4.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_5.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_6.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_7.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_8.png +usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png +usr/share/grass71/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass71/gui/wxpython/timeline/timeline_2D.jpg +usr/share/grass71/gui/wxpython/tplot/tplot.png usr/lib/grass71/gui/wxpython/tplot/tplot.png +usr/share/grass71/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass71/gui/wxpython/vdigit/vdigit_toolbar.jpg diff --git a/debian/x-grass7 b/debian/x-grass7 index 4b91c03..401f320 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/grass71 "$@" else - exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass70 $@" + exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass71 $@" fi else if [ -n "$(tty)" ]; then - exec /usr/bin/grass70 "$@" + exec /usr/bin/grass71 "$@" fi fi diff --git a/debian/x-grass7 b/debian/x-grass7.in similarity index 61% copy from debian/x-grass7 copy to debian/x-grass7.in index 4b91c03..929a7be 100755 --- a/debian/x-grass7 +++ b/debian/x-grass7.in @@ -5,13 +5,13 @@ if [ -n "$DISPLAY" ]; then if [ -n "$(tty)" ]; then - exec /usr/bin/grass70 "$@" + exec /usr/bin/grass@VERSION@ "$@" else - exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass70 $@" + exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass@VERSION@ $@" fi else if [ -n "$(tty)" ]; then - exec /usr/bin/grass70 "$@" + exec /usr/bin/grass@VERSION@ "$@" fi fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
