tags 466276 + patch
thanks

Hi,

Attached is the diff for a proposed libdvbpsi4 0.1.5-3.1 NMU from the
Cambridge BSP.

Regards,
    Simon
diff -u libdvbpsi4-0.1.5/debian/rules libdvbpsi4-0.1.5/debian/rules
--- libdvbpsi4-0.1.5/debian/rules
+++ libdvbpsi4-0.1.5/debian/rules
@@ -27,7 +27,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 install: build
diff -u libdvbpsi4-0.1.5/debian/changelog libdvbpsi4-0.1.5/debian/changelog
--- libdvbpsi4-0.1.5/debian/changelog
+++ libdvbpsi4-0.1.5/debian/changelog
@@ -1,3 +1,16 @@
+libdvbpsi4 (0.1.5-3.1) unstable; urgency=low
+
+  * Non-maintainer upload from the Cambridge BSP.
+  * Declare dvbpsi_SDTServiceAddDescriptor in sdt.h (taken from 0.1.6 upstream
+    release). (Closes: #466276)
+  * Remove XS-Vcs fields (has been replaced by libdvbpsi5 in svn)
+  * Trivial lintian cleanup:
+    - don't ignore make clean errors
+    - use binary:Version instead of Source-Version
+  * Verified to not FTBFS with gcc -> gcc-4.3, sh -> dash and double build.
+
+ -- Simon McVittie <[EMAIL PROTECTED]>  Sun, 06 Apr 2008 22:03:10 +0000
+
 libdvbpsi4 (0.1.5-3) unstable; urgency=low
 
   * debian/control:
diff -u libdvbpsi4-0.1.5/debian/control libdvbpsi4-0.1.5/debian/control
--- libdvbpsi4-0.1.5/debian/control
+++ libdvbpsi4-0.1.5/debian/control
@@ -5,8 +5,6 @@
 Uploaders: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0)
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libebml
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libebml/
 
 Package: libdvbpsi4
 Section: libs
@@ -21,7 +19,7 @@
 Package: libdvbpsi4-dev
 Section: libdevel
 Architecture: any
-Depends: libdvbpsi4 (= ${Source-Version})
+Depends: libdvbpsi4 (= ${binary:Version})
 Conflicts: libdvbpsi0-dev, libdvbpsi1-dev, libdvbpsi2-dev, libdvbpsi3-dev
 Description: development files for libdvbpsi4
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
only in patch2:
unchanged:
--- libdvbpsi4-0.1.5.orig/src/tables/sdt.h
+++ libdvbpsi4-0.1.5/src/tables/sdt.h
@@ -231,6 +231,28 @@
     uint16_t i_service_id, int b_eit_schedule, int b_eit_present,
     uint8_t i_running_status,int b_free_ca);
 
+
+/*****************************************************************************
+ * dvbpsi_SDTServiceAddDescriptor
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
+                                               dvbpsi_sdt_service_t *p_service,
+                                               uint8_t i_tag, uint8_t i_length,
+                                               uint8_t *p_data)
+ * \brief Add a descriptor in the SDT service.
+ * \param p_service pointer to the service structure
+ * \param i_tag descriptor's tag
+ * \param i_length descriptor's length
+ * \param p_data descriptor's data
+ * \return a pointer to the added descriptor.
+ */
+dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
+                                               dvbpsi_sdt_service_t *p_service,
+                                               uint8_t i_tag, uint8_t i_length,
+                                               uint8_t *p_data);
+
+
 /*****************************************************************************
  * dvbpsi_GenSDTSections
  *****************************************************************************

Attachment: signature.asc
Description: Digital signature

Reply via email to