r756 - in /experimental/libquicktime/debian: ./ patches/

sho at users.alioth.debian.org sho at users.alioth.debian.org
Thu Apr 26 09:02:08 UTC 2007 

Author: sho
Date: Thu Apr 26 09:02:08 2007
New Revision: 756

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=756
Log:
  * debian/control:
    + Rename libquicktime0 to libquicktime1.
  * debian/libquicktime-dev.install:
    + Do not ship .la files.

  * debian/patches/02-install-in-libquicktime1.dpatch:
    + New patch. Install plugins in /usr/lib/libquicktime1 so that we don't
      conflict with libquicktime0 packages.

  * debian/patches/03-spurious-files-in-potfiles-in.dpatch:
    + New patch. Remove include/cmodel_default.h and utils/recover.c from
      POTFILES.in

  * debian/patches/04-use-soname.dpatch:
    + New patch. Set the soname for the library.

Added:
    experimental/libquicktime/debian/libquicktime1.docs
      - copied unchanged from r755, experimental/libquicktime/debian/libquicktime0.docs
    experimental/libquicktime/debian/libquicktime1.install
      - copied, changed from r755, experimental/libquicktime/debian/libquicktime0.install
    experimental/libquicktime/debian/libquicktime1.shlibs
      - copied, changed from r755, experimental/libquicktime/debian/libquicktime0.shlibs
    experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
    experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch
    experimental/libquicktime/debian/patches/04-use-soname.dpatch
Removed:
    experimental/libquicktime/debian/libquicktime0.docs
    experimental/libquicktime/debian/libquicktime0.install
    experimental/libquicktime/debian/libquicktime0.shlibs
Modified:
    experimental/libquicktime/debian/   (props changed)
    experimental/libquicktime/debian/changelog
    experimental/libquicktime/debian/control
    experimental/libquicktime/debian/libquicktime-dev.install
    experimental/libquicktime/debian/patches/00list

