r69 - unstable/mkvtoolnix/debian unstable/mkvtoolnix/debian/patches
videolan
zorglub at alioth.debian.org
zorglub at alioth.debian.org
Wed Mar 14 14:19:39 CET 2007
Author: zorglub
Date: 2006-08-17 05:42:45 +0000 (Thu, 17 Aug 2006)
New Revision: 69
Added:
unstable/mkvtoolnix/debian/patches/10-look-for-help.diff
unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
unstable/mkvtoolnix/debian/patches/series
Removed:
unstable/mkvtoolnix/debian/patches/00list
unstable/mkvtoolnix/debian/patches/00template
unstable/mkvtoolnix/debian/patches/10-look-for-help.dpatch
unstable/mkvtoolnix/debian/patches/10-make-distclean.dpatch
videolan/mkvtoolnix/
Modified:
unstable/mkvtoolnix/debian/changelog
unstable/mkvtoolnix/debian/control
unstable/mkvtoolnix/debian/rules
Log:
* Remove useless stuff in branch
* Start switching to Quilt
Modified: unstable/mkvtoolnix/debian/changelog
===================================================================
--- unstable/mkvtoolnix/debian/changelog 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/changelog 2006-08-17 05:42:45 UTC (rev 69)
@@ -1,3 +1,9 @@
+mkvtoolnix (1.7.0-2) UNRELEASED; urgency=low
+
+ * Switch to Quilt for patch management
+
+ -- Clément Stenac <zorglub at debian.org> Sat, 29 Apr 2006 12:28:27 +0200
+
mkvtoolnix (1.7.0-1) unstable; urgency=low
* New upstream release
Modified: unstable/mkvtoolnix/debian/control
===================================================================
--- unstable/mkvtoolnix/debian/control 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/control 2006-08-17 05:42:45 UTC (rev 69)
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
-Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev|libwxgtk2.4-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), dpatch, libmagic-dev
+Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev|libwxgtk2.4-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev
Standards-Version: 3.6.2
Package: mkvtoolnix
Deleted: unstable/mkvtoolnix/debian/patches/00list
===================================================================
--- unstable/mkvtoolnix/debian/patches/00list 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/00list 2006-08-17 05:42:45 UTC (rev 69)
@@ -1 +0,0 @@
-10-manpage-error
Deleted: unstable/mkvtoolnix/debian/patches/00template
===================================================================
--- unstable/mkvtoolnix/debian/patches/00template 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/00template 2006-08-17 05:42:45 UTC (rev 69)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# Dpatch template
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
Copied: unstable/mkvtoolnix/debian/patches/10-look-for-help.diff (from rev 68, unstable/mkvtoolnix/debian/patches/10-look-for-help.dpatch)
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-look-for-help.dpatch 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/10-look-for-help.diff 2006-08-17 05:42:45 UTC (rev 69)
@@ -0,0 +1,69 @@
+--- mkvtoolnix.orig/Makefile.in (revision 3064)
++++ mkvtoolnix.orig/Makefile.in (revision 3065)
+@@ -87,7 +87,8 @@ LDFLAGS = @LDFLAGS@
+
+ CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
+ CXXFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\"
++CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\" \
++ -DMTX_PKG_DATA_DIR=\"$(pkgdatadir)\"
+
+ # Which additional stuff to compile
+ USE_WXWINDOWS = @USE_WXWINDOWS@
+@@ -136,7 +137,7 @@ HTMLHELPBOOKS = mkvmerge-gui-book
+
+ all: $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
+
+-install: install-programs install-mans install-trans
++install: install-programs install-mans install-trans install-guide
+
+ install-programs: $(APPLICATIONS)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+@@ -152,18 +153,29 @@ install-programs: $(APPLICATIONS)
+
+ install-mans:
+ $(mkinstalldirs) $(DESTDIR)$(man1dir)
+- for i in $(MANPAGES); do \
++ @for i in $(MANPAGES); do \
+ inst=`echo $$i | sed -e 's/^.*\///'`; \
+ echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst; \
+ done
+
+ install-trans:
+- for i in $(TRANSLATIONS); do \
+- echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
+- $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
+- echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
+- $(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
++ @for i in $(TRANSLATIONS); do \
++ echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
++ $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
++ echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
++ $(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
++ done
++
++install-guide:
++ $(mkinstalldirs) $(pkgdatadir)
++ @for i in doc/mkvmerge-gui.*; do \
++ echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
++ $(INSTALL_DATA) $$i $(pkgdatadir)/; \
++ done
++ @for i in doc/images/*gif; do \
++ echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
++ $(INSTALL_DATA) $$i $(pkgdatadir)/; \
+ done
+
+ SYSTEM_INCLUDES = $(AVILIB_INCLUDES) \
+--- mkvtoolnix.orig/src/mmg/mmg.cpp (revision 3064)
++++ mkvtoolnix/src/mmg/mmg.cpp (revision 3065)
+@@ -1181,6 +1181,9 @@ mmg_dialog::on_help(wxCommandEvent &evt)
+ potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix"));
+ potential_help_paths.push_back(wxT("/usr/local/share/doc/packages/mkvtoolnix"));
+ potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix-" VERSION));
++ // New location
++ potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR));
++ potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR "-" VERSION));
+ #endif
+ if (cfg->Read(wxT("help_path"), &help_path))
+ potential_help_paths.push_back(help_path);
Deleted: unstable/mkvtoolnix/debian/patches/10-look-for-help.dpatch
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-look-for-help.dpatch 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/10-look-for-help.dpatch 2006-08-17 05:42:45 UTC (rev 69)
@@ -1,77 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Patch to look for help everywhere
-
-
-. debian/patches/00template
-
- at DPATCH@
---- mkvtoolnix.orig/Makefile.in (revision 3064)
-+++ mkvtoolnix.orig/Makefile.in (revision 3065)
-@@ -87,7 +87,8 @@ LDFLAGS = @LDFLAGS@
-
- CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
- CXXFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\"
-+CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\" \
-+ -DMTX_PKG_DATA_DIR=\"$(pkgdatadir)\"
-
- # Which additional stuff to compile
- USE_WXWINDOWS = @USE_WXWINDOWS@
-@@ -136,7 +137,7 @@ HTMLHELPBOOKS = mkvmerge-gui-book
-
- all: $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
-
--install: install-programs install-mans install-trans
-+install: install-programs install-mans install-trans install-guide
-
- install-programs: $(APPLICATIONS)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -152,18 +153,29 @@ install-programs: $(APPLICATIONS)
-
- install-mans:
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-- for i in $(MANPAGES); do \
-+ @for i in $(MANPAGES); do \
- inst=`echo $$i | sed -e 's/^.*\///'`; \
- echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst; \
- done
-
- install-trans:
-- for i in $(TRANSLATIONS); do \
-- echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
-- $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
-- echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
-- $(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
-+ @for i in $(TRANSLATIONS); do \
-+ echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
-+ $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
-+ echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
-+ $(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
-+ done
-+
-+install-guide:
-+ $(mkinstalldirs) $(pkgdatadir)
-+ @for i in doc/mkvmerge-gui.*; do \
-+ echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
-+ $(INSTALL_DATA) $$i $(pkgdatadir)/; \
-+ done
-+ @for i in doc/images/*gif; do \
-+ echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
-+ $(INSTALL_DATA) $$i $(pkgdatadir)/; \
- done
-
- SYSTEM_INCLUDES = $(AVILIB_INCLUDES) \
---- mkvtoolnix.orig/src/mmg/mmg.cpp (revision 3064)
-+++ mkvtoolnix/src/mmg/mmg.cpp (revision 3065)
-@@ -1181,6 +1181,9 @@ mmg_dialog::on_help(wxCommandEvent &evt)
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/packages/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix-" VERSION));
-+ // New location
-+ potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR));
-+ potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR "-" VERSION));
- #endif
- if (cfg->Read(wxT("help_path"), &help_path))
- potential_help_paths.push_back(help_path);
Deleted: unstable/mkvtoolnix/debian/patches/10-make-distclean.dpatch
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-make-distclean.dpatch 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/10-make-distclean.dpatch 2006-08-17 05:42:45 UTC (rev 69)
@@ -1,23 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Patch for a formatting problem in the manpage
-
-
-. debian/patches/00template
-
- at DPATCH@
---- mkvtoolnix.orig/Makefile.in (revision 3065)
-+++ mkvtoolnix/Makefile.in (working copy)
-@@ -246,8 +246,10 @@ clean:
- */*.exe */*/*.exe */*/*.dll */*/*.dll.a doc/*.hhk
-
- distclean dist-clean: clean
-- rm -f configure config.h config.h.in config.log config.cache \
-- Makefile */Makefile */*/Makefile
-+ rm -f config.h config.log config.cache Makefile */Makefile */*/Makefile
-+
-+maintainer-clean: distclean
-+ rm -f configure config.h.in
-
- depend:
- @echo Calculating dependecies:
Copied: unstable/mkvtoolnix/debian/patches/10-manpage-error.diff (from rev 68, unstable/mkvtoolnix/debian/patches/10-make-distclean.dpatch)
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-make-distclean.dpatch 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/10-manpage-error.diff 2006-08-17 05:42:45 UTC (rev 69)
@@ -0,0 +1,15 @@
+--- mkvtoolnix.orig/Makefile.in (revision 3065)
++++ mkvtoolnix/Makefile.in (working copy)
+@@ -246,8 +246,10 @@ clean:
+ */*.exe */*/*.exe */*/*.dll */*/*.dll.a doc/*.hhk
+
+ distclean dist-clean: clean
+- rm -f configure config.h config.h.in config.log config.cache \
+- Makefile */Makefile */*/Makefile
++ rm -f config.h config.log config.cache Makefile */Makefile */*/Makefile
++
++maintainer-clean: distclean
++ rm -f configure config.h.in
+
+ depend:
+ @echo Calculating dependecies:
Copied: unstable/mkvtoolnix/debian/patches/series (from rev 68, unstable/mkvtoolnix/debian/patches/00list)
===================================================================
--- unstable/mkvtoolnix/debian/patches/00list 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/patches/series 2006-08-17 05:42:45 UTC (rev 69)
@@ -0,0 +1 @@
+10-manpage-error.diff
Modified: unstable/mkvtoolnix/debian/rules
===================================================================
--- unstable/mkvtoolnix/debian/rules 2006-08-13 22:03:24 UTC (rev 68)
+++ unstable/mkvtoolnix/debian/rules 2006-08-17 05:42:45 UTC (rev 69)
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
# Rules for mkvtoolnix based on Joey Hess's sample
-include /usr/share/dpatch/dpatch.make
-
####################################################################
# Build flags
####################################################################
@@ -17,23 +15,24 @@
CFLAGS += -O2
endif
-CONFIG_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+CONFIG_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
#######################################################################
# BUILD : Two versions: without and with GUI.
# This impacts mmg which only exists in -GUI
# For mkvinfo, we use an alternative
-#######################################################################
-build: patch build-stamp
+#######################################################################
+build: build-stamp
-build-stamp:
+build-stamp:
dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
CFLAGS="$(CFLAGS)" ./configure $(CONFIG_FLAGS) --enable-gui
$(MAKE)
mv src/mkvinfo src/mkvinfo-gui
mv src/mmg/mmg src/mmg/mmg-gui
-
+
$(MAKE) distclean
CFLAGS="$(CFLAGS)" ./configure $(CONFIG_FLAGS) --disable-gui
@@ -44,7 +43,7 @@
########################################################################
# Other rules
########################################################################
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -62,6 +61,7 @@
rm -f config.log
rm -f config.status
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
install: build
More information about the Pkg-multimedia-commits
mailing list