[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-vmmouse: Changes to 'debian-unstable'



 debian/xsfbs/xsfbs.mk |   17 ++---------------
 debian/xsfbs/xsfbs.sh |    4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 25 16:39:23 2009 +0200

    xsfbs.mk: remove more obsolete code
    
    We can use plain debconf-updatepo, and don't need to clean the 'imports'
    directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
 	dh_testdir
 	rm -rf .pc
 	rm -rf $(STAMP_DIR)
-	rm -rf imports
-	dh_clean debian/shlibs.local \
-	         debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-	sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
-	  -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-	debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+	dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 25 15:43:28 2009 +0200

    xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
    
    These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
 	dh_testdir
 	rm -rf .pc
-	rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+	rm -rf $(STAMP_DIR)
 	rm -rf imports
 	dh_clean debian/shlibs.local \
 	         debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
 	      | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
 	    sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
 	        -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-	        -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
 	      <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
 	    rm $$MAINTSCRIPT.tmp; \
 	  fi; \

commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 25 15:33:39 2009 +0200

    xsfbs.sh: fix typo and remove svn keyword

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 # This is the X Strike Force shell library for X Window System package
 # maintainer scripts.  It serves to define shell functions commonly used by
 # such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
 # removal tasks.
 
 # If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
 # skip past this library by scanning forward in this file to the string
 # "GOBSTOPPER".
 


Reply to: