--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package vim
The -5 upload finished off the changes from the previous couple uploads
such that the scalable icons are installed in the proper places. It
also drops our custom icons in favor of using upstream's.
The -6 upload fixes an issue with generating the svg from upstream's pdf
and includes recognition of jessie(-backports)/sid and binary-only=yes
in the debchangelog syntax file.
Generating the svg from the pdf resulted in a bad bounding box which
made applications that honored the bounding box display a lot of dead
space, so I changed to generating the svg from the eps file which
resolves the issue.
$ debdiff vim_7.4.488-4.dsc vim_7.4.488-6.dsc
diffstat for vim-7.4.488 vim-7.4.488
changelog | 19 +
control | 2
icons/vim-16.xpm | 30 --
icons/vim-32.xpm | 43 ---
icons/vim.svg | 284 -------------------------
patches/upstream/debian-runtime-versions.patch | 35 ++-
rules | 15 +
vim-common.dirs | 5
vim-common.install.in | 4
9 files changed, 71 insertions(+), 366 deletions(-)
diff -Nru vim-7.4.488/debian/changelog vim-7.4.488/debian/changelog
--- vim-7.4.488/debian/changelog 2014-12-29 23:13:20.000000000 -0500
+++ vim-7.4.488/debian/changelog 2015-03-21 14:24:12.000000000 -0400
@@ -1,3 +1,22 @@
+vim (2:7.4.488-6) unstable; urgency=medium
+
+ * Build vim logo from the eps instead of pdf so the svg has the correct
+ bounding box. Thanks to Simon McVittie for the idea! (Closes: #778477)
+ * syntax/debchangelog.vim:
+ + Recognize jessie, jessie-backports, and sid targets
+ + Recognize binary-only=yes key value in debchangelogHeader
+
+ -- James McCoy <jamessan@debian.org> Sat, 21 Mar 2015 14:24:01 -0400
+
+vim (2:7.4.488-5) unstable; urgency=medium
+
+ * Install icons to the proper directory. dh_install doesn't rename files,
+ even though the last upload pretended it does.
+ - Use upstream's icons and remove the ones in debian/
+ - Add Build-Depends: pdf2svg to create a scalable icon
+
+ -- James McCoy <jamessan@debian.org> Wed, 11 Feb 2015 21:38:10 -0500
+
vim (2:7.4.488-4) unstable; urgency=medium
* Move vim icon from vim-gui-common to vim-common since both vim.desktop and
diff -Nru vim-7.4.488/debian/control vim-7.4.488/debian/control
--- vim-7.4.488/debian/control 2014-12-29 21:14:50.000000000 -0500
+++ vim-7.4.488/debian/control 2015-03-21 11:25:06.000000000 -0400
@@ -5,6 +5,8 @@
Uploaders: James McCoy <jamessan@debian.org>
Standards-Version: 3.9.5
Build-Depends: libacl1-dev, libgpmg1-dev [linux-any], autoconf,
+# Building Vim's svg icons
+ pdf2svg, ghostscript,
# B-D for dh_bugfiles
debhelper (>= 7.2.3~),
libtinfo-dev | libncurses5-dev, libselinux1-dev [linux-any],
diff -Nru vim-7.4.488/debian/icons/vim-16.xpm vim-7.4.488/debian/icons/vim-16.xpm
--- vim-7.4.488/debian/icons/vim-16.xpm 2014-10-22 21:01:13.000000000 -0400
+++ vim-7.4.488/debian/icons/vim-16.xpm 1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 8 1",
-" c Gray0",
-". c #000080",
-"X c #008000",
-"o c Green",
-"O c #808080",
-"+ c #c0c0c0",
-"@ c Gray100",
-"# c None",
-/* pixels */
-"## o # ##",
-"# @@@@@ X @@@@ #",
-"# +++++O ++++O ",
-"## +++O X @++O #",
-"## +++O @++O ##",
-"## +++O @++O ##",
-"#o +++O@++O XX #",
-"oX +++@++O XXXX ",
-" X +++++ XXXX.#",
-"# ++++ + X ##",
-"## ++++ ++ + #",
-"## +++ ++ +++++ ",
-"## ++O + + + + ",
-"## +O X + + + + ",
-"### # ++ + + + ",
-"####### # # # #"
-};
diff -Nru vim-7.4.488/debian/icons/vim-32.xpm vim-7.4.488/debian/icons/vim-32.xpm
--- vim-7.4.488/debian/icons/vim-32.xpm 2014-10-22 21:01:13.000000000 -0400
+++ vim-7.4.488/debian/icons/vim-32.xpm 1969-12-31 19:00:00.000000000 -0500
@@ -1,43 +0,0 @@
-/* XPM */
-static char * vim32x32[] = {
-"32 32 8 1",
-" c None",
-". c #000000",
-"+ c #00007f",
-"@ c #007f00",
-"# c #00FF00",
-"$ c #7f7f7f",
-"% c #CCCCCC",
-"& c #FFFFFF",
-" .. ",
-" .##. ",
-" ...........#@@#. ......... ",
-" .&&&&&&&&&&&.@@@#.&&&&&&&&&. ",
-" .&%%%%%%%%%%%.@@@.&%%%%%%%%%. ",
-" .%%%%%%%%%%$.@@@@.%%%%%%%%$. ",
-" .$%%%%%%$$.@@@@@@.$%%%%%$$. ",
-" .&%%%%%%$.@@@@@@.&%%%%%$$. ",
-" .&%%%%%%$.@@@@@.&&%%%%$$. ",
-" .&%%%%%%$.@@@@.&&%%%%$$. ",
-" .&%%%%%%$.@@@.&&%%%%$$. ",
-" .&%%%%%%$.@@.&&%%%%$$.#. ",
-" ..&%%%%%%$.@.&&%%%%$$.@@#. ",
-" .#.&%%%%%%$..&&%%%%$$.@@@@#. ",
-" .#@.&%%%%%%$.&&%%%%$$.@@@@@@#. ",
-".#@@.&%%%%%%$&&%%%%$$.@@@@@@@@#.",
-".+@@.&%%%%%%$&%%%%$$.@@@@@@@@@+.",
-" .+@.&%%%%%%$%%%%$$.@@@@@@@@@+. ",
-" .+.&%%%%%%%%%%...@@@@@@@@@+. ",
-" ..&%%%%%%%%%.%%.@@@@@@@@+. ",
-" .&%%%%%%%%%.%%.@@@@@@@+. ",
-" .&%%%%%%%%$...@...@...... ",
-" .&%%%%%%%$.%%%.%%%.%%%.%%. ",
-" .&%%%%%%$$..%%..%%%%%%%%%%. ",
-" .&%%%%%$$..%%...%%++%%..%. ",
-" .&%%%%$$.@.%%..%%+.%%..%%. ",
-" .&%%%$$.@@.%%..%%..%%..%%. ",
-" .&%%$$..+.%%..%%..%%..%%. ",
-" .%$$. ..%%%.%%..%%..%%%. ",
-" ... ....+.. .. ... ",
-" .++. ",
-" .. "};
diff -Nru vim-7.4.488/debian/icons/vim.svg vim-7.4.488/debian/icons/vim.svg
--- vim-7.4.488/debian/icons/vim.svg 2014-10-22 21:01:13.000000000 -0400
+++ vim-7.4.488/debian/icons/vim.svg 1969-12-31 19:00:00.000000000 -0500
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- id="svg1"
- sodipodi:version="0.32"
- inkscape:version="0.38.1"
- width="550.00000pt"
- height="550.00000pt"
- sodipodi:docbase="/home/portman/otherwork/Vim Icon"
- sodipodi:docname="vim_icon.svg"
- xmlns="http://www.w3.org/2000/svg";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:xlink="http://www.w3.org/1999/xlink";>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient950">
- <stop
- style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop951" />
- <stop
- style="stop-color:#c7c7c7;stop-opacity:1.0000000;"
- offset="0.71063459"
- id="stop954" />
- <stop
- style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
- offset="0.87778628"
- id="stop952" />
- <stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop953" />
- </linearGradient>
- <linearGradient
- id="linearGradient854">
- <stop
- style="stop-color:#000000;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop855" />
- <stop
- style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
- offset="0.87778628"
- id="stop877" />
- <stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop856" />
- </linearGradient>
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient857"
- x1="0.60000008"
- y1="0.56617671"
- x2="0.49629629"
- y2="0.46323529" />
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient863"
- x1="1.3684263"
- y1="0.63970619"
- x2="-0.78947371"
- y2="0.64705884" />
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient875"
- x1="0.88050312"
- y1="1.1691177"
- x2="0.86792451"
- y2="0.066176474" />
- <radialGradient
- xlink:href="#linearGradient950"
- id="radialGradient876"
- cx="399.32913"
- cy="493.74957"
- r="3.0306687"
- fx="399.31119"
- fy="493.71625"
- spreadMethod="pad"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.961250,1.040312)" />
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient881"
- x1="1.1292776"
- y1="0.12500000"
- x2="0.12547529"
- y2="-0.11764706" />
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient904"
- x1="0.54285717"
- y1="0.18382353"
- x2="0.38095239"
- y2="0.66911763" />
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient907"
- x1="0.81974250"
- y1="0.56617647"
- x2="0.29184550"
- y2="0.21323529" />
- <linearGradient
- xlink:href="#linearGradient854"
- id="linearGradient908"
- x1="0.54285794"
- y1="0.26470417"
- x2="0.51162791"
- y2="0.69852942" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.68081152"
- inkscape:cx="401.29842"
- inkscape:cy="175.10410"
- inkscape:window-width="1276"
- inkscape:window-height="975"
- inkscape:window-x="2"
- inkscape:window-y="25"
- showborder="true"
- showgrid="false"
- showguides="false"
- snaptoguides="false" />
- <rect
- style="fill-rule:evenodd;stroke:#000000;stroke-width:0.0000000;"
- id="rect830"
- width="34.897994"
- height="34.897971"
- x="614.47170"
- y="94.686943"
- transform="matrix(9.658169,9.658169,-9.658169,9.658169,-4673.626,-6841.970)" />
- <rect
- style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.0000000;"
- id="rect827"
- width="35.989174"
- height="35.989174"
- x="293.94159"
- y="495.15979"
- transform="matrix(9.227210,9.227210,-9.227210,9.227210,2203.223,-7269.031)" />
- <path
- style="fill:#000084;fill-rule:evenodd;stroke:#000000;stroke-width:0.0000000;"
- d="M 391.86311,526.14260 L 367.53417,550.48935 L 343.22335,526.15334 L 391.86311,526.14260 z "
- id="path829"
- sodipodi:nodetypes="cccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-4673.626,-6841.970)" />
- <rect
- style="fill:#008200;fill-rule:evenodd;stroke:#000000;stroke-width:0.0000000;"
- id="rect826"
- width="33.649876"
- height="33.649876"
- x="295.11124"
- y="496.32945"
- transform="matrix(9.227210,9.227210,-9.227210,9.227210,2203.223,-7269.031)" />
- <path
- style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.50000000;"
- d="M 258.65018,568.44721 C 259.29401,568.40049 259.87422,567.94025 260.35900,567.44819 L 292.47933,534.33815 C 293.03372,533.77196 293.42906,533.26939 293.37906,532.44872 L 293.37906,530.55290 C 293.38909,528.76612 293.04921,528.31537 291.30968,528.30996 L 277.63380,528.30996 C 276.27963,528.32628 275.37081,529.23329 275.38448,530.64926 L 275.41083,532.27969 C 275.50984,533.88834 277.00851,534.28820 278.44355,534.33815 L 266.38718,546.30455 L 266.38718,534.06823 C 267.49233,534.10643 268.31118,533.47662 268.36659,532.17880 L 268.36113,530.49567 C 268.28665,528.88520 267.54415,528.45171 265.84734,528.39994 L 252.71130,528.48991 C 251.32714,528.60348 250.48375,529.06696 250.30838,530.67561 L 250.28203,531.81891 C 250.36197,533.42210 250.95087,534.26185 252.62132,534.33815 L 253.30930,534.36450 L 253.34111,566.36851 C 253.48649,567.59908 254.20445,568.41611 255.59043,568.43789 L 258.65018,568.44721 z "
- id="path844"
- sodipodi:nodetypes="ccccccccccccccccccccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <path
- style="fill:url(#linearGradient857);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.37500000;"
- d="M 292.50076,528.68029 L 254.04961,567.39667 C 254.42163,567.84413 254.80855,568.22587 255.58637,568.23809 L 258.63406,568.26919 C 259.27478,568.22271 259.83097,567.76371 260.31340,567.27403 L 292.28307,534.30919 C 292.83477,533.74576 293.23470,533.25996 293.18494,532.44326 L 293.18494,530.54623 C 293.19086,529.49156 292.95782,528.98442 292.50076,528.68029 z "
- id="path853"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="fill:url(#linearGradient863);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.37500000;"
- d="M 263.92754,551.31147 L 266.25056,546.72186 L 266.18694,533.86884 L 263.86750,533.12909 L 263.92754,551.31147 z "
- id="path865"
- sodipodi:nodetypes="ccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <path
- style="fill:url(#linearGradient875);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.25000000;"
- d="M 267.61568,528.97892 L 262.43608,532.64402 L 266.31321,533.94649 L 266.34350,533.94649 C 267.39815,533.97012 268.16831,533.34395 268.22148,532.09880 L 268.22148,530.46314 C 268.18741,529.72655 267.96723,529.28847 267.61568,528.97892 z "
- id="path874"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <path
- style="fill:url(#linearGradient904);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.12500000;"
- d="M 380.73325,507.58317 L 379.63950,508.27067 L 380.45200,508.58317 L 380.73325,507.58317 z M 380.45200,508.58317 L 376.95200,510.70817 C 376.67978,510.68861 376.37848,510.59692 376.07700,510.55192 L 375.85825,510.70817 C 376.11795,510.74654 376.34370,510.85521 376.60825,510.86442 L 373.95200,513.48942 L 378.32700,516.48942 L 380.45200,508.58317 z "
- id="path903"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-4673.626,-6841.970)" />
- <path
- style="fill:url(#linearGradient881);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.37500000;"
- d="M 279.29593,530.98891 L 275.67261,532.61335 C 275.93510,533.82804 277.16831,534.11745 278.80601,534.20542 L 282.33278,532.06025 L 279.29593,530.98891 z "
- id="path880"
- sodipodi:nodetypes="ccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <path
- style="fill:url(#linearGradient907);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.37500000;"
- d="M 254.10688,531.07030 L 250.61080,532.63112 C 250.87329,533.84581 251.59754,534.19884 253.48972,534.19138 L 256.88925,530.51932 L 254.10688,531.07030 z "
- id="path905"
- sodipodi:nodetypes="ccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <path
- style="fill:url(#linearGradient908);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:0.12500000;"
- d="M 255.58681,531.64464 L 253.43953,534.23782 L 253.55158,536.76105 C 253.52719,537.10875 254.08327,541.55626 254.59931,539.79953 C 255.11535,538.04279 255.23438,531.45148 255.58681,531.64464 z "
- id="path906"
- sodipodi:nodetypes="cccsc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <path
- style="fill:#c6c3c6;fill-rule:evenodd;stroke-width:0.25000000;"
- d="M 257.55115,567.38333 C 257.92107,567.35069 258.42152,566.89375 258.85671,566.40417 L 290.63353,534.09849 C 290.98168,533.71770 291.36082,533.27578 291.34994,532.89499 L 291.28631,530.31039 C 291.28631,529.97312 291.02603,529.72963 290.60172,529.75139 L 277.67833,529.72124 C 277.12347,529.69947 276.63388,530.03674 276.69916,530.63512 L 276.69916,531.98773 C 276.72092,532.80547 277.35122,532.92338 277.79729,532.90161 L 279.37224,532.90327 C 279.78567,533.07735 279.94296,533.31918 279.96472,533.81965 C 279.91363,534.85001 279.89188,534.83229 278.90753,535.82753 L 264.06569,551.08537 L 264.00207,533.22137 L 265.71422,533.22137 C 266.02973,533.18873 266.43984,532.83468 266.49424,532.44301 L 266.49424,530.43597 C 266.48336,530.05518 266.24400,529.77232 265.77619,529.78320 L 252.37066,529.78320 C 251.88108,529.76144 251.55470,530.19663 251.58733,530.69708 L 251.55552,532.18356 C 251.55387,532.68403 251.91372,533.08078 252.37066,533.12429 L 254.48309,533.12429 L 254.45045,566.73056
C 254.41781,567.07871 254.48309,567.26366 254.74420,567.38334 L 257.55115,567.38333 z "
- id="path846"
- sodipodi:nodetypes="ccccccccccccccccccccccccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-3345.564,-7154.425)" />
- <g
- id="g1043"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-4672.139,-6838.184)"
- style="fill:#575757;">
- <path
- sodipodi:type="arc"
- style="fill:#575757;fill-rule:evenodd;stroke:none;stroke-width:0.23728395;stroke-opacity:1.0000000;fill-opacity:1.0000000;"
- id="path1044"
- sodipodi:cx="383.73456"
- sodipodi:cy="513.51428"
- sodipodi:rx="2.0693774"
- sodipodi:ry="2.2493234"
- d="M 385.80394 513.51428 A 2.0693774 2.2493234 0 1 0 381.66518,513.51428 A 2.0693774 2.2493234 0 1 0 385.80394 513.51428 z"
- transform="matrix(1.053590,0.000000,0.000000,1.053590,-34.64671,-9.323830)" />
- <path
- style="fill:#575757;fill-rule:evenodd;stroke:none;stroke-width:0.25000000;stroke-opacity:1.0000000;fill-opacity:1.0000000;"
- d="M 316.99474,575.20102 C 320.66113,568.54302 320.12130,567.98070 320.09880,567.23842 C 320.04632,566.24872 320.26375,565.86633 321.35842,565.88882 L 323.02292,565.84384 C 324.03512,565.79885 324.37252,566.15874 324.10260,566.92351 C 323.67049,568.08991 320.40726,573.39163 321.02489,574.46260 L 321.68105,575.28008 C 321.95780,575.86082 321.31206,576.69605 320.95261,576.70421 L 317.84948,576.73056 C 317.09221,576.73806 316.64984,575.95829 316.99474,575.20102 z "
- id="path1045"
- sodipodi:nodetypes="cccccccccc"
- transform="translate(46.57018,-30.91955)" />
- <path
- style="fill:#575757;fill-rule:evenodd;stroke:none;stroke-width:0.25000000;stroke-opacity:1.0000000;fill-opacity:1.0000000;"
- d="M 329.57316,565.57076 C 328.42945,565.36374 327.26323,565.42664 326.20949,565.55702 C 325.79712,565.52706 325.63577,566.19587 325.78573,566.66073 L 326.22323,567.53573 C 326.27967,568.24166 326.63347,568.98513 323.12948,575.34823 C 322.78458,576.10550 323.24720,576.88698 324.00448,576.87948 L 327.09823,576.84823 C 327.45768,576.84007 328.09372,576.02274 327.81698,575.44198 L 327.16073,574.62948 C 326.86234,574.11207 327.49811,572.58470 328.25448,571.03573 C 329.34795,569.60002 330.61047,569.51877 331.41073,569.50448 C 331.64943,569.55893 331.74631,569.83269 331.81698,570.12948 C 331.41239,571.23985 330.89339,572.54228 329.34823,575.34823 C 329.00333,576.10550 329.43471,576.88698 330.19198,576.87948 L 333.31698,576.84823 C 333.67643,576.84007 334.31248,576.02274 334.03573,575.44198 L 333.37948,574.62948 C 333.07677,574.10457 333.73292,572.54576 334.50448,570.97323 C 335.51570,569.52403 336.74067,569.50448 337.50448,569.50448 C 337.80939,569.59831 337.87934,569.98334 337.879
48,570.37948 C 337.45729,571.49363 337.03667,572.67936 335.56698,575.34823 C 335.22208,576.10550 335.65347,576.88699 336.41073,576.87948 L 339.50448,576.84823 C 339.86393,576.84007 340.53124,576.02275 340.25448,575.44198 L 339.59823,574.62948 C 338.98060,573.55851 341.46384,570.43775 342.18837,568.48405 C 342.63824,567.08947 341.09462,565.86952 340.23988,565.59960 L 337.88634,565.56337 C 337.46185,565.66019 337.37295,565.90474 337.25619,566.34960 L 335.64596,566.33587 C 335.67764,565.92408 335.57023,565.65210 335.26701,565.62210 L 332.80101,565.58587 C 332.00550,565.56953 332.08418,565.85563 331.98215,566.34462 L 329.58072,566.34566 C 329.71316,566.08736 329.71064,565.73908 329.57316,565.57076 z "
- id="path1046"
- sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccc"
- transform="translate(46.57018,-30.91955)" />
- </g>
- <path
- style="fill:#c6c3c6;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;"
- d="M 329.57316,565.57076 C 328.42945,565.36374 327.26323,565.42664 326.20949,565.55702 C 325.79712,565.52706 325.63577,566.19587 325.78573,566.66073 L 326.22323,567.53573 C 326.27967,568.24166 326.63347,568.98513 323.12948,575.34823 C 322.78458,576.10550 323.24720,576.88698 324.00448,576.87948 L 327.09823,576.84823 C 327.45768,576.84007 328.09372,576.02274 327.81698,575.44198 L 327.16073,574.62948 C 326.86234,574.11207 327.49811,572.58470 328.25448,571.03573 C 329.34795,569.60002 330.61047,569.51877 331.41073,569.50448 C 331.64943,569.55893 331.74631,569.83269 331.81698,570.12948 C 331.41239,571.23985 330.89339,572.54228 329.34823,575.34823 C 329.00333,576.10550 329.43471,576.88698 330.19198,576.87948 L 333.31698,576.84823 C 333.67643,576.84007 334.31248,576.02274 334.03573,575.44198 L 333.37948,574.62948 C 333.07677,574.10457 333.73292,572.54576 334.50448,570.97323 C 335.51570,569.52403 336.74067,569.50448 337.50448,569.50448 C 337.80939,569.59831 337.87934,569.98334 337.87948
,570.37948 C 337.45729,571.49363 337.03667,572.67936 335.56698,575.34823 C 335.22208,576.10550 335.65347,576.88699 336.41073,576.87948 L 339.50448,576.84823 C 339.86393,576.84007 340.53124,576.02275 340.25448,575.44198 L 339.59823,574.62948 C 338.98060,573.55851 341.46384,570.43775 342.18837,568.48405 C 342.63824,567.08947 341.09462,565.86952 340.23988,565.59960 L 337.88634,565.56337 C 337.46185,565.66019 337.37295,565.90474 337.25619,566.34960 L 335.64596,566.33587 C 335.67764,565.92408 335.57023,565.65210 335.26701,565.62210 L 332.80101,565.58587 C 332.00550,565.56953 332.08418,565.85563 331.98215,566.34462 L 329.58072,566.34566 C 329.71316,566.08736 329.71064,565.73908 329.57316,565.57076 z "
- id="path960"
- sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-4041.013,-7266.029)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke-width:5.0000000;stroke:#000000;stroke-opacity:1.0000000;stroke-dasharray:none;"
- d="M 437.69950,457.10784 C 429.96544,457.19177 422.39586,457.84243 415.19950,458.73284 C 409.56706,458.32362 407.36999,467.44595 409.41825,473.79534 L 415.38700,485.76409 C 416.15790,495.40618 420.99698,505.53985 373.13700,592.45159 C 369.62352,600.16588 370.84654,606.23509 374.86142,612.46336 C 379.32681,615.91683 384.54177,618.94358 390.04325,618.88909 L 432.29325,618.48284 C 437.20287,618.37138 445.88566,607.19652 442.10575,599.26409 L 433.13700,588.17034 C 429.06138,581.10319 437.74346,560.23352 448.07450,539.07659 C 462.83321,519.69862 478.89634,515.66421 489.84398,515.44752 C 488.80994,524.24494 479.17939,554.12593 458.07450,592.45159 C 454.52436,600.24637 456.07746,607.30439 460.56069,613.01612 C 464.46988,616.42005 469.08013,618.94320 474.54325,618.88909 L 517.23075,618.48284 C 522.14037,618.37138 530.82330,607.19652 527.04325,599.26409 L 518.07450,588.17034 C 513.93987,581.00075 522.91099,559.71157 533.44950,538.23284 C 547.02951,518.77104 562.44357,516.37971 572.90648
,516.36555 C 570.65997,538.04217 563.08607,555.99827 543.01200,592.45159 C 539.46185,600.24637 540.55597,606.84540 545.49819,612.55711 C 549.40740,615.96106 554.01770,618.94327 559.48075,618.88909 L 601.73075,618.48284 C 606.64037,618.37138 615.76093,607.19666 611.98075,599.26409 L 603.01200,588.17034 C 594.57597,573.54227 624.85001,534.13094 634.74616,507.44592 C 639.31935,492.90196 637.38543,484.78521 630.85982,475.99461 C 623.00119,467.16850 613.13776,461.28902 606.82450,459.29534 L 574.66825,458.82659 C 568.87026,460.14902 567.66929,463.46913 566.07450,469.54534 C 566.07450,469.54534 546.87731,468.66591 544.40851,468.38342 C 543.91302,465.17365 541.90491,459.90333 538.91825,459.60784 L 505.23075,459.10784 C 494.36511,458.88465 495.43685,462.80387 494.04325,469.48284 C 494.04325,469.48284 465.24859,470.69919 464.26970,469.50071 C 463.08503,469.28628 462.11593,460.11887 461.13700,458.92034 C 453.32620,457.50653 445.43356,457.02391 437.69950,457.10784 z "
- id="path934"
- sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" />
- <g
- id="g937">
- <path
- style="fill:#c6c3c6;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;"
- d="M 316.99474,575.20102 C 320.66113,568.54302 320.12130,567.98070 320.09880,567.23842 C 320.04632,566.24872 320.26375,565.86633 321.35842,565.88882 L 323.02292,565.84384 C 324.03512,565.79885 324.37252,566.15874 324.10260,566.92351 C 323.67049,568.08991 320.40726,573.39163 321.02489,574.46260 L 321.68105,575.28008 C 321.95780,575.86082 321.31206,576.69605 320.95261,576.70421 L 317.84948,576.73056 C 317.09221,576.73806 316.64984,575.95829 316.99474,575.20102 z "
- id="path955"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(13.65871,0.000000,0.000000,13.65871,-4041.013,-7266.029)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke-width:5.0000000;stroke:#000000;stroke-opacity:1.0000000;stroke-dasharray:none;"
- d="M 372.96653,462.63909 L 350.21653,463.26409 C 335.26475,462.95691 332.31222,468.18355 333.02903,481.70159 C 333.33635,491.84017 340.70095,499.51190 290.62278,590.45159 C 281.58148,608.76634 297.20888,616.45311 307.27903,616.85784 L 349.65403,616.51409 C 354.56365,616.40264 363.37157,604.97750 359.59153,597.04534 L 350.62278,585.88909 C 342.18675,571.26102 384.02914,500.22888 389.93121,484.29737 C 392.38677,477.33999 391.53557,473.33846 389.57205,469.45159 C 386.26357,464.53542 382.57594,462.21197 372.96653,462.63909 z "
- id="path935"
- sodipodi:nodetypes="ccccccccccc" />
- </g>
- <g
- id="g940">
- <path
- sodipodi:type="arc"
- style="fill:#c6c3c6;fill-rule:evenodd;stroke:none;stroke-width:0.47456792;"
- id="path866"
- sodipodi:cx="383.73456"
- sodipodi:cy="513.51428"
- sodipodi:rx="2.0693774"
- sodipodi:ry="2.2493234"
- d="M 385.80394 513.51428 A 2.0693774 2.2493234 0 1 0 381.66518,513.51428 A 2.0693774 2.2493234 0 1 0 385.80394 513.51428 z"
- transform="matrix(14.39068,0.000000,0.000000,14.39068,-5150.331,-6971.059)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke-width:5.0000000;stroke:#000000;stroke-opacity:1.0000000;stroke-dasharray:none;"
- d="M 372.93976,388.65290 C 359.88015,388.65290 344.99456,404.26234 344.99456,418.27383 C 344.99457,432.28532 345.89815,435.11510 351.07043,444.71336 C 355.78370,454.31162 363.48358,456.18008 376.53148,456.18008 C 389.57937,456.18008 406.31273,438.72412 406.31273,424.72310 C 404.47669,411.18108 402.00710,405.92604 396.10575,399.26409 C 389.85250,392.20488 385.99937,388.65290 372.93976,388.65290 z "
- id="path936"
- sodipodi:nodetypes="czzzzsz" />
- </g>
-</svg>
diff -Nru vim-7.4.488/debian/patches/upstream/debian-runtime-versions.patch vim-7.4.488/debian/patches/upstream/debian-runtime-versions.patch
--- vim-7.4.488/debian/patches/upstream/debian-runtime-versions.patch 2014-11-04 19:41:11.000000000 -0500
+++ vim-7.4.488/debian/patches/upstream/debian-runtime-versions.patch 2015-03-21 12:40:56.000000000 -0400
@@ -5,19 +5,46 @@
" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2014 Jul 11
-+" Last Change: 2014 Oct 20
++" Last Change: 2015 Mar 21
" URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debchangelog.vim
" Standard syntax initialization
-@@ -19,7 +19,7 @@
+@@ -16,10 +16,14 @@
+ " Case doesn't matter for us
+ syn case ignore
+
++let urgency='urgency=\(low\|medium\|high\|critical\)\( [^[:space:],][^,]*\)\='
++let binNMU='binary-only=yes'
++
" Define some common expressions we can use later on
syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ "
- syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
+-syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
-syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|%(devel|lucid|precise|trusty|utopic)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
-+syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|%(devel|lucid|precise|trusty|utopic|vivid)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
++exe 'syn match debchangelogFirstKV contained "; \('.urgency.'\|'.binNMU.'\)"'
++exe 'syn match debchangelogOtherKV contained ", \('.urgency.'\|'.binNMU.'\)"'
++syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|jessie%(-backports)=|%(devel|lucid|precise|trusty|utopic|vivid)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
syn match debchangelogVersion contained "(.\{-})"
syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
+@@ -27,7 +31,7 @@
+ syn match debchangelogEmail contained "<.\{-}>"
+
+ " Define the entries that make up the changelog
+-syn region debchangelogHeader start="^[^ ]" end="$" contains=debchangelogName,debchangelogUrgency,debchangelogTarget,debchangelogVersion oneline
++syn region debchangelogHeader start="^[^ ]" end="$" contains=debchangelogName,debchangelogFirstKV,debchangelogOtherKV,debchangelogTarget,debchangelogVersion,debchangelogBinNMU oneline
+ syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail oneline
+ syn region debchangelogEntry start="^ " end="$" contains=debchangelogCloses,debchangelogLP oneline
+
+@@ -45,7 +49,8 @@
+ HiLink debchangelogEntry Normal
+ HiLink debchangelogCloses Statement
+ HiLink debchangelogLP Statement
+- HiLink debchangelogUrgency Identifier
++ HiLink debchangelogFirstKV Identifier
++ HiLink debchangelogOtherKV Identifier
+ HiLink debchangelogName Comment
+ HiLink debchangelogVersion Identifier
+ HiLink debchangelogTarget Identifier
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
diff -Nru vim-7.4.488/debian/rules vim-7.4.488/debian/rules
--- vim-7.4.488/debian/rules 2014-12-14 21:52:58.000000000 -0500
+++ vim-7.4.488/debian/rules 2015-03-21 14:06:26.000000000 -0400
@@ -195,6 +195,7 @@
rm -f debian/helpztags.1
rm -rf debian/policy/vim-policy.html
rm -f debian/policy/vim-policy.txt
+ rm -f debian/tmplogo.*
[ ! -f src/auto/config.cache ] || make distclean
rm -f src/auto/config.mk src/pixmaps src/runtime
[ ! -f debian/configure.dist ] || mv debian/configure.dist src/auto/configure
@@ -314,7 +315,6 @@
installgtutorbin \
installruntime \
installtools \
- install-icons \
install-languages
# Tests need to be run in series, otherwise the terminal requests may not see
@@ -388,6 +388,19 @@
usr/share/man/$$L/man1/ >>debian/vim-gui-common.install; \
done
+ # Icons
+ for sz in 16 32 48; do \
+ cp runtime/vim$${sz}x$${sz}.xpm debian/vim-common/usr/share/pixmaps/vim-$${sz}.xpm; \
+ cp runtime/vim$${sz}x$${sz}.png debian/vim-common/usr/share/icons/hicolor/$${sz}x$${sz}/apps/vim.png; \
+ done
+ gs -sDefaultCMYKProfile=ps_cmyk.icc -sOutputICCProfile=ps_rgb.icc \
+ -dSAFER -dEPSCrop -dBATCH -dNOPAUSE \
+ -sDEVICE=pswrite -sOutputFile=debian/tmplogo.ps runtime/vimlogo.eps
+ ps2pdf debian/tmplogo.ps debian/tmplogo.pdf
+ pdf2svg debian/tmplogo.pdf debian/vim-common/usr/share/pixmaps/vim.svg
+ cp debian/vim-common/usr/share/pixmaps/vim.svg \
+ debian/vim-common/usr/share/icons/hicolor/scalable/apps/vim.svg
+
dh_installman
dh_install --fail-missing -X/tools/
# adjust things for vim-gui-common
diff -Nru vim-7.4.488/debian/vim-common.dirs vim-7.4.488/debian/vim-common.dirs
--- vim-7.4.488/debian/vim-common.dirs 2014-10-22 21:01:13.000000000 -0400
+++ vim-7.4.488/debian/vim-common.dirs 2015-02-11 20:26:01.000000000 -0500
@@ -1,3 +1,8 @@
/etc/
/usr/bin/
/var/lib/vim/addons/
+/usr/share/pixmaps/
+/usr/share/icons/hicolor/scalable/apps/
+/usr/share/icons/hicolor/16x16/apps/
+/usr/share/icons/hicolor/32x32/apps/
+/usr/share/icons/hicolor/48x48/apps/
diff -Nru vim-7.4.488/debian/vim-common.install.in vim-7.4.488/debian/vim-common.install.in
--- vim-7.4.488/debian/vim-common.install.in 2014-12-29 21:13:22.000000000 -0500
+++ vim-7.4.488/debian/vim-common.install.in 2015-02-11 20:23:04.000000000 -0500
@@ -1,10 +1,6 @@
debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/vim.desktop usr/share/applications/
-debian/icons/* usr/share/pixmaps/
-debian/icons/vim.svg usr/share/icons/hicolor/scalable/apps/
-debian/icons/vim-16.xpm usr/share/icons/hicolor/16x16/apps/vim.xpm
-debian/icons/vim-32.xpm usr/share/icons/hicolor/32x32/apps/vim.xpm
debian/runtime/vimrc etc/vim/
debian/runtime/debian.vim usr/share/vim/@VIMCUR@/
debian/tmp/usr/share/man/man1/xxd.1 usr/share/man/man1/
unblock vim/2:7.4.488-6
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- End Message ---