[Pkg-cli-apps-commits] [gnome-subtitles] 02/02: Imported Debian patch 1.3-1

Jo Shields directhex at moszumanska.debian.org
Wed Nov 11 12:50:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/1.3-1
in repository gnome-subtitles.

commit 96fb4a10868c0e8d206cbbbcbf007d3484994809
Merge: a47e908 17cc65e
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Wed Apr 3 13:55:35 2013 -0400

    Imported Debian patch 1.3-1

 AUTHORS                                            |   16 +-
 ChangeLog                                          | 4304 +++++++++++---------
 Makefile.in                                        |  106 +-
 NEWS                                               |   51 +-
 README                                             |   20 +-
 aclocal.m4                                         |  111 +-
 config.guess                                       |  219 +-
 config.sub                                         |  156 +-
 configure                                          | 3740 +++++++++++------
 configure.ac                                       |   12 +-
 data/Makefile.am                                   |    2 +-
 data/Makefile.in                                   |  110 +-
 data/gnome-subtitles.1                             |    7 +-
 data/gnome-subtitles.desktop                       |    2 +-
 data/gnome-subtitles.png                           |  Bin 1590 -> 0 bytes
 data/gnome-subtitles.svg                           |  237 ++
 debian/changelog                                   |   11 +-
 debian/control                                     |    7 +-
 gnome-doc-utils.make                               |   89 +-
 gnome-subtitles.mdp                                |   17 +-
 help/Makefile.in                                   |  140 +-
 help/el/el.po                                      |  800 +++-
 help/el/gnome-subtitles.xml                        |    2 +-
 help/es/es.po                                      |  203 +-
 help/es/gnome-subtitles.xml                        |    2 +-
 ltmain.sh                                          | 4016 +++++++++++-------
 m4/gnome-doc-utils.m4                              |    5 +
 m4/gtk-doc.m4                                      |    6 +
 m4/intltool.m4                                     |   73 +-
 m4/libtool.m4                                      | 2236 ++++++----
 m4/ltoptions.m4                                    |   32 +-
 m4/ltversion.m4                                    |   12 +-
 m4/lt~obsolete.m4                                  |   12 +-
 po/LINGUAS                                         |    2 +
 po/Makefile.in.in                                  |   13 +-
 po/cs.po                                           |  799 ++--
 po/da.po                                           |  173 +-
 po/el.po                                           | 1416 +++++--
 po/es.po                                           |  811 ++--
 po/fr.po                                           |  909 +++--
 po/gl.po                                           |  976 +++--
 po/he.po                                           |  952 +++--
 po/hu.po                                           |  920 +++--
 po/pl.po                                           | 1020 +++--
 po/pt_BR.po                                        |  976 ++---
 po/sl.po                                           |  780 ++--
 po/sr.po                                           |  971 +++--
 po/sr at latin.po                                     |  969 +++--
 po/{cs.po => zh_HK.po}                             |  801 ++--
 po/{cs.po => zh_TW.po}                             |  806 ++--
 src/External/GStreamerPlaybin/main.c               |  141 +-
 src/Glade/AboutDialog.glade                        |   30 +-
 src/Glade/PreferencesDialog.glade                  |  191 +-
 src/GnomeSubtitles/Core/Document.cs                |    2 +-
 src/GnomeSubtitles/Core/EventHandlers.cs           |    8 +-
 src/GnomeSubtitles/Core/Util.cs                    |   20 +-
 src/GnomeSubtitles/Execution/AssemblyInfo.cs       |    2 +-
 .../Execution}/gnome-subtitles.exe.config          |    0
 .../Ui/Edit/SubtitleEditTextViewMargin.cs          |    2 +-
 src/GnomeSubtitles/Ui/MainUi.cs                    |    2 +-
 src/GnomeSubtitles/Ui/View/Subtitles.cs            |    4 +-
 src/Makefile.am                                    |    9 +-
 src/Makefile.in                                    |  101 +-
 src/SubLib/Core/Domain/SubtitleCollection.cs       |   35 +-
 src/SubLib/Core/Translations.cs                    |   12 +-
 src/SubLib/IO/Input/SubtitleParser.cs              |    7 +-
 src/SubLib/IO/Output/SubtitleOutput.cs             |   10 +-
 .../IO/SubtitleFormats/SubtitleFormatAQTitle.cs    |    7 +-
 .../SubtitleFormatAdobeEncoreDVD.cs                |    1 +
 .../SubtitleFormatAdvancedSubStationAlpha.cs       |    3 +-
 .../SubtitleFormatKaraokeLyricsLRC.cs              |    9 +-
 .../SubtitleFormatKaraokeLyricsVKT.cs              |    3 +-
 .../IO/SubtitleFormats/SubtitleFormatMPSub.cs      |    5 +-
 .../IO/SubtitleFormats/SubtitleFormatMacSUB.cs     |   11 +-
 .../IO/SubtitleFormats/SubtitleFormatPanimator.cs  |    8 +-
 .../SubtitleFormatPhoenixJapanimationSociety.cs    |    7 +-
 .../IO/SubtitleFormats/SubtitleFormatSofni.cs      |    8 +-
 .../SubtitleFormats/SubtitleFormatSubCreator1x.cs  |    8 +-
 .../SubtitleFormatViPlaySubtitleFile.cs            |   10 +-
 79 files changed, 18556 insertions(+), 12150 deletions(-)

diff --cc debian/changelog
index cb5f677,0000000..49b0044
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,224 -1,0 +1,231 @@@
++gnome-subtitles (1.3-1) experimental; urgency=low
++
++  * New upstream release.
++
++ -- Tiago Bortoletto Vaz <tiago at debian.org>  Wed, 03 Apr 2013 13:55:35 -0400
++
 +gnome-subtitles (1.2-4) unstable; urgency=low
 +
-   * No-change rebuild for CLR 4.5 transition
++  * Depends on gstreamer0.10-x. It's needed to run videos with the embedded
++    player. Thanks to phileom and Philippe Marty. (Closes: #663683)
 +
-  -- Jo Shields <directhex at apebox.org>  Wed, 09 Sep 2015 15:00:51 +0100
++ -- Tiago Bortoletto Vaz <tiago at debian.org>  Sun, 15 Apr 2012 00:38:28 -0400
 +
 +gnome-subtitles (1.2-3) unstable; urgency=low
 +
 +  * Depends on libmono-i18n4.0-all instead of libmono-i18n4.0-cil to have all
 +    encodings available on system. Thanks to phileom and mc. (Closes: #660336)
 +  * Update package long description as the upstream asked for :)
 +  * Fix typo in package short description.
 +
 + -- Tiago Bortoletto Vaz <tiago at debian.org>  Sun, 11 Mar 2012 23:07:03 -0400
 +
 +gnome-subtitles (1.2-2) unstable; urgency=low
 +
 +  [ Chow Loong Jin ]
 +  * Team upload.
 +  * [2054da2] No-change Standards-Version bump (3.9.1 -> 3.9.2)
 +  * [89ea36e] Bump compat level and use override_* dh(1) syntax
 +  * [09e6261] Make dh_makeshlibs exclude /usr/lib/gnome-subtitles
 +
 +  [ Jo Shields ]
 +  * [3cb75c6] Update debian/rules for DH8-compatible "--with cli"
 +  * [9d500fd] Manual dependency on libmono-i18n4.0-cil not 2.0.
 +
 + -- Iain Lane <laney at debian.org>  Wed, 18 Jan 2012 14:24:29 +0800
 +
 +gnome-subtitles (1.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Tiago Bortoletto Vaz <tiago at debian.org>  Tue, 23 Aug 2011 22:24:17 -0300
 +
 +gnome-subtitles (1.1-2.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Don't ship .la files (Closes: #621259).
 +
 + -- Luk Claes <luk at debian.org>  Mon, 04 Jul 2011 07:09:54 +0200
 +
 +gnome-subtitles (1.1-2) unstable; urgency=low
 +
 +  [ Julian Taylor ]
 +  * [3bf8a9a] initial upstream branch
 +  * [e562729] Imported Upstream version 1.1
 +  * [8ca04d6] drop unnecessary dependency on libmono-dev
 +  * [7d994b7] update Vcs-* fields to point to git
 +
 + -- Jo Shields <directhex at apebox.org>  Thu, 16 Jun 2011 20:32:01 +0100
 +
 +gnome-subtitles (1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/control:
 +    + Remove quilt dependence
 +    + Update Policy version - AFAICS, no changes needed on package
 +
 + -- Tiago Bortoletto Vaz <tiago at debian.org>  Sat, 06 Nov 2010 10:22:02 -0200
 +
 +gnome-subtitles (1.0-2) unstable; urgency=low
 +
 +  * debian/control:
 +    + Add depends on gstreamer0.10-plugins-base; app fails to start when this
 +      is not present (Closes: #586986)
 +    + Add recommends on gstreamer0.10-ffmpeg — cannot import or preview videos
 +      without any codecs present
 +    + Add quilt patchsys
 +  * debian/patches/insecure_library_loading:
 +    + Add patch taken from upstream git to fix insecure library loading bug. (Closes: #598289)
 +      References: CVE-2010-3357
 +      Thanks to dai for forwarding the patch, and for Pedro Castro for developing it.
 +
 + -- Iain Lane <laney at ubuntu.com>  Wed, 13 Oct 2010 21:26:29 +0100
 +
 +gnome-subtitles (1.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Tiago Bortoletto Vaz <tiago at debian.org>  Sun, 21 Feb 2010 12:54:14 -0300
 +
 +gnome-subtitles (0.9.1-2) unstable; urgency=low
 +
 +  [ Tiago Bortoletto Vaz ]
 +  * debian/control:
 +    + Add my new email to Uploaders field;
 +
 +  [ Jo Shields ]
 +  * debian/control:
 +    + No-change bump to Standards 3.8.3
 +    + Use GNOME# and GTK# -dev packages
 +  * debian/control,
 +    debian/rules:
 +    + Use mono-csc from mono-devel 2.4.3 (Closes: #562277)
 +
 + -- Tiago Bortoletto Vaz <tiago at debian.org>  Wed, 28 Oct 2009 10:28:59 -0200
 +
 +gnome-subtitles (0.9.1-1) unstable; urgency=low
 +
 +  [ Tiago Bortoletto Vaz ]
 +  * New upstream release
 +  * Update Brazilian Portuguese translation. Thanks to Marco de Freitas.
 +    (Closes: #524072)
 +  * Add NEWS file explaining SubLib is back to gnome-subtitles.
 +  * debian/control:
 +    + Update Policy version to 3.8.2;
 +    + Add Dm-Upload-Allowed field;
 +    + Add intltool as dependency;
 +    + Remove sublib as dependency;
 +  * Remove old debian patches
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Mon, 20 Jul 2009 18:56:49 -0300
 +
 +gnome-subtitles (0.8-3) unstable; urgency=low
 +
 +  * debian/control: libgnome2.0-cil -> libgnome2.24-cil for GNOME# transition.
 +
 + -- Iain Lane <laney at ubuntu.com>  Sat, 18 Apr 2009 15:43:05 +0100
 +
 +gnome-subtitles (0.8-2) unstable; urgency=low
 +
 +  * Upload to unstable.
 +  * debian/control:
 +    + Added libenchant-dev and libgtkspell-dev to build-deps as dh_clideps
 +      needs the shlibs for those libraries.
 +
 + -- Mirco Bauer <meebey at debian.org>  Sun, 08 Mar 2009 13:38:45 +0100
 +
 +gnome-subtitles (0.8-1) experimental; urgency=low
 +
 +  [ Jo Shields ]
 +  * debian/control:
 +    + Fix missing comma
 +  * debian/control,
 +    debian/rules:
 +    + Change compiler and build-deps for Mono 2.0 transition
 +
 +  [ Tiago Bortoletto Vaz ]
 +  * New upstream release (Closes: #480907)
 +  * debian/control:
 +    + now getting real dependencies automatically via dh_clideps;
 +      (Closes: #483361)
 +    + added cli-common-dev as build-dependency;
 +    + added libmono-i18n2.0-cil to dependencies in order to avoid problems
 +      opening some Windows(tm) enconded files;
 +    + added Homepage, Vcs-Svn and Vcs-Browser flags;
 +    + removed some uneeded build-dependencies;
 +    + Standards version updated to 3.8.0;
 +    + updating mono-2.0-devel package name in build-depends;
 +  * debian/rules
 +    + using cli helpers in order to fix perms and getting dependencies
 +      automagically;
 +    + Removed useless dpatch stuff;
 +  * debian/patches/01_fix_sublib_linking.dpatch:
 +    + removing MONO_PATH hack and using sublib from app dir;
 +
 +  [ Mirco Bauer ]
 +  * debian/control:
 +    + Updated debhelper build-dependency to >= 7.
 +    + Added myself to Uploaders.
 +  * debian/rules:
 +    + Include /usr/share/cli-common/cli.make
 +    + Migrated to debhelper v7 minimalistic style.
 +  * debian/docs:
 +    + Converted some debian/rules calls to debhelper files.
 +  * debian/compat:
 +    + Bumped to 7
 +  * debian/watch:
 +    + Added
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Wed, 10 Dec 2008 09:02:42 -0300
 +
 +gnome-subtitles (0.7.2-1) unstable; urgency=low
 +
 +  * New upstream release. (Closes: #458448) 
 +  * Dpatch removed since upstream fixed the issues.
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Sat, 15 Mar 2008 11:03:53 -0300
 +
 +gnome-subtitles (0.7-2.1) unstable; urgency=low
 +
 +  * Non-maintainer upload to fix FTFBS bug.
 +  * Add missing build-depends on libmono2.0-cil (Closes: #458665). 
 +
 + -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 13 Jan 2008 16:59:36 +0100
 +
 +gnome-subtitles (0.7-2) unstable; urgency=low
 +
 +  * Set MONO_SHARED_DIR=$(CURDIR) to avoid writing in ~/.wapi. Thanks to Kurt
 +    Roeckx.  (Closes: #454973)
 +  * Add configure --disable-scrollkeeper flag. It's needed to avoid writing in
 +    /var/log/scrollkeeper.log during the build.
 +  * Remove mplayer as Suggests since 0.7 uses gstreamer instead.
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Wed, 12 Dec 2007 09:55:43 -0300
 +
 +gnome-subtitles (0.7-1) unstable; urgency=low
 +
 +  * New upstream release;
 +  * Add libxml-parser-perl to Build-Depends-Indep. Thanks to Lucas Nussbaum.
 +    (Closes: #445799);
 +  * Fixes manpage issue with dpatch
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Mon, 03 Dec 2007 20:52:52 -0300
 +
 +gnome-subtitles (0.6-3) unstable; urgency=low
 +
 +  * Add gnome-doc-utils to Build-Depends-Indep. Thanks to Michael Ablassmeier. 
 +    (Closes: #436363)
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Wed, 26 Sep 2007 19:00:36 -0300
 +
 +gnome-subtitles (0.6-2) unstable; urgency=low
 +
 +  * Depends on gnome-sharp2. Thanks to Mathias Brodala. (Closes: #435269)
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Sat, 04 Aug 2007 03:09:02 -0300
 +
 +gnome-subtitles (0.6-1) unstable; urgency=low
 +
 +  * Initial Release. (Closes: #386447)
 +
 + -- Tiago Bortoletto Vaz <tiago at debian-ba.org>  Sun, 08 Jul 2007 23:12:37 -0300
diff --cc debian/control
index 0ec54f2,0000000..b976263
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,40 -1,0 +1,39 @@@
 +Source: gnome-subtitles
 +Section: gnome
 +Priority: extra
 +Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 +Uploaders: Tiago Bortoletto Vaz <tiago at debian.org>, Mirco Bauer <meebey at debian.org>
 +Build-Depends: cli-common-dev (>= 0.5.7),
 + debhelper (>= 8),
 + autotools-dev,
 + mono-devel (>= 2.4.3),
 + libgtk2.0-dev,
 + libgtk2.0-cil-dev,
 + libglade2.0-cil-dev,
 + libgconf2.0-cil-dev,
 + libgnome2.0-cil-dev,
-  libgstreamer0.10-dev,
-  libgstreamer-plugins-base0.10-dev,
++ libgstreamer1.0-dev,
++ libgstreamer-plugins-base1.0-dev,
 + libenchant-dev,
 + libgtkspell-dev,
 + libxml-parser-perl,
 + scrollkeeper,
 + gnome-doc-utils (>= 0.3.2),
 + intltool (>= 0.35.0)
 +Standards-Version: 3.9.2
 +Dm-Upload-Allowed: yes
 +Homepage: http://gnome-subtitles.sourceforge.net
 +Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/gnome-subtitles.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/gnome-subtitles.git
 +
 +Package: gnome-subtitles
 +Architecture: any
- Depends: ${cli:Depends}, ${misc:Depends}, ${shlibs:Depends}, libmono-i18n4.0-all, gstreamer0.10-plugins-base
- Recommends: gstreamer0.10-ffmpeg
++Depends: ${cli:Depends}, ${misc:Depends}, ${shlibs:Depends}, libmono-i18n4.0-all, gstreamer1.0-plugins-base, gstreamer1.0-x
 +Description: Subtitle editor for the GNOME Desktop environment
 + Gnome Subtitles is a subtitle editor for the GNOME desktop.
 + .
 + It supports the most common text-based subtitle formats, video
 + previewing, timings synchronization and subtitle translation.
 + .
 + Some supported subtitle formats are: Advanced Sub Station Alpha, FAB
 + Subtitler, MicroDVD, MPlayer 1/2, MPSub, SubRip, SubViewer 1/2.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-subtitles.git



More information about the Pkg-cli-apps-commits mailing list