r1613 - in /experimental/libquicktime/debian: changelog patches/01-debian-directory.patch patches/02-install-in-libquicktime1.patch patches/70-relibtoolize.patch rules
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Mon Feb 16 13:19:48 UTC 2009
Author: fabian-guest
Date: Mon Feb 16 13:19:47 2009
New Revision: 1613
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1613
Log:
* Upload to unstable.
* New upstream release.
* Rebuilt upstream tarball without debian/ directory.
* debian/patches/01-debian-directory.patch,
debian/patches/02-install-in-libquicktime1.patch,
debian/patches/70-relibtoolize.patch:
+ Refreshed.
Modified:
experimental/libquicktime/debian/changelog
experimental/libquicktime/debian/patches/01-debian-directory.patch
experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch
experimental/libquicktime/debian/patches/70-relibtoolize.patch
experimental/libquicktime/debian/rules
Modified: experimental/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/changelog?rev=1613&op=diff
==============================================================================
--- experimental/libquicktime/debian/changelog (original)
+++ experimental/libquicktime/debian/changelog Mon Feb 16 13:19:47 2009
@@ -1,4 +1,12 @@
-libquicktime (2:1.1.0+debian-2) experimental; urgency=low
+libquicktime (2:1.1.1+debian-1) unstable; urgency=low
+
+ * Upload to unstable.
+ * New upstream release.
+ * Rebuilt upstream tarball without debian/ directory.
+ * debian/patches/01-debian-directory.patch,
+ debian/patches/02-install-in-libquicktime1.patch,
+ debian/patches/70-relibtoolize.patch:
+ + Refreshed.
* debian/*.install:
+ Simplified, removed leading "/" and trailing "/*".
@@ -19,7 +27,7 @@
* debian/watch:
+ Removed spurious comments and correctly cited dversionmangle option.
- -- Fabian Greffrath <fabian at debian-unofficial.org> Wed, 04 Feb 2009 17:03:48 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 16 Feb 2009 13:48:03 +0100
libquicktime (2:1.1.0+debian-1) experimental; urgency=low
Modified: experimental/libquicktime/debian/patches/01-debian-directory.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/01-debian-directory.patch?rev=1613&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/01-debian-directory.patch (original)
+++ experimental/libquicktime/debian/patches/01-debian-directory.patch Mon Feb 16 13:19:47 2009
@@ -1,5 +1,5 @@
---- libquicktime.orig/Makefile.am
-+++ libquicktime/Makefile.am
+--- libquicktime-1.1.1.orig/Makefile.am
++++ libquicktime-1.1.1/Makefile.am
@@ -25,7 +25,6 @@
@@ -8,9 +8,9 @@
doc \
src \
include \
---- libquicktime.orig/configure.ac
-+++ libquicktime/configure.ac
-@@ -880,7 +880,6 @@
+--- libquicktime-1.1.1.orig/configure.ac
++++ libquicktime-1.1.1/configure.ac
+@@ -879,7 +879,6 @@
libquicktime.pc \
doc/Makefile \
doc/Doxyfile \
Modified: experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch?rev=1613&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch (original)
+++ experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch Mon Feb 16 13:19:47 2009
@@ -1,14 +1,14 @@
---- libquicktime.orig/configure.ac
-+++ libquicktime/configure.ac
+--- libquicktime-1.1.1.orig/configure.ac
++++ libquicktime-1.1.1/configure.ac
@@ -1,5 +1,5 @@
AC_INIT(src/lqt_quicktime.c)
--AM_INIT_AUTOMAKE(libquicktime, 1.1.0)
-+AM_INIT_AUTOMAKE(libquicktime1, 1.1.0)
+-AM_INIT_AUTOMAKE(libquicktime, 1.1.1)
++AM_INIT_AUTOMAKE(libquicktime1, 1.1.1)
LQT_VERSION=$VERSION
---- libquicktime.orig/src/Makefile.am
-+++ libquicktime/src/Makefile.am
+--- libquicktime-1.1.1.orig/src/Makefile.am
++++ libquicktime-1.1.1/src/Makefile.am
@@ -9,7 +9,7 @@
#
libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@
Modified: experimental/libquicktime/debian/patches/70-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/70-relibtoolize.patch?rev=1613&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/70-relibtoolize.patch (original)
+++ experimental/libquicktime/debian/patches/70-relibtoolize.patch Mon Feb 16 13:19:47 2009
@@ -6,18 +6,8 @@
rm -rf autom4te.cache
and by excluding config.guess and config.sub from the patch.
---- libquicktime.orig/Makefile.in
-+++ libquicktime/Makefile.in
-@@ -292,7 +292,6 @@
- m4datadir = $(datadir)/aclocal
- m4data_DATA = lqt.m4
- DIST_SUBDIRS = \
--debian \
- doc \
- src \
- include \
---- libquicktime.orig/aclocal.m4
-+++ libquicktime/aclocal.m4
+--- libquicktime-1.1.1.orig/aclocal.m4
++++ libquicktime-1.1.1/aclocal.m4
@@ -21,7 +21,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -27,27 +17,27 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
---- libquicktime.orig/configure
-+++ libquicktime/configure
+--- libquicktime-1.1.1.orig/configure
++++ libquicktime-1.1.1/configure
@@ -2441,7 +2441,7 @@
# Define the identity of the package.
- PACKAGE=libquicktime
+ PACKAGE=libquicktime1
- VERSION=1.1.0
+ VERSION=1.1.1
@@ -29628,7 +29628,7 @@
--ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.spec libquicktime.pc doc/Makefile doc/Doxyfile debian/Makefile src/Makefile include/Makefile include/quicktime/Makefile include/quicktime/lqt_version.h plugins/Makefile plugins/dv/Makefile plugins/faad2/Makefile plugins/faac/Makefile plugins/lame/Makefile plugins/mjpeg/Makefile plugins/audiocodec/Makefile plugins/videocodec/Makefile plugins/vorbis/Makefile plugins/png/Makefile plugins/rtjpeg/Makefile plugins/ffmpeg/Makefile plugins/x264/Makefile utils/Makefile utils/gtk/Makefile lqt-config"
-+ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.spec libquicktime.pc doc/Makefile doc/Doxyfile src/Makefile include/Makefile include/quicktime/Makefile include/quicktime/lqt_version.h plugins/Makefile plugins/dv/Makefile plugins/faad2/Makefile plugins/faac/Makefile plugins/lame/Makefile plugins/mjpeg/Makefile plugins/audiocodec/Makefile plugins/videocodec/Makefile plugins/vorbis/Makefile plugins/png/Makefile plugins/rtjpeg/Makefile plugins/ffmpeg/Makefile plugins/x264/Makefile utils/Makefile utils/gtk/Makefile lqt-config"
+-ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.pc doc/Makefile doc/Doxyfile debian/Makefile src/Makefile include/Makefile include/quicktime/Makefile include/quicktime/lqt_version.h plugins/Makefile plugins/dv/Makefile plugins/faad2/Makefile plugins/faac/Makefile plugins/lame/Makefile plugins/mjpeg/Makefile plugins/audiocodec/Makefile plugins/videocodec/Makefile plugins/vorbis/Makefile plugins/png/Makefile plugins/rtjpeg/Makefile plugins/ffmpeg/Makefile plugins/x264/Makefile utils/Makefile utils/gtk/Makefile lqt-config"
++ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.pc doc/Makefile doc/Doxyfile src/Makefile include/Makefile include/quicktime/Makefile include/quicktime/lqt_version.h plugins/Makefile plugins/dv/Makefile plugins/faad2/Makefile plugins/faac/Makefile plugins/lame/Makefile plugins/mjpeg/Makefile plugins/audiocodec/Makefile plugins/videocodec/Makefile plugins/vorbis/Makefile plugins/png/Makefile plugins/rtjpeg/Makefile plugins/ffmpeg/Makefile plugins/x264/Makefile utils/Makefile utils/gtk/Makefile lqt-config"
ac_config_commands="$ac_config_commands default"
-@@ -30365,7 +30365,6 @@
+@@ -30364,7 +30364,6 @@
"libquicktime.pc") CONFIG_FILES="$CONFIG_FILES libquicktime.pc" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
@@ -55,8 +45,8 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/quicktime/Makefile") CONFIG_FILES="$CONFIG_FILES include/quicktime/Makefile" ;;
---- libquicktime.orig/ltmain.sh
-+++ libquicktime/ltmain.sh
+--- libquicktime-1.1.1.orig/ltmain.sh
++++ libquicktime-1.1.1/ltmain.sh
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -66,8 +56,18 @@
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
---- libquicktime.orig/src/Makefile.in
-+++ libquicktime/src/Makefile.in
+--- libquicktime-1.1.1.orig/Makefile.in
++++ libquicktime-1.1.1/Makefile.in
+@@ -291,7 +291,6 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = lqt.m4
+ DIST_SUBDIRS = \
+-debian \
+ doc \
+ src \
+ include \
+--- libquicktime-1.1.1.orig/src/Makefile.in
++++ libquicktime-1.1.1/src/Makefile.in
@@ -305,7 +305,7 @@
# Maybe we need zlib to read compressed quicktime headers
#
Modified: experimental/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/rules?rev=1613&op=diff
==============================================================================
--- experimental/libquicktime/debian/rules (original)
+++ experimental/libquicktime/debian/rules Mon Feb 16 13:19:47 2009
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//; s/\+debian//')
# Autodetection of headers (taken from the ffmpeg-debian package)
define cond_with
More information about the pkg-multimedia-commits
mailing list