r984 - in vdr/vdr/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2005-08-15 23:59:44 +0000 (Mon, 15 Aug 2005)
New Revision: 984

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
Log:
Improved newplugin script

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-08-15 23:46:26 UTC (rev 983)
+++ vdr/vdr/trunk/debian/changelog	2005-08-15 23:59:44 UTC (rev 984)
@@ -4,6 +4,8 @@
 
   * Thomas Schmidt <tschmidt at debian.org>
     - New upstream release
+  * Thomas Günther <tom at toms-cafe.de>
+    - Improved newplugin script
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Mon, 15 Aug 2005 17:31:44 +0200
 

Modified: vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/04_newplugin.dpatch	2005-08-15 23:46:26 UTC (rev 983)
+++ vdr/vdr/trunk/debian/patches/04_newplugin.dpatch	2005-08-15 23:59:44 UTC (rev 984)
@@ -3,14 +3,14 @@
 ## 04_newplugin.dpatch by Thomas Schmidt <tschmidt at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for the newplugin-script, to not require a normal 
+## DP: Patch for the newplugin-script, to not require a normal
 ## DP: vdr-source-dir and to add -fPIC to the CXXFLAGS of a
 ## DP: new plugin
 
 @DPATCH@
-diff -urNad vdr-1.3.23/newplugin /tmp/dpep.xLpfdk/vdr-1.3.23/newplugin
---- vdr-1.3.23/newplugin	2005-01-30 14:50:05.000000000 +0100
-+++ /tmp/dpep.xLpfdk/vdr-1.3.23/newplugin	2005-04-09 21:28:38.310427464 +0200
+diff -urNad vdr/newplugin /tmp/dpep.ZZNkdG/vdr/newplugin
+--- vdr/newplugin	2004-12-21 21:46:50.000000000 +0100
++++ /tmp/dpep.ZZNkdG/vdr/newplugin	2004-12-21 21:48:46.000000000 +0100
 @@ -24,7 +24,7 @@
  $PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
  $PLUGIN_MAINENTRY = $PLUGIN_CLASS;
@@ -29,7 +29,22 @@
  
  ### The directory environment:
  
-@@ -239,7 +239,7 @@
+@@ -129,12 +129,12 @@
+ 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
+ 	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
+ 	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
+-	\@tar czf \$(PACKAGE).tgz -C \$(TMPDIR) \$(ARCHIVE)
++	\@tar czf \$(PACKAGE).tgz -C \$(TMPDIR) --exclude debian --exclude CVS --exclude .svn \$(ARCHIVE)
+ 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
+ 	\@echo Distribution package created as \$(PACKAGE).tgz
+ 
+ clean:
+-	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~
++	\@-rm -f \$(OBJS) \$(DEPFILE) *.so* *.tgz core* *~
+ };
+ 
+ $MAIN = qq
+@@ -233,7 +233,7 @@
  VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
  };
  
@@ -38,13 +53,13 @@
  
  die "The directory $PLUGINS_SRC doesn't exist!\n" unless (-d "$PLUGINS_SRC");
  die "A plugin named '$PLUGIN_NAME' already exists in $PLUGINS_SRC!\n" if (-e "$PLUGINDIR");
-@@ -260,7 +260,8 @@
+@@ -254,7 +254,8 @@
  * fill in the code skeleton in "$PLUGIN_NAME.c" to implement your plugin function
  * add further source files if necessary
  * adapt the "Makefile" if necessary
 -* do "make plugins" from the VDR source directory to build your plugin
-+* do "make all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=." from the 
-+  source directory to build your plugin
++* do "make all DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=." from the source
++  directory to build your plugin
  
  };