r8896 - in /vdr/vdr-plugin-dvd/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Apr 9 15:24:56 UTC 2011


Author: tiber-guest
Date: Sat Apr  9 15:24:55 2011
New Revision: 8896

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8896
Log:
* Build-depend on vdr-dev >= 1.7.17
* Updated debian/copyright
* Standards-Version: 3.9.1
* Switched to debhelper 7 and dropped cdbs

Added:
    vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.patch
      - copied, changed from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.patch
      - copied, changed from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.patch
      - copied, changed from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.patch
      - copied, changed from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.patch
      - copied, changed from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/series
      - copied, changed from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/00list
    vdr/vdr-plugin-dvd/trunk/debian/source/
    vdr/vdr-plugin-dvd/trunk/debian/source/format
Removed:
    vdr/vdr-plugin-dvd/trunk/debian/README.source
    vdr/vdr-plugin-dvd/trunk/debian/patches/00list
    vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch
    vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch
Modified:
    vdr/vdr-plugin-dvd/trunk/debian/changelog
    vdr/vdr-plugin-dvd/trunk/debian/compat
    vdr/vdr-plugin-dvd/trunk/debian/control
    vdr/vdr-plugin-dvd/trunk/debian/install
    vdr/vdr-plugin-dvd/trunk/debian/rules

Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/changelog?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog Sat Apr  9 15:24:55 2011
@@ -1,3 +1,12 @@
+vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-4) unstable; urgency=low
+
+  * Build-depend on vdr-dev >= 1.7.17
+  * Updated debian/copyright
+  * Standards-Version: 3.9.1
+  * Switched to debhelper 7 and dropped cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 09 Apr 2011 17:21:23 +0200
+
 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-3) unstable; urgency=low
 
   * Build-depend on vdr-dev >= 1.6.0-16

Modified: vdr/vdr-plugin-dvd/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/compat?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/compat (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/compat Sat Apr  9 15:24:55 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-dvd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/control?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/control Sat Apr  9 15:24:55 2011
@@ -3,14 +3,12 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5),
- cdbs,
- dpatch,
- vdr-dev (>= 1.6.0-16),
+Build-Depends: debhelper (>= 7.0.50~),
+ vdr-dev (>= 1.7.17),
  gettext,
  libdvdnav-dev (>=4.1.2-3),
  liba52-0.7.4-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/
 Homepage: http://sourceforge.net/projects/dvdplugin

