r946 - in /trunk/packages/vim/debian: changelog control rules vim-doc.dirs vim-doc.install vim-policy.txt

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Jun 17 09:29:09 2007
New Revision: 946

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=946
Log:
integrated policy building and installation in vim package building

Removed:
    trunk/packages/vim/debian/vim-policy.txt
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/control
    trunk/packages/vim/debian/rules
    trunk/packages/vim/debian/vim-doc.dirs
    trunk/packages/vim/debian/vim-doc.install

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=946&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun Jun 17 09:29:09 2007
@@ -13,8 +13,13 @@
   [ Stefano Zacchiroli ]
   * Add javac_cmdline-vim.diff, which fixes the invocation of the javac
     compiler. (Closes: #408338)
-
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 12 Jun 2007 10:54:43 +0200
+  * Added the new Debian VIM Policy to the "vim-doc" package, overriding the
+    old unenforced one
+  * debian/control
+    - split the build paths for binary-arch and binary-indep targets
+    - added build deps on docbook stuff to build the policy
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Jun 2007 10:04:21 +0100
 
 vim (1:7.1-000+1) unstable; urgency=low
 

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=946&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Sun Jun 17 09:29:09 2007
@@ -5,6 +5,7 @@
 Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Stefano Zacchiroli <zack at debian.org>, Alexis Sukrieh <sukria at sukria.net>, Pepijn de Langen <pepijn at ce.et.tudelft.nl>, James Vega <jamessan at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), dpkg-dev (>= 1.13.19), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
+Build-Depends-Indep: docbook-xml, docbook-utils
 Build-Conflicts: libperl-dev (= 5.8.4-1)
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=946&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Sun Jun 17 09:29:09 2007
@@ -245,6 +245,7 @@
 build: build-stamp
 build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	$(MAKE) -C $(SRCDIR)/runtime/doc html # gen html docs (destroys tags)
+	$(MAKE) -C debian/policy/ text html
 # (re)generate the tags file
 #	$(SRCDIR)/src/vim-common -u /dev/null \
 #	  -c "helptags $(SRCDIR)/runtime/doc" -c quit

Modified: trunk/packages/vim/debian/vim-doc.dirs
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-doc.dirs?rev=946&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-doc.dirs (original)
+++ trunk/packages/vim/debian/vim-doc.dirs Sun Jun 17 09:29:09 2007
@@ -1,1 +1,2 @@
 usr/share/doc/vim-common/html/
+usr/share/doc/vim-common/html/policy/

Modified: trunk/packages/vim/debian/vim-doc.install
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-doc.install?rev=946&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-doc.install (original)
+++ trunk/packages/vim/debian/vim-doc.install Sun Jun 17 09:29:09 2007
@@ -1,3 +1,4 @@
 vim/runtime/doc/*.html		usr/share/doc/vim-common/html/
-debian/vim-policy.txt		usr/share/doc/vim-common/
+debian/policy/vim-policy.html	usr/share/doc/vim-common/policy/
+debian/policy/vim-policy.txt	usr/share/doc/vim-common/policy/
 debian/FAQ			usr/share/doc/vim-common/