r1033 - in /unstable/libmms/debian: changelog control patches/ patches/10_this_keyword.diff patches/11_nested_comments.diff patches/series rules

arthur-guest at users.alioth.debian.org arthur-guest at users.alioth.debian.org
Sat Jan 19 14:06:09 UTC 2008 

Author: arthur-guest
Date: Sat Jan 19 14:06:08 2008
New Revision: 1033

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1033
Log:
libmms (0.4-2) unstable; urgency=low

  * Apply patches from bzr branch libmms-devel:
   - 10_this_keyword.diff: Replace "this" keywork by "instance", also thanks
     to Kumar Appaiah <akumar at ee.iitm.ac.in> for the patch. Closes: #458870
   - 11_nested_comments.diff: Fix warning about nested comments.
  * debian/control: Build-Depends on quilt again.
  * debian/rules: Update accordingly.


Added:
    unstable/libmms/debian/patches/
    unstable/libmms/debian/patches/10_this_keyword.diff
    unstable/libmms/debian/patches/11_nested_comments.diff
    unstable/libmms/debian/patches/series
Modified:
    unstable/libmms/debian/changelog
    unstable/libmms/debian/control
    unstable/libmms/debian/rules

Modified: unstable/libmms/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/changelog?rev=1033&op=diff
==============================================================================
--- unstable/libmms/debian/changelog (original)
+++ unstable/libmms/debian/changelog Sat Jan 19 14:06:08 2008
@@ -1,3 +1,14 @@
+libmms (0.4-2) unstable; urgency=low
+
+  * Apply patches from bzr branch libmms-devel:
+    - 10_this_keyword.diff: Replace "this" keywork by "instance", also thanks
+      to Kumar Appaiah <akumar at ee.iitm.ac.in> for the patch. Closes: #458870
+    - 11_nested_comments.diff: Fix warning about nested comments.
+  * debian/control: Build-Depends on quilt again.
+  * debian/rules: Update accordingly.
+
+ -- Arthur Loiret <arthur.loiret at gmail.com>  Sat, 19 Jan 2008 14:05:47 +0000
+
 libmms (0.4-1) unstable; urgency=low
 
   [ Arthur Loiret ]

Modified: unstable/libmms/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/control?rev=1033&op=diff
==============================================================================
--- unstable/libmms/debian/control (original)
+++ unstable/libmms/debian/control Sat Jan 19 14:06:08 2008
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Multimedia Packages Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Arthur Loiret <arthur.loiret at gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev, chrpath
+Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev, quilt (>= 0.40), chrpath
 Standards-Version: 3.7.3
 Section: libs
 XS-DM-Upload-Allowed: yes