Propchange: experimental/libquicktime/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: experimental/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/changelog?rev=756&op=diff
==============================================================================
--- experimental/libquicktime/debian/changelog (original)
+++ experimental/libquicktime/debian/changelog Thu Apr 26 09:02:08 2007
@@ -30,7 +30,25 @@
     + Added unpatch to clean rule.
     + Added --ignore-errors to `-$(MAKE) distclean'.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 18 Apr 2007 11:20:00 +0100
+  [ Sam Hocevar ]
+
+  * debian/control:
+    + Rename libquicktime0 to libquicktime1.
+  * debian/libquicktime-dev.install:
+    + Do not ship .la files.
+
+  * debian/patches/02-install-in-libquicktime1.dpatch:
+    + New patch. Install plugins in /usr/lib/libquicktime1 so that we don't
+      conflict with libquicktime0 packages.
+
+  * debian/patches/03-spurious-files-in-potfiles-in.dpatch:
+    + New patch. Remove include/cmodel_default.h and utils/recover.c from
+      POTFILES.in
+
+  * debian/patches/04-use-soname.dpatch:
+    + New patch. Set the soname for the library.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 26 Apr 2007 00:32:45 +0200
 
 libquicktime (2:0.9.10+debian-3) experimental; urgency=low
 

Modified: experimental/libquicktime/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/control?rev=756&op=diff
==============================================================================
--- experimental/libquicktime/debian/control (original)
+++ experimental/libquicktime/debian/control Thu Apr 26 09:02:08 2007
@@ -8,12 +8,10 @@
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/libquicktime
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/
 
-Package: libquicktime0
+Package: libquicktime1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libquicktime1
-Replaces: libquicktime1
 Description: library for reading and writing Quicktime files
  libquicktime is a library for reading and writing QuickTime files on UNIX
  systems. Video CODECs supported by this library are OpenDivX, MJPA, JPEG Photo,
@@ -25,7 +23,7 @@
 Package: libquicktime-dev
 Section: libdevel
 Architecture: any
-Depends: libquicktime0 (= ${binary:Version})
+Depends: libquicktime1 (= ${binary:Version})
 Description: library for reading and writing Quicktime files (development)
  libquicktime is a library for reading and writing QuickTime files on UNIX
  systems. Video CODECs supported by this library are OpenDivX, MJPA, JPEG Photo,

Modified: experimental/libquicktime/debian/libquicktime-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/libquicktime-dev.install?rev=756&op=diff
==============================================================================
--- experimental/libquicktime/debian/libquicktime-dev.install (original)
+++ experimental/libquicktime/debian/libquicktime-dev.install Thu Apr 26 09:02:08 2007
@@ -1,7 +1,5 @@
 /usr/bin/lqt-config
 /usr/include/*
 /usr/lib/*.so
-/usr/lib/*.la
-/usr/lib/libquicktime/*.la
 /usr/lib/pkgconfig/*
 /usr/share/aclocal/*

Copied: experimental/libquicktime/debian/libquicktime1.install (from r755, experimental/libquicktime/debian/libquicktime0.install)
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/libquicktime1.install?rev=756&op=diff
==============================================================================
--- experimental/libquicktime/debian/libquicktime0.install (original)
+++ experimental/libquicktime/debian/libquicktime1.install Thu Apr 26 09:02:08 2007
@@ -1,3 +1,3 @@
 /usr/lib/*.so.*
-/usr/lib/libquicktime/*.so
+/usr/lib/libquicktime1/*.so
 /usr/share/locale/*

Copied: experimental/libquicktime/debian/libquicktime1.shlibs (from r755, experimental/libquicktime/debian/libquicktime0.shlibs)
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/libquicktime1.shlibs?rev=756&op=diff
==============================================================================
--- experimental/libquicktime/debian/libquicktime0.shlibs (original)
+++ experimental/libquicktime/debian/libquicktime1.shlibs Thu Apr 26 09:02:08 2007
@@ -1,1 +1,1 @@
-libquicktime 0 libquicktime0 (>= 1.0.0+debian)
+libquicktime 1 libquicktime1 (>= 2:1.0.0+debian)

Modified: experimental/libquicktime/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/00list?rev=756&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/00list (original)
+++ experimental/libquicktime/debian/patches/00list Thu Apr 26 09:02:08 2007
@@ -1,1 +1,4 @@
 01-debian-directory
+02-install-in-libquicktime1
+03-spurious-files-in-potfiles-in
+04-use-soname

Added: experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch?rev=756&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch (added)
+++ experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch Thu Apr 26 09:02:08 2007
@@ -1,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-install-in-libquicktime1.dpatch by Sam Hocevar <sam at zoy.org>
+##
+## DP: Install plugins in /usr/lib/libquicktime1, not /usr/lib/libquicktime
+
+ at DPATCH@
+
+diff -Naru libquicktime-1.0.0.orig/configure libquicktime-1.0.0/configure
+--- libquicktime-1.0.0.orig/configure	2007-04-25 23:04:30.000000000 +0200
++++ libquicktime-1.0.0/configure	2007-04-25 23:04:37.000000000 +0200
+@@ -2385,7 +2385,7 @@ fi
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=libquicktime
++ PACKAGE=libquicktime1
+  VERSION=1.0.0
+ 
+ 

Added: experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch?rev=756&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch (added)
+++ experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch Thu Apr 26 09:02:08 2007
@@ -1,0 +1,23 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 03-spurious-files-in-potfiles-in.dpatch by Sam Hocevar <sam at zoy.org>
+##
+## DP: Remove include/cmodel_default.h and utils/recover.c from POTFILES.in
+
+ at DPATCH@
+
+diff -puriN libquicktime-1.0.0+debian.orig/po/POTFILES.in libquicktime-1.0.0+debian/po/POTFILES.in
+--- libquicktime-1.0.0+debian.orig/po/POTFILES.in	2007-04-17 19:49:01.000000000 +0200
++++ libquicktime-1.0.0+debian/po/POTFILES.in	2007-04-25 23:32:23.000000000 +0200
+@@ -145,7 +145,6 @@ plugins/rtjpeg/lqt_rtjpeg.c
+ plugins/rtjpeg/rtjpeg_codec.c
+ include/lqt_fseek.h
+ include/lqt_codecfile.h
+-include/cmodel_default.h
+ include/charset.h
+ include/workarounds.h
+ include/lqt_codecinfo_private.h
+@@ -183,4 +182,3 @@ utils/gtk/libquicktime_config.c
+ utils/gtk/lqt_gtk.c
+ utils/yuv4toyuv.c
+ utils/dump.c
+-utils/recover.c

Added: experimental/libquicktime/debian/patches/04-use-soname.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/04-use-soname.dpatch?rev=756&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/04-use-soname.dpatch (added)
+++ experimental/libquicktime/debian/patches/04-use-soname.dpatch Thu Apr 26 09:02:08 2007
@@ -1,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 04-use-soname.dpatch by Sam Hocevar <sam at zoy.org>
+##
+## DP: Use an soname for the library
+
+ at DPATCH@
+
+diff -puriN libquicktime-1.0.0+debian.orig/src/Makefile.in libquicktime-1.0.0+debian/src/Makefile.in
+--- libquicktime-1.0.0+debian.orig/src/Makefile.in	2007-04-17 19:44:26.000000000 +0200
++++ libquicktime-1.0.0+debian/src/Makefile.in	2007-04-26 00:31:46.000000000 +0200
+@@ -327,7 +327,7 @@ AM_CFLAGS = -DLOCALE_DIR=\"$(localedir)\
+ # Maybe we need zlib to read compressed quicktime headers
+ #
+ libquicktime_la_LIBADD = @ICONV_LIBS@ @LIBINTL@
+-libquicktime_la_LDFLAGS = -export-dynamic
++libquicktime_la_LDFLAGS = -export-dynamic -version-info 1:0:0
+ @HAVE_FSEEKO_FALSE at FSEEKO_SRC = lqt_fseeko.c
+ 
+ # build only the files, which can be compiled

More information about the pkg-multimedia-commits mailing list