[SCM] Vim packaging branch, debian, updated. upstream/7.2.245-1037-g96dca67

James Vega jamessan at debian.org
Fri Nov 6 01:25:03 UTC 2009


The following commit has been merged in the debian branch:
commit 96dca6752b5ec70c52259cf836c42ef2cb848904
Author: James Vega <jamessan at debian.org>
Date:   Thu Oct 29 00:56:18 2009 -0400

    Move html docs from /u/s/d/vim-common/html to /u/s/d/vim-doc/html.
    
    Since it's being provided by the vim-doc package anyway, there's not much
    sense in putting the files under vim-common's directory.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index a22103c..4946bdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -263,8 +263,7 @@ install-stamp-indep: build-stamp-indep
 	dh_testroot
 	dh_installdirs
 	dh_install
-	dh_link
-	dh_installchangelogs
+	dh_installchangelogs -k debian/README
 	dh_installdocs
 	touch $@
 
diff --git a/debian/vim-doc.dirs b/debian/vim-doc.dirs
deleted file mode 100644
index 1a8f83a..0000000
--- a/debian/vim-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/vim-common/html/
diff --git a/debian/vim-doc.doc-base.referencemanual b/debian/vim-doc.doc-base.referencemanual
index 7f2e0b0..5eeff62 100644
--- a/debian/vim-doc.doc-base.referencemanual
+++ b/debian/vim-doc.doc-base.referencemanual
@@ -7,5 +7,5 @@ Abstract: The Vim reference manual
  each mode as well as all configurable options.
 
 Format: html
-Index: /usr/share/doc/vim-common/html/index.html
-Files: /usr/share/doc/vim-common/html/*.html
+Index: /usr/share/doc/vim-doc/html/index.html
+Files: /usr/share/doc/vim-doc/html/*.html
diff --git a/debian/vim-doc.doc-base.usermanual b/debian/vim-doc.doc-base.usermanual
index 628b377..ccba6f0 100644
--- a/debian/vim-doc.doc-base.usermanual
+++ b/debian/vim-doc.doc-base.usermanual
@@ -7,5 +7,5 @@ Abstract: The Vim user manual.
  on using Vim.
 
 Format: html
-Index: /usr/share/doc/vim-common/html/usr_01.html
-Files: /usr/share/doc/vim-common/html/usr_*.html
+Index: /usr/share/doc/vim-doc/html/usr_01.html
+Files: /usr/share/doc/vim-doc/html/usr_*.html
diff --git a/debian/vim-doc.docs b/debian/vim-doc.docs
new file mode 100644
index 0000000..98fb97b
--- /dev/null
+++ b/debian/vim-doc.docs
@@ -0,0 +1,3 @@
+debian/policy/vim-policy.html
+debian/policy/vim-policy.txt
+debian/FAQ
diff --git a/debian/vim-doc.install b/debian/vim-doc.install
index d6b5e3e..6e5ac07 100644
--- a/debian/vim-doc.install
+++ b/debian/vim-doc.install
@@ -1,4 +1 @@
-runtime/doc/*.html		usr/share/doc/vim-common/html/
-debian/policy/vim-policy.html	usr/share/doc/vim-common/
-debian/policy/vim-policy.txt	usr/share/doc/vim-common/
-debian/FAQ			usr/share/doc/vim-common/
+runtime/doc/*.html		usr/share/doc/vim-doc/html/
diff --git a/debian/vim-doc.links b/debian/vim-doc.links
deleted file mode 100644
index e746e39..0000000
--- a/debian/vim-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/vim-common		    usr/share/doc/vim-doc/doc

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list