Added: unstable/libmms/debian/patches/10_this_keyword.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/patches/10_this_keyword.diff?rev=1033&op=file
==============================================================================
--- unstable/libmms/debian/patches/10_this_keyword.diff (added)
+++ unstable/libmms/debian/patches/10_this_keyword.diff Sat Jan 19 14:06:08 2008
@@ -1,0 +1,46 @@
+--- libmms-0.4/src/mms.h	2007-12-12 01:54:48.000000000 +0530
++++ libmms-0.4/src/mms.h	2008-01-13 16:04:10.000000000 +0530
+@@ -76,11 +76,11 @@
+ 
+ mms_off_t mms_get_current_pos (mms_t *instance);
+ 
+-uint32_t mms_get_asf_header_len (mms_t *this);
++uint32_t mms_get_asf_header_len (mms_t *instance);
+ 
+-uint64_t mms_get_asf_packet_len (mms_t *this);
++uint64_t mms_get_asf_packet_len (mms_t *instance);
+ 
+-int      mms_get_seekable (mms_t *this);
++int      mms_get_seekable (mms_t *instance);
+ 
+ #ifdef __cplusplus
+ }
+--- libmms-0.4/src/mmsh.h	2007-12-12 01:54:48.000000000 +0530
++++ libmms-0.4/src/mmsh.h	2008-01-13 16:04:10.000000000 +0530
+@@ -41,20 +41,20 @@
+ 
+ int      mmsh_read (mms_io_t *io, mmsh_t *instance, char *data, int len);
+ int      mmsh_time_seek (mms_io_t *io, mmsh_t *instance, double time_sec);
+-mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *this, mms_off_t offset, int origin);
++mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *instance, mms_off_t offset, int origin);
+ uint32_t mmsh_get_length (mmsh_t *instance);
+-double   mmsh_get_time_length (mmsh_t *this);
+-uint64_t mmsh_get_raw_time_length (mmsh_t *this);
++double   mmsh_get_time_length (mmsh_t *instance);
++uint64_t mmsh_get_raw_time_length (mmsh_t *instance);
+ mms_off_t mmsh_get_current_pos (mmsh_t *instance);
+ void     mmsh_close (mmsh_t *instance);
+ 
+ int      mmsh_peek_header (mmsh_t *instance, char *data, int maxsize);
+ 
+-uint32_t mmsh_get_asf_header_len (mmsh_t *this);
++uint32_t mmsh_get_asf_header_len (mmsh_t *instance);
+ 
+-uint32_t mmsh_get_asf_packet_len (mmsh_t *this);
++uint32_t mmsh_get_asf_packet_len (mmsh_t *instance);
+ 
+-int      mmsh_get_seekable (mmsh_t *this);
++int      mmsh_get_seekable (mmsh_t *instance);
+ 
+ #ifdef __cplusplus
+ }

Added: unstable/libmms/debian/patches/11_nested_comments.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/patches/11_nested_comments.diff?rev=1033&op=file
==============================================================================
--- unstable/libmms/debian/patches/11_nested_comments.diff (added)
+++ unstable/libmms/debian/patches/11_nested_comments.diff Sat Jan 19 14:06:08 2008
@@ -1,0 +1,8 @@
+--- libmms-0.4/src/mms_config.h.in	2007-12-16 19:19:34.000000000 +0000
++++ libmms-0.4/src/mms_config.h.in	2008-01-19 13:48:33.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* libmms public autoconf settings header file
++/* libmms public autoconf settings header file */
+ 
+ /* Define to 1 if libmms is compiled with 64 bit file offsets */
+ #undef LIBMMS_HAVE_64BIT_OFF_T

Added: unstable/libmms/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/patches/series?rev=1033&op=file
==============================================================================
--- unstable/libmms/debian/patches/series (added)
+++ unstable/libmms/debian/patches/series Sat Jan 19 14:06:08 2008
@@ -1,0 +1,2 @@
+10_this_keyword.diff
+11_nested_comments.diff

Modified: unstable/libmms/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/rules?rev=1033&op=diff
==============================================================================
--- unstable/libmms/debian/rules (original)
+++ unstable/libmms/debian/rules Sat Jan 19 14:06:08 2008
@@ -13,11 +13,27 @@
 confflags += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+PATCH_DIR := debian/patches
+
 CFLAGS += -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),-O0,-O2)
 
-config.status: configure
+config.status: configure patch-stamp
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure $(confflags)
+
+patch-stamp:
+	dh_testdir
+	# apply patches
+	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+	# backup the original (potentially patched) files to restore them in
+	# the clean target
+	-test -r config.sub && cp config.sub config.sub.orig
+	-test -r config.guess && cp config.guess config.guess.orig
+	-test -r /usr/share/misc/config.sub && \
+	cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	cp -f /usr/share/misc/config.guess config.guess
+	touch $@
 
 build: build-stamp
 build-stamp: config.status
@@ -29,10 +45,13 @@
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
-	# restore files from backup
+	# restore files from backup (before unpatching)
 	-test -r config.sub.orig && mv -f config.sub.orig config.sub
 	-test -r config.guess.orig && mv -f config.guess.orig config.guess
+	# unapply patches, if any
+	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
 	rm -rf .pc
+	rm -f patch-stamp
 	rm -f build-stamp
 	dh_clean

More information about the pkg-multimedia-commits mailing list