diff -u subtitleeditor-0.20.0/debian/control subtitleeditor-0.20.0/debian/control --- subtitleeditor-0.20.0/debian/control +++ subtitleeditor-0.20.0/debian/control @@ -3,10 +3,8 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Anibal Avelar -Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, libgstreamer-plugins-base0.10-dev, x11proto-fixes-dev, libpcre3-dev, libenchant-dev, iso-codes, gstreamer0.10-tools, gstreamer0.10-plugins-good, libxml++2.6-dev +Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, libgstreamer-plugins-base0.10-dev, x11proto-fixes-dev, libpcre3-dev(>= 7.6-2), libenchant-dev, iso-codes, gstreamer0.10-tools, gstreamer0.10-plugins-good, libxml++2.6-dev Homepage: http://home.gna.org/subtitleeditor/ -Vcs-Browser: http://svn.gna.org/viewcvs/subtitleeditor/trunk -Vcs-Svn: svn://svn.gna.org/svn/subtitleeditor/trunk Standards-Version: 3.7.3 Package: subtitleeditor @@ -22,4 +20,25 @@ . - This software is in alpha state and some features, like embeded video playing, - do not work yet. + This package has this features + . + o Multiple document interface + o Internationalization support + o Video player integrated in the main window (based on GStreamer) + o Can play preview with external video player (using MPlayer or other) + o Style Editor + o Move subtitle + o Scale + o Split and joint subtitle + o Edit text and adjust time (start, end) + . + Supported formats: + . + o Sub Station Alpha + o Advanced Sub Station Alpha + o SubRip + o MicroDVD + o MPL2 + o MPsub (MPlayer subtitle) + o SubViewer 2.0 + o Plain-Text + o Adobe Encore DVD . diff -u subtitleeditor-0.20.0/debian/rules subtitleeditor-0.20.0/debian/rules --- subtitleeditor-0.20.0/debian/rules +++ subtitleeditor-0.20.0/debian/rules @@ -9,6 +9,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -31,7 +33,7 @@ --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \ --enable-aspell LDFLAGS="-Wl,-z,defs" -build: build-stamp +build: patch build-stamp build-stamp: config.status dh_testdir @@ -40,9 +42,7 @@ #docbook-to-man debian/subtitleeditor.sgml > subtitleeditor.1 touch $@ -clean: clean1 - -clean1: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp po/es.gmo @@ -97 +97 @@ -.PHONY: build clean binary-indep binary-arch binary install clean1 +.PHONY: build clean binary-indep binary-arch binary install diff -u subtitleeditor-0.20.0/debian/changelog subtitleeditor-0.20.0/debian/changelog --- subtitleeditor-0.20.0/debian/changelog +++ subtitleeditor-0.20.0/debian/changelog @@ -1,3 +1,38 @@ +subtitleeditor (0.20.0-3ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #231286), remaining Ubuntu changes: + + debian/*.desktop: + - fixed desktop file to show up in gnomes app menu. (LP: #195933) + + Modify Maintainer value to match the DebianMaintainerField specification. + + -- Miguel Ruiz Sat, 17 May 2008 00:28:46 -0400 + +subtitleeditor (0.20.0-3) unstable; urgency=medium + + * Fixed the FTBFS: Document.cc:267: error: 'auto_ptr' is not a member of + 'std'. Added the patch called debian/patches/gcc43.dpatch. + Thank you Chris Lamb + (Closes: #474872) + * Added the dependency with the dpatch package in debian/control file + due to the same reason described above. + * Modified the debian/rule script to apply the patch. + + -- Anibal Avelar Tue, 08 Apr 2008 11:15:50 +0200 + +subtitleeditor (0.20.0-2) unstable; urgency=low + + * Fixed the bug: subtitleeditor doesn`t start (Closes: #464704) + * Fixed in debian/control file a the minimal requirement for the package + libpcre3-dev to avoid problems with undefined symbols related with + the bug above described. + * Removed the fields Vcs-Browser and Vcs-Svn in the debian/control file + due to the fields to point to upstream source instead the debian + package (Closes: #471447) + * Cleaned the package description with more information about the + program. + + -- Anibal Avelar Thu, 27 Mar 2008 00:15:50 +0200 + subtitleeditor (0.20.0-1ubuntu1) hardy; urgency=low * debian/*.desktop: only in patch2: unchanged: --- subtitleeditor-0.20.0.orig/debian/patches/474872.diff.txt +++ subtitleeditor-0.20.0/debian/patches/474872.diff.txt @@ -0,0 +1,47 @@ +diff -urNad subtitleeditor-0.20.0.orig/src/actions/StyleEditor.h subtitleeditor-0.20.0/src/actions/StyleEditor.h +--- subtitleeditor-0.20.0.orig/src/actions/StyleEditor.h 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/actions/StyleEditor.h 2008-04-08 23:46:54.000000000 +0100 +@@ -48,7 +48,7 @@ + void callback_spin_value_changed(Gtk::SpinButton *w, const Glib::ustring &key); + void callback_color_button(Gtk::ColorButton* w, const Glib::ustring &key); + void callback_radio_toggled(Gtk::RadioButton* w, const Glib::ustring &key); +- void callback_alignment_changed(Gtk::RadioButton* w, unsigned int w); ++ void callback_alignment_changed(Gtk::RadioButton* w, unsigned int i); + void callback_style_selection_changed(); + protected: + Document* m_current_document; +diff -urNad subtitleeditor-0.20.0.orig/src/Document.cc subtitleeditor-0.20.0/src/Document.cc +--- subtitleeditor-0.20.0.orig/src/Document.cc 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/Document.cc 2008-04-08 23:39:44.000000000 +0100 +@@ -29,6 +29,7 @@ + #include "SubtitleSystem.h" + + #include ++#include + + /* + * constructeur +diff -urNad subtitleeditor-0.20.0.orig/src/gui/GStreamerPlayer.cc subtitleeditor-0.20.0/src/gui/GStreamerPlayer.cc +--- subtitleeditor-0.20.0.orig/src/gui/GStreamerPlayer.cc 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/gui/GStreamerPlayer.cc 2008-04-08 23:42:12.000000000 +0100 +@@ -27,6 +27,7 @@ + #include "Config.h" + #include "SubtitleTime.h" + #include ++#include + #include + + /* +diff -urNad subtitleeditor-0.20.0.orig/src/gui/WaveformGeneratorUI.cc subtitleeditor-0.20.0/src/gui/WaveformGeneratorUI.cc +--- subtitleeditor-0.20.0.orig/src/gui/WaveformGeneratorUI.cc 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/gui/WaveformGeneratorUI.cc 2008-04-08 23:41:21.000000000 +0100 +@@ -26,6 +26,9 @@ + #include "utility.h" + #include "Config.h" + ++#include ++#include ++ + // old method 8.05 + // new method ? + only in patch2: unchanged: --- subtitleeditor-0.20.0.orig/debian/patches/gcc43.dpatch +++ subtitleeditor-0.20.0/debian/patches/gcc43.dpatch @@ -0,0 +1,69 @@ +#! /bin/sh -e +## gcc43.dpatch by Anibal Avelar +## +## DP: apply patch to fix the FTBFS: Document.cc:267: error: 'auto_ptr' is not a member of 'std' + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +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 argum +ent" + exit 1;; +esac + +exit 0 +diff -urNad subtitleeditor-0.20.0.orig/src/actions/StyleEditor.h subtitleeditor-0.20.0/src/actions/StyleEditor.h +--- subtitleeditor-0.20.0.orig/src/actions/StyleEditor.h 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/actions/StyleEditor.h 2008-04-08 23:46:54.000000000 +0100 +@@ -48,7 +48,7 @@ + void callback_spin_value_changed(Gtk::SpinButton *w, const Glib::ustring &key); + void callback_color_button(Gtk::ColorButton* w, const Glib::ustring &key); + void callback_radio_toggled(Gtk::RadioButton* w, const Glib::ustring &key); +- void callback_alignment_changed(Gtk::RadioButton* w, unsigned int w); ++ void callback_alignment_changed(Gtk::RadioButton* w, unsigned int i); + void callback_style_selection_changed(); + protected: + Document* m_current_document; +diff -urNad subtitleeditor-0.20.0.orig/src/Document.cc subtitleeditor-0.20.0/src/Document.cc +--- subtitleeditor-0.20.0.orig/src/Document.cc 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/Document.cc 2008-04-08 23:39:44.000000000 +0100 +@@ -29,6 +29,7 @@ + #include "SubtitleSystem.h" + + #include ++#include + + /* + * constructeur +diff -urNad subtitleeditor-0.20.0.orig/src/gui/GStreamerPlayer.cc subtitleeditor-0.20.0/src/gui/GStreamerPlayer.cc +--- subtitleeditor-0.20.0.orig/src/gui/GStreamerPlayer.cc 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/gui/GStreamerPlayer.cc 2008-04-08 23:42:12.000000000 +0100 +@@ -27,6 +27,7 @@ + #include "Config.h" + #include "SubtitleTime.h" + #include ++#include + #include + + /* +diff -urNad subtitleeditor-0.20.0.orig/src/gui/WaveformGeneratorUI.cc subtitleeditor-0.20.0/src/gui/WaveformGeneratorUI.cc +--- subtitleeditor-0.20.0.orig/src/gui/WaveformGeneratorUI.cc 2008-04-08 23:39:31.000000000 +0100 ++++ subtitleeditor-0.20.0/src/gui/WaveformGeneratorUI.cc 2008-04-08 23:41:21.000000000 +0100 +@@ -26,6 +26,9 @@ + #include "utility.h" + #include "Config.h" + ++#include ++#include ++ + // old method 8.05 + // new method ? + only in patch2: unchanged: --- subtitleeditor-0.20.0.orig/debian/patches/00list +++ subtitleeditor-0.20.0/debian/patches/00list @@ -0,0 +1 @@ +gcc43