Modified: vdr/vdr-plugin-dvd/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/install?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/install (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/install Sat Apr  9 15:24:55 2011
@@ -1,4 +1,4 @@
 libvdr-dvd.so.*                 usr/lib/vdr/plugins/
 debian/plugin.dvd.conf          etc/vdr/plugins/
 debian/vdr-plugin-dvd.groups    usr/share/vdr/groups.d/
-debian/tmp/usr/share/locale
+locale                          usr/share/

Copied: vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.patch (from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.patch?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.patch Sat Apr  9 15:24:55 2011
@@ -10,10 +10,11 @@
 ## DP: Patch to resume a dvd where it was interupted by the user.
 
 @DPATCH@
-diff -Naurp vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/Makefile
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile	2008-12-23 16:49:04.000000000 +0000
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/Makefile	2009-04-26 01:08:57.000000000 +0000
-@@ -64,6 +64,10 @@ CXXFLAGS += -O3
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/Makefile	2008-12-23 17:49:04.000000000 +0100
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile	2011-04-09 17:23:33.000000000 +0200
+@@ -64,6 +64,10 @@
  LDFLAGS  += -O3 -Wl,--retain-symbols-file,retain-sym
  endif
  
@@ -24,9 +25,10 @@
  ### The object files (add further files here):
  
  OBJS = $(PLUGIN).o dvddev.o player-dvd.o control-dvd.o dvdspu.o     \
-diff -Naurp vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.c
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c	2009-01-18 13:58:42.000000000 +0000
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.c	2009-05-01 22:42:23.000000000 +0000
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.c	2009-01-18 14:58:42.000000000 +0100
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c	2011-04-09 17:23:33.000000000 +0200
 @@ -21,6 +21,8 @@
  #include <vdr/thread.h>
  #include <vdr/device.h>
@@ -36,7 +38,7 @@
  
  #ifdef HAVE_CONFIG_H
  #include "config.h"
-@@ -231,6 +233,216 @@ void cIframeAssembler::Put(unsigned char
+@@ -231,6 +233,216 @@
  }
  
  
@@ -253,7 +255,7 @@
  // --- cDvdPlayer ------------------------------------------------------------
  
  //XXX+ also used in recorder.c - find a better place???
-@@ -287,6 +499,9 @@ cDvdPlayer::cDvdPlayer(void): cThread("d
+@@ -287,6 +499,9 @@
      skipPlayVideo=false;
      fastWindFactor=1;
  
@@ -263,7 +265,7 @@
      clearSeenSubpStream();
      clearSeenAudioTrack();
  
-@@ -333,6 +548,8 @@ cDvdPlayer::~cDvdPlayer()
+@@ -333,6 +548,8 @@
  
      if(aspect_str)
  		free(aspect_str);
@@ -272,7 +274,7 @@
  }
  
  void cDvdPlayer::setController (cDvdPlayerControl *ctrl )
-@@ -566,6 +783,100 @@ uint64_t cDvdPlayer::delay_ticks(uint64_
+@@ -566,6 +783,100 @@
  #endif
  }
  
@@ -373,7 +375,7 @@
  void cDvdPlayer::Action(void) {
      memset(event_buf, 0, sizeof(uint8_t)*4096);
  
-@@ -635,6 +946,13 @@ void cDvdPlayer::Action(void) {
+@@ -635,6 +946,13 @@
  
      bool firstClear = true;
  
@@ -387,7 +389,7 @@
      while(running && nav) {
  
          if (!pframe) {
-@@ -1110,6 +1428,22 @@ void cDvdPlayer::Action(void) {
+@@ -1110,6 +1428,22 @@
  	      SetTitleInfoString();
  	      SetTitleString();
  	      SetAspectString();
@@ -410,7 +412,7 @@
  	      break;
  	  case DVDNAV_CELL_CHANGE: {
  	      DEBUG_NAV("%s:%d:NAV CELL CHANGE\n", __FILE__, __LINE__);
-@@ -1130,6 +1464,11 @@ void cDvdPlayer::Action(void) {
+@@ -1130,6 +1464,11 @@
  	      // cell change .. game over ..
  	      changeNavSubpStreamOnceInSameCell=false;
      	  SetTitleInfoString();
@@ -422,7 +424,7 @@
  	      break;
  	  }
  	  case DVDNAV_NAV_PACKET: {
-@@ -1887,8 +2226,18 @@ void cDvdPlayer::Stop(void)
+@@ -1887,8 +2226,18 @@
      if (!DVDActiveAndRunning())
          return;
  
@@ -442,7 +444,7 @@
  }
  
  void cDvdPlayer::Play(void)
-@@ -2204,24 +2553,41 @@ void cDvdPlayer::NextAngle(void)
+@@ -2204,24 +2553,41 @@
      GotoAngle(++angleNumber);
  }
  
@@ -488,10 +490,11 @@
          // dvdnav_title_play(nav, Title);
      }
  
-diff -Naurp vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.h
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h	2007-09-17 19:04:43.000000000 +0000
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.h	2009-05-01 22:41:48.000000000 +0000
-@@ -52,6 +52,7 @@ class IntegerListObject : public cListOb
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h	2007-09-17 21:04:43.000000000 +0200
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h	2011-04-09 17:23:33.000000000 +0200
+@@ -52,6 +52,7 @@
  
  class cDvdPlayerControl ;
  class cIframeAssembler;
@@ -499,7 +502,7 @@
  
  class cDvdPlayer : public cPlayer, cThread {
   private:
-@@ -184,6 +185,32 @@ class cDvdPlayer : public cPlayer, cThre
+@@ -184,6 +185,32 @@
      int  GetAudioStreamNumbers(void) const ;
      uint16_t GetSubtitleLanguageCode(int Channel) const;
      int  GetSubtitleStreamNumbers(void) const ;
@@ -532,7 +535,7 @@
  protected: //Player
      virtual void Activate(bool On);
      virtual void Action(void);
-@@ -316,7 +343,8 @@ public:
+@@ -316,7 +343,8 @@
       *
       * return set title ..
       */

Copied: vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.patch (from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.patch?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/05_stdint.patch Sat Apr  9 15:24:55 2011
@@ -6,9 +6,10 @@
 ## DP: C++ code.
 
 @DPATCH@
-diff -urNad vdr-plugin-dvd-0.3.6~b03+cvs20070813~/Makefile vdr-plugin-dvd-0.3.6~b03+cvs20070813/Makefile
---- vdr-plugin-dvd-0.3.6~b03+cvs20070813~/Makefile	2008-07-21 20:29:23.000000000 +0200
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20070813/Makefile	2008-07-21 20:29:23.000000000 +0200
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/Makefile	2011-04-09 17:23:33.000000000 +0200
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile	2011-04-09 17:23:40.000000000 +0200
 @@ -43,7 +43,7 @@
  
  INCLUDES += -I$(VDRDIR)/include -I$(NAVDIR)

Copied: vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.patch (from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.patch?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.patch Sat Apr  9 15:24:55 2011
@@ -5,8 +5,10 @@
 ## DP: Removes stderr output on correctly parsed -C parameter
 
 @DPATCH@
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/dvd.c	2007-09-16 18:31:50.000000000 +0200
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c	2011-04-09 17:23:43.000000000 +0200
 @@ -73,7 +73,7 @@
  #endif
          switch (c) {

Copied: vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.patch (from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.patch?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.patch Sat Apr  9 15:24:55 2011
@@ -6,10 +6,12 @@
 ## DP: just log a warning and continue.
 
 @DPATCH@
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/dvd.c	2011-04-09 17:23:43.000000000 +0200
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c	2011-04-09 17:23:46.000000000 +0200
 @@ -76,8 +76,7 @@
-                 fprintf(stderr, "arg: %s\n", optarg);
+                 // fprintf(stderr, "arg: %s\n", optarg);
                  cDVD::SetDeviceName(optarg);
                  if (!cDVD::DriveExists()) {
 -                    esyslog("vdr: DVD drive not found: %s", optarg);

Copied: vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.patch (from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.patch?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.patch Sat Apr  9 15:24:55 2011
@@ -5,8 +5,10 @@
 ## DP: Fixed spelling errors in german translation.
 
 @DPATCH@
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/i18n.c	2008-12-23 18:26:32.000000000 +0100
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c	2011-04-09 17:23:49.000000000 +0200
 @@ -125,7 +125,7 @@
      },
      {
@@ -16,7 +18,7 @@
          "Prednostni jezik za menije",                       // Slovenski
          "menu - linguaggio preferito",                      // Italiano
          "Taalkeuze voor menu",                              // Nederlands
-@@ -177,7 +177,7 @@ const tI18nPhrase DvdPhrases[] = {
+@@ -177,7 +177,7 @@
      },
      {
      "Setup.DVD$Preferred subtitle language",                // English
@@ -25,7 +27,7 @@
          "Prednostni jezik za podnapise",                    // Slovenski
          "sottotitoli - linguaggio preferito",               // Italiano
          "Taalkeuze voor ondertitels",                       // Nederlands
-@@ -333,7 +333,7 @@ const tI18nPhrase DvdPhrases[] = {
+@@ -333,7 +333,7 @@
      },
      {
      "Error.DVD$Error opening DVD!",                         // English
@@ -34,7 +36,7 @@
          "Napaka pri odpiranju DVD-ja!",                     // Slovenski
          "",                                                 // Italiano
          "Fout bij het openen van de DVD!",                  // Nederlands
-@@ -359,7 +359,7 @@ const tI18nPhrase DvdPhrases[] = {
+@@ -359,7 +359,7 @@
      },
      {
      "Error.DVD$Error fetching data from DVD!",              // English
@@ -43,8 +45,10 @@
          "Napaka pri branju podatkov iz DVD-ja!",            // Slovenski
          "",                                                 // Italiano
          "Error bij het verkrijgen van data van de DVD!",    // Nederlands
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po
+Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po
+===================================================================
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/po/de_DE.po	2008-12-23 17:56:17.000000000 +0100
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po	2011-04-09 17:23:49.000000000 +0200
 @@ -25,19 +25,19 @@
  msgstr "DVD"
  

Copied: vdr/vdr-plugin-dvd/trunk/debian/patches/series (from r8514, vdr/vdr-plugin-dvd/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/series?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/series Sat Apr  9 15:24:55 2011
@@ -1,5 +1,5 @@
-04_vdr-dvd_resume
-05_stdint
-10_dvd.c
-11_allow-non-existing-dvd-drive
-12_dvd-fixed-german-spelling
+04_vdr-dvd_resume.patch
+05_stdint.patch
+10_dvd.c.patch
+11_allow-non-existing-dvd-drive.patch
+12_dvd-fixed-german-spelling.patch

Modified: vdr/vdr-plugin-dvd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/rules?rev=8896&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/rules (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/rules Sat Apr  9 15:24:55 2011
@@ -1,27 +1,23 @@
 #!/usr/bin/make -f
 
-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
 
-DEB_INSTALL_CHANGELOGS_ALL = HISTORY
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale
+%:
+	dh $@
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-clean::
+override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+	rm -rf locale libvdr-*.so.*
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
 
-VERSION_ID = $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+cvs.*//')+cvs$(shell date --utc +%0Y%0m%0d.%0k%0M)
-get-orig-source::
-	echo Downloading $(DEB_SOURCE_PACKAGE) $(VERSION_ID) from cvs...
-	cvs -d:pserver:anonymous at dvdplugin.cvs.sourceforge.net:/cvsroot/dvdplugin export -D NOW -d $(DEB_SOURCE_PACKAGE)-$(VERSION_ID) dvd
-	tar czf ../$(DEB_SOURCE_PACKAGE)_$(VERSION_ID).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
-	rm -rf $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
-	dch -v "$(VERSION_ID)-1" "New Upstream Snapshot"
+get-vcs-snapshot:
+	ruby debian/get-vcs-snapshot.rb

Added: vdr/vdr-plugin-dvd/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/source/format?rev=8896&op=file
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-dvd/trunk/debian/source/format Sat Apr  9 15:24:55 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the pkg-vdr-dvb-changes mailing list