r1087 - in /branches/packages/vim/sarge/debian: changelog control rules

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Thu Nov 22 07:23:55 UTC 2007


Author: jamessan
Date: Thu Nov 22 07:23:54 2007
New Revision: 1087

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1087
Log:
* debian/control:
  - vim now Depends on vim-common >= ${Source-Version} so it's binNMU
    safe.
* debian/rules:
  - Change use of $(PWD) to $(CURDIR) so the package can be built properly
    with sudo.

Modified:
    branches/packages/vim/sarge/debian/changelog
    branches/packages/vim/sarge/debian/control
    branches/packages/vim/sarge/debian/rules

Modified: branches/packages/vim/sarge/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/sarge/debian/changelog?rev=1087&op=diff
==============================================================================
--- branches/packages/vim/sarge/debian/changelog (original)
+++ branches/packages/vim/sarge/debian/changelog Thu Nov 22 07:23:54 2007
@@ -1,3 +1,14 @@
+vim (1:6.3-071+1sarge3) oldstable-proposed-updates; urgency=low
+
+  * debian/control:
+    - vim now Depends on vim-common >= ${Source-Version} so it's binNMU
+      safe.
+  * debian/rules:
+    - Change use of $(PWD) to $(CURDIR) so the package can be built properly
+      with sudo.
+
+ -- James Vega <jamessan at debian.org>  Wed, 21 Nov 2007 22:55:09 -0500
+
 vim (1:6.3-071+1sarge2) oldstable-security; urgency=high
 
   * Fix format string vulnerability in helptags handling (CVE-2007-2953).

Modified: branches/packages/vim/sarge/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/sarge/debian/control?rev=1087&op=diff
==============================================================================
--- branches/packages/vim/sarge/debian/control (original)
+++ branches/packages/vim/sarge/debian/control Thu Nov 22 07:23:54 2007
@@ -11,7 +11,7 @@
 Priority: optional
 Architecture: any
 Pre-Depends: dpkg (>= 1.6.8)
-Depends: ${shlibs:Depends}, vim-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, vim-common (>= ${Source-Version})
 Suggests: ctags, vim-doc, vim-scripts
 Provides: editor, vim-rt
 Conflicts: vim-gtk (<< 6.0), vim-lesstif (<< 6.0), vim-perl (<< 6.0), vim-python (<< 6.0), vim-rt, vim-tcl (<< 6.0), vim-tiny, vim-tty (<< 6.0)

Modified: branches/packages/vim/sarge/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/sarge/debian/rules?rev=1087&op=diff
==============================================================================
--- branches/packages/vim/sarge/debian/rules (original)
+++ branches/packages/vim/sarge/debian/rules Thu Nov 22 07:23:54 2007
@@ -214,7 +214,7 @@
 
 # the 'tiny' variant includes all the runtime files
 install-stamp-vim-basic: DH_OPTIONS=-pvim
-install-stamp-vim-basic: DESTDIR=$(PWD)/debian/vim
+install-stamp-vim-basic: DESTDIR=$(CURDIR)/debian/vim
 install-stamp-vim-basic:
 	dh_testdir
 	dh_testroot
@@ -259,7 +259,7 @@
 
 # the other variants only include the binary
 install-stamp-%: DH_OPTIONS=-p$(*)
-install-stamp-%: DESTDIR=$(PWD)/debian/$(*)
+install-stamp-%: DESTDIR=$(CURDIR)/debian/$(*)
 install-stamp-%:
 	dh_testdir
 	dh_testroot
@@ -295,11 +295,11 @@
 
 binary-indep: DH_OPTIONS=-i
 binary-indep: build install
-	rm -f $(PWD)/debian/vim/usr/share/vim/vim63/macros/maze/*.c
-	rm -f $(PWD)/debian/vim/usr/share/vim/vim63/macros/maze/Makefile
-	mkdir -p $(PWD)/debian/vim/usr/share/consolefonts/
-	cp -a $(PWD)/vim63/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
-# 	gzip -9 $(PWD)/debian/vim/usr/share/doc/vim/README
+	rm -f $(CURDIR)/debian/vim/usr/share/vim/vim63/macros/maze/*.c
+	rm -f $(CURDIR)/debian/vim/usr/share/vim/vim63/macros/maze/Makefile
+	mkdir -p $(CURDIR)/debian/vim/usr/share/consolefonts/
+	cp -a $(CURDIR)/vim63/farsi/fonts/UNIXs/far-a01.pcf.gz $(CURDIR)/debian/vim/usr/share/consolefonts/
+# 	gzip -9 $(CURDIR)/debian/vim/usr/share/doc/vim/README
 # 	dh_movefiles --sourcedir=debian/vim
 # fix for CAN-2005-0069
 	rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim63/tools/vimspell.*
@@ -316,8 +316,8 @@
 
 binary-arch: DH_OPTIONS=-a
 binary-arch: build install
-	rm -rf $(PWD)/debian/vim/usr/share/doc/vim/html
-	rm -rf $(PWD)/debian/vim/usr/share/vim
+	rm -rf $(CURDIR)/debian/vim/usr/share/doc/vim/html
+	rm -rf $(CURDIR)/debian/vim/usr/share/vim
 	dh_testdir
 	dh_testroot
 	dh_strip




More information about the pkg-vim-maintainers mailing list