r897 - in /trunk/packages/vim-scripts/debian: TODO.Debian changelog control links rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Wed Feb 7 08:55:31 UTC 2007


Author: zack
Date: Wed Feb  7 09:55:31 2007
New Revision: 897

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=897
Log:
switched debian/rules to cdbs

Added:
    trunk/packages/vim-scripts/debian/links
Modified:
    trunk/packages/vim-scripts/debian/TODO.Debian
    trunk/packages/vim-scripts/debian/changelog
    trunk/packages/vim-scripts/debian/control
    trunk/packages/vim-scripts/debian/rules

Modified: trunk/packages/vim-scripts/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/TODO.Debian?rev=897&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/TODO.Debian (original)
+++ trunk/packages/vim-scripts/debian/TODO.Debian Wed Feb  7 09:55:31 2007
@@ -1,8 +1,3 @@
-
-  Switch to CDBS for debian/rules.
-
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 05 Feb 2007 09:32:02 +0100
-
 
   Write a script debian/find-missing which compares files listed in
   debian/vim-scripts.status with all the files shipped in the vim-scripts

Modified: trunk/packages/vim-scripts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=897&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/changelog (original)
+++ trunk/packages/vim-scripts/debian/changelog Wed Feb  7 09:55:31 2007
@@ -7,16 +7,17 @@
       (if enabled); affected addon: tetris, sokoban
     - moved sokoban levels to /usr/share/vim-scripts/sokoban-levels/
   * debian/rules
-    - bugfix: let the "build" target depend on the "patch" target (from
-      dpatch) and chain dependencies from "binary-indep" down to "build", so
-      that shipped files are actually patched
-    - invoke dh_installman to install dtd2vim manpage
+    - migrated to cdbs (consequence bugfix: "build" now depends on "patch" and
+      deps are chained from "binary-indep" down to "build", so that shipped
+      files are actually patched)
+    - moved symlink management to debian/links
   * debian/control
     - use abbreviated form ("XS-Vcs-Svn") for the svn field
     - set maintainer to Debian VIM Maintainers and Uploaders to me and Michael
     - added suggest on perlsgml, required by dtd2vim
     - bumped debhelper dependency to > 5, changed debian/compat accordingly
-    - added build-deps on xsltproc and docbook-xsl, used to compile manpages
+    - added build-deps on xsltproc and docbook-xsl (to compile manpages)
+    - added build-dep on cdbs (now required by debian/rules)
   * debian/README.debian
     - mention the requirement of perlsgml for using dtd2vim
     - rewritten usage notes pointing to vim-addon-manager
@@ -39,7 +40,7 @@
     - added a manpage for the dtd2vim binary (and the companions
       debian/manpages file)
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon,  5 Feb 2007 09:20:05 +0100
+ -- Stefano Zacchiroli <zack at debian.org>  Wed,  7 Feb 2007 09:44:07 +0100
 
 vim-scripts (7.0.4) unstable; urgency=low
 

Modified: trunk/packages/vim-scripts/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/control?rev=897&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/control (original)
+++ trunk/packages/vim-scripts/debian/control Wed Feb  7 09:55:31 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>, Michael Piefel <piefel at debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch, xsltproc, docbook-xsl
+Build-Depends: cdbs, debhelper (>> 5.0.0), dpatch, xsltproc, docbook-xsl
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim-scripts
 

Added: trunk/packages/vim-scripts/debian/links
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/links?rev=897&op=file
==============================================================================
--- trunk/packages/vim-scripts/debian/links (added)
+++ trunk/packages/vim-scripts/debian/links Wed Feb  7 09:55:31 2007
@@ -1,0 +1,1 @@
+usr/share/vim-scripts/		usr/share/doc/vim-scripts/examples

Modified: trunk/packages/vim-scripts/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/rules?rev=897&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/rules (original)
+++ trunk/packages/vim-scripts/debian/rules Wed Feb  7 09:55:31 2007
@@ -1,58 +1,21 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+common-build-indep:: debian/stamp-local-build
+debian/stamp-local-build:: dtd2vim.1 copyright registry
+	touch $@
 
-include /usr/share/dpatch/dpatch.make
-
-# A lot of superfluous targets for this simple package. I leave them all
-# in so that people not looking into this file are not surprised when
-# they try "debian/rules build" and such.
-
-build: patch dtd2vim.1
 dtd2vim.1: debian/dtd2vim.xml
 	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $<
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	rm -f dtd2vim.1
-
-install: build
-
-binary-arch:
-# Nothing to do here.
-
-OLD_DESTDIR = /usr/share/doc/vim-scripts/examples
-
-.PHONY: copyright registry
+.PHONY: copyright
 copyright:
 	debian/vim-scripts.pl copyright > debian/copyright
+.PHONY: registry
 registry:
 	debian/vim-scripts.pl registry > debian/vim-registry/vim-scripts.yaml
 
-# Build architecture-independent files here.
-binary-indep: install copyright registry
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_install
-	dh_installdocs
-	dh_installman
-	test -L debian/vim-scripts$(OLD_DESTDIR) || \
-	  ln -s ../../vim-scripts debian/vim-scripts$(OLD_DESTDIR)
-	dh_installchangelogs 
-	dh_fixperms
-	dh_compress
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure configure-stamp build-stamp
-
+clean:: local-clean
+local-clean::
+	rm -f dtd2vim.1
+	rm -f debian/stamp-local-build




More information about the pkg-vim-maintainers mailing list