* ../linux/drivers/media/dvb/.cvsignore:

        - Really make cvs quiet.  .cvsignore in drivers/media wasn't enough.

        * ../v4l/scripts/merge-trees.sh:
        * ../v4l/scripts/unmerge-trees.sh:
        - Fix offsets.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

4 files changed, 20 insertions, 8 deletions

diff --git a/linux/drivers/media/dvb/.cvsignore b/linux/drivers/media/dvb/.cvsignore
new file mode 100644
index 000000000..72e8ffc0d
--- /dev/null
+++ b/linux/drivers/media/dvb/.cvsignore
@@ -0,0 +1 @@
+*
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e55836df9..22b77f315 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-16 20:05  mkrufky
+
+	* ../linux/drivers/media/dvb/.cvsignore:
+	- Really make cvs quiet.  .cvsignore in drivers/media wasn't enough.
+
+	* ../v4l/scripts/merge-trees.sh:
+	* ../v4l/scripts/unmerge-trees.sh:
+	- Fix offsets.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-10-16 19:01  mchehab
 
 	* ../linux/drivers/media/video/msp3400.c: (msp_command):
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index c01e8ad08..20e1299ed 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -38,7 +38,7 @@ diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
 diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
 --- v4l-kernel.orig/v4l/Makefile	2005-10-08 17:31:57.000000000 -0400
 +++ v4l-kernel/v4l/Makefile	2005-10-08 17:45:48.000000000 -0400
-@@ -66,6 +66,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -68,6 +68,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -46,7 +46,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -180,7 +181,7 @@ links::
+@@ -182,7 +183,7 @@ links::
  
  	@ln -sf ../linux/drivers/media/common/ir-common.c .
  
@@ -55,7 +55,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -243,7 +244,7 @@ dvb-rminstall::
+@@ -245,7 +246,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
  	@echo
  
@@ -64,7 +64,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
  
  	-@rm -r $(DEST) \
-@@ -264,7 +265,7 @@ rminstall::
+@@ -266,7 +267,7 @@ rminstall::
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
  
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 702ddb165..6ea2826a4 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -21,7 +21,7 @@ diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config
 diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
 --- v4l-kernel/v4l/Makefile	2005-10-08 17:45:48.000000000 -0400
 +++ v4l-kernel.orig/v4l/Makefile	2005-10-08 17:31:57.000000000 -0400
-@@ -66,7 +66,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -68,7 +68,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -29,7 +29,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -181,7 +180,7 @@ links::
+@@ -183,7 +182,7 @@ links::
  
  	@ln -sf ../linux/drivers/media/common/ir-common.c .
  
@@ -38,7 +38,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -244,7 +243,7 @@ dvb-rminstall::
+@@ -246,7 +245,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
  	@echo
  
@@ -47,7 +47,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
  
  	-@rm -r $(DEST) \
-@@ -265,7 +264,7 @@ rminstall:: dvb-rminstall
+@@ -267,7 +266,7 @@ rminstall:: dvb-rminstall
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)