r5513 - in /vdr/vdr-plugin-xine/trunk/debian: changelog control patches/00list patches/01_debian.dpatch patches/02_constness.dpatch rules

tschmidt at users.alioth.debian.org tschmidt at users.alioth.debian.org
Sun Oct 7 22:49:37 UTC 2007 

Author: tschmidt
Date: Sun Oct  7 22:49:36 2007
New Revision: 5513

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5513
Log:
  - Updated 01_debian.dpatch
  - Removed 02_constness.dpatch
* Updated debian/rules to include $(DESTDIR) in build and
  install targets
* Depend on libxine2-vdr

Removed:
    vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
Modified:
    vdr/vdr-plugin-xine/trunk/debian/changelog
    vdr/vdr-plugin-xine/trunk/debian/control
    vdr/vdr-plugin-xine/trunk/debian/patches/00list
    vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
    vdr/vdr-plugin-xine/trunk/debian/rules

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/changelog?rev=5513&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog Sun Oct  7 22:49:36 2007
@@ -2,17 +2,21 @@
 
   * First upload to the official archive (Closes: #445712)
   * New upstream release
-    - Updated 02_constness.dpatch
+    - Updated 01_debian.dpatch
     - Removed 01_upstream.dpatch
+    - Removed 02_constness.dpatch
     - Removed 03_extra_keys.dpatch
+  * Updated debian/rules to include $(DESTDIR) in build and
+    install targets
   * Updated debian/copyright
   * Updated package description
   * Build-Depend on debhelper (>= 5), set COMPAT-Level to 5
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control
   * Changed clean-target in debian/rules to not ignore errors
   * Build-Depend on libxine-dev (>= 1.1.90hg+20070930-1)
-
- -- Thomas Schmidt <tschmidt at debian.org>  Mon, 08 Oct 2007 00:13:25 +0200
+  * Depend on libxine2-vdr
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Mon, 08 Oct 2007 00:48:49 +0200
 
 vdr-plugin-xine (0.7.10-3) experimental; urgency=low
 

Modified: vdr/vdr-plugin-xine/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/control?rev=5513&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/control (original)
+++ vdr/vdr-plugin-xine/trunk/debian/control Sun Oct  7 22:49:36 2007
@@ -10,8 +10,7 @@
 
 Package: vdr-plugin-xine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
-Recommends: libxine1
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, libxine2-vdr
 Suggests: y4mscaler, mjpegtools, netpbm
 Description: allows xine to be a display for vdr, the Video Disk Recorder
  Plugin for vdr which allows you to use xine, gxine or some other frontend 

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/patches/00list?rev=5513&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/00list Sun Oct  7 22:49:36 2007
@@ -1,2 +1,1 @@
 01_debian
-02_constness

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch?rev=5513&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch (original)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch Sun Oct  7 22:49:36 2007
@@ -6,18 +6,18 @@
 ## DP: Package-specific bits
 
 @DPATCH@
-diff -urNad vdr-plugin-xine-0.7.10~/Make.config vdr-plugin-xine-0.7.10/Make.config
---- vdr-plugin-xine-0.7.10~/Make.config	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-plugin-xine-0.7.10/Make.config	2007-01-13 11:31:22.000000000 +0100
+diff -urNad vdr-plugin-xine-0.7.11~/Make.config vdr-plugin-xine-0.7.11/Make.config
+--- vdr-plugin-xine-0.7.11~/Make.config	1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xine-0.7.11/Make.config	2007-10-08 00:29:12.000000000 +0200
 @@ -0,0 +1,5 @@
 +INCLUDES+=-I/usr/include/freetype2
 +VDRDIR=/usr/include/vdr
 +LIBDIR=$(DESTDIR)/usr/lib/vdr/plugins
-+VIDEODIR=/video
++VIDEODIR=/var/lib/video
 +DATA_DIR=$(DESTDIR)/usr/share/vdr-plugin-xine
-diff -urNad vdr-plugin-xine-0.7.10~/Makefile vdr-plugin-xine-0.7.10/Makefile
---- vdr-plugin-xine-0.7.10~/Makefile	2006-12-10 21:12:37.000000000 +0100
-+++ vdr-plugin-xine-0.7.10/Makefile	2007-01-13 11:31:45.000000000 +0100
+diff -urNad vdr-plugin-xine-0.7.11~/Makefile vdr-plugin-xine-0.7.11/Makefile
+--- vdr-plugin-xine-0.7.11~/Makefile	2007-10-08 00:28:48.000000000 +0200
++++ vdr-plugin-xine-0.7.11/Makefile	2007-10-08 00:30:57.000000000 +0200
 @@ -31,7 +31,7 @@
  
  ### Allow user defined options to overwrite defaults:
@@ -42,7 +42,16 @@
  
  ### The version number of VDR's plugin API (taken from VDR's "config.h"):
  
-@@ -110,6 +110,16 @@
+@@ -109,7 +109,7 @@
+ ### Internationalization (I18N):
+ 
+ PODIR     = po
+-LOCALEDIR = $(VDRDIR)/locale
++LOCALEDIR = $(DESTDIR)$(VDRDIR)/locale
+ I18Npo    = $(wildcard $(PODIR)/*.po)
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+@@ -137,6 +137,16 @@
  	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
  	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
  

Modified: vdr/vdr-plugin-xine/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/rules?rev=5513&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/rules (original)
+++ vdr/vdr-plugin-xine/trunk/debian/rules Sun Oct  7 22:49:36 2007
@@ -28,7 +28,8 @@
 unpatch:
 endif
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+DESTDIR = $(CURDIR)/debian/vdr-plugin-xine
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. DESTDIR=$(DESTDIR) 
 
 configure: configure-stamp
 configure-stamp: patch-stamp
@@ -54,7 +55,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install $(MAKE_OPTIONS) DESTDIR=$(CURDIR)/debian/vdr-plugin-xine $(DEFS)
+	$(MAKE) install $(MAKE_OPTIONS) $(DEFS)
 
 # Build architecture-independent files here.
 binary-indep: build install

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