diff -Nru aegisub-2.1.8/debian/aegisub-2.1.1 aegisub-2.1.8/debian/aegisub-2.1.1
--- aegisub-2.1.8/debian/aegisub-2.1.1 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub-2.1.1 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,19 @@
+.TH aegisub-2.1 1 "April 7, 2010"
+.SH "NAME"
+aegisub-2.1 \- Advance subtitle editor
+.SH "SYNOPSIS"
+.B aegisub-2.1
+.IR "files" "..."
+.SH "DESCRIPTION"
+Adcanced graphical subtitle editor aming to have full support for Advance
+Substation Alpha (.ass) file format. Also support scripting in LUA for
+automation of common or repedeteive tasks.
+.SH "AUTHOR"
+The Aegisub Project
+
+This manual page was written by Rickard Närström for Ubuntu Linux.
+.SH "SEE ALSO"
+API documentation and examples for automation scripts is avaiable in:
+.RS
+.I /usr/share/doc/aegisub/2.1
+.RE
diff -Nru aegisub-2.1.8/debian/aegisub-doc.install aegisub-2.1.8/debian/aegisub-doc.install
--- aegisub-2.1.8/debian/aegisub-doc.install 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub-doc.install 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1 @@
+usr/share/doc/aegisub/2.1/*
diff -Nru aegisub-2.1.8/debian/aegisub.install aegisub-2.1.8/debian/aegisub.install
--- aegisub-2.1.8/debian/aegisub.install 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub.install 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,4 @@
+usr/bin/aegisub-2.1
+usr/share/applications/*
+usr/share/icons/*
+debian/aegisub.xpm usr/share/pixmaps/
diff -Nru aegisub-2.1.8/debian/aegisub-l10n.install aegisub-2.1.8/debian/aegisub-l10n.install
--- aegisub-2.1.8/debian/aegisub-l10n.install 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub-l10n.install 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/*
diff -Nru aegisub-2.1.8/debian/aegisub.manpages aegisub-2.1.8/debian/aegisub.manpages
--- aegisub-2.1.8/debian/aegisub.manpages 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub.manpages 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1 @@
+debian/aegisub-2.1.1
diff -Nru aegisub-2.1.8/debian/aegisub.menu aegisub-2.1.8/debian/aegisub.menu
--- aegisub-2.1.8/debian/aegisub.menu 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub.menu 2010-04-11 15:29:16.000000000 +0100
@@ -1 +1 @@
-?package(aegisub):needs="X11" section="Applications/Video" title="Aegisub" icon="aegisub.png" command="/usr/bin/aegisub-2.1"
+?package(aegisub):needs="X11" section="Applications/Video" title="Aegisub" icon="aegisub.xpm" command="/usr/bin/aegisub-2.1"
diff -Nru aegisub-2.1.8/debian/aegisub-scripts.install aegisub-2.1.8/debian/aegisub-scripts.install
--- aegisub-2.1.8/debian/aegisub-scripts.install 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub-scripts.install 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1 @@
+/usr/share/aegisub/2.1/automation/*
diff -Nru aegisub-2.1.8/debian/aegisub.xpm aegisub-2.1.8/debian/aegisub.xpm
--- aegisub-2.1.8/debian/aegisub.xpm 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/aegisub.xpm 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,236 @@
+/* XPM */
+static char *aegisub[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 198 2",
+" c #010000",
+". c #0C0303",
+"X c #140303",
+"o c #1B0303",
+"O c #160909",
+"+ c #1A0909",
+"@ c #010513",
+"# c #030817",
+"$ c #090A14",
+"% c #010618",
+"& c #0B0C19",
+"* c #100E12",
+"= c #0D111C",
+"- c #131313",
+"; c #191212",
+": c #16171C",
+"> c #240101",
+", c #2C0404",
+"< c #230D0D",
+"1 c #2B0D0D",
+"2 c #3D0000",
+"3 c #340F0F",
+"4 c #3A0B0B",
+"5 c #3D1515",
+"6 c #3F1818",
+"7 c #010C2F",
+"8 c #0D1325",
+"9 c #1D1426",
+"0 c #010D31",
+"q c #010F3B",
+"w c #041037",
+"e c #242222",
+"r c #2C2525",
+"t c #2D2D2D",
+"y c #3F2222",
+"u c #322F2F",
+"i c #343434",
+"p c #393737",
+"a c gray24",
+"s c #440000",
+"d c #450808",
+"f c #4E0A0A",
+"g c #520202",
+"h c #560C0C",
+"j c #580808",
+"k c #421111",
+"l c #4E1515",
+"z c #421919",
+"x c #491818",
+"c c #561414",
+"v c #541E1E",
+"b c #591B1B",
+"n c #630303",
+"m c #6D0404",
+"M c #670D0D",
+"N c #730000",
+"B c #780000",
+"V c #720909",
+"C c #790909",
+"Z c #691010",
+"A c #661818",
+"S c #6A1C1C",
+"D c #741111",
+"F c #7E1E1E",
+"G c #551D2D",
+"H c #422424",
+"J c #482525",
+"K c #462929",
+"L c #522525",
+"P c #522929",
+"I c #4A3030",
+"U c #6A2222",
+"Y c #612F2F",
+"T c #6A2D2D",
+"R c #722222",
+"E c #623E3E",
+"W c #6C3F3F",
+"Q c #051440",
+"! c #0B1740",
+"~ c #02144C",
+"^ c #091B54",
+"/ c #031A66",
+"( c #031B69",
+") c #062072",
+"_ c #03207A",
+"` c #102A7E",
+"' c #444343",
+"] c #4A4646",
+"[ c #4D4A4A",
+"{ c #504E4E",
+"} c #5E4C4C",
+"| c #555353",
+" . c #6D4545",
+".. c #615A5C",
+"X. c #50566B",
+"o. c #646262",
+"O. c gray42",
+"+. c #706C6F",
+"@. c #7C7B7B",
+"#. c #840000",
+"$. c #890101",
+"%. c #890D0D",
+"&. c #930000",
+"*. c #9F0000",
+"=. c #901E1E",
+"-. c #9F1E1E",
+";. c #A30404",
+":. c #A60909",
+">. c #A90C0C",
+",. c #A41414",
+"<. c #AE1212",
+"1. c #A51818",
+"2. c #AB1B1B",
+"3. c #B11515",
+"4. c #B51C1C",
+"5. c #B81E1E",
+"6. c #842222",
+"7. c #8A2424",
+"8. c #852B2B",
+"9. c #882F2F",
+"0. c #942626",
+"q. c #902F2F",
+"w. c #9E2C2C",
+"e. c #823131",
+"r. c #9B3737",
+"t. c #AC2525",
+"y. c #A82F2F",
+"u. c #B22727",
+"i. c #BD2323",
+"p. c #B42E2E",
+"a. c #BC2C2C",
+"s. c #A73434",
+"d. c #AE3535",
+"f. c #B53232",
+"g. c #B73D3D",
+"h. c #BF3F3F",
+"j. c #C02727",
+"k. c #C42C2C",
+"l. c #CB3333",
+"z. c #C13C3C",
+"x. c #CF3838",
+"c. c #D33D3D",
+"v. c #AE4242",
+"b. c #B54242",
+"n. c #CD4545",
+"m. c #C84949",
+"M. c #D64141",
+"N. c #DB4545",
+"B. c #D34A4A",
+"V. c #DE4A4A",
+"C. c #D55151",
+"Z. c #E24E4E",
+"A. c #E65252",
+"S. c #EA5757",
+"D. c #EB5858",
+"F. c #04258F",
+"G. c #042590",
+"H. c #092D9F",
+"J. c #18379F",
+"K. c #263D88",
+"L. c #052BA4",
+"P. c #0B31AB",
+"I. c #1133A0",
+"U. c #052EB1",
+"Y. c #0531BC",
+"T. c #1438B0",
+"R. c #27449D",
+"E. c #2546B1",
+"W. c #4C5983",
+"Q. c #76798A",
+"!. c #5064A3",
+"~. c #4E68BD",
+"^. c #5F76BF",
+"/. c #0533C5",
+"(. c #0534C8",
+"). c #0537D3",
+"_. c #6D82C6",
+"`. c #808080",
+"'. c gray58",
+"]. c #96989C",
+"[. c #9B9B9B",
+"{. c #8C92A5",
+"}. c #8391BE",
+"|. c #919CBE",
+" X c gray64",
+".X c #ABABAB",
+"XX c #B4B4B4",
+"oX c gray73",
+"OX c #99A4C6",
+"+X c #A4AECD",
+"@X c #BEBFC3",
+"#X c #C2C2C2",
+"$X c #CCCCCC",
+"%X c #D4D4D4",
+"&X c gray85",
+"*X c #E4E4E4",
+"=X c #F2F2F2",
+"-X c None",
+/* pixels */
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X z z 6 6 6 6 5 6 6 5 5 5 -X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X. -X+ v.D.S.A.A.Z.Z.V.V.N.N.d.O -X. -X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X+ O -X1 S.A.A.Z.Z.N.V.N.M.M.3 -XO O -X-X-X-X-X-X-X",
+"-X-X-X-X-X-X+ C.x -XO r.Z.Z.N.Z.N.N.M.M.s.O -Xd p.O -X-X-X-X-X-X",
+"-X-X-X-X-X-Xe.D.m.+ -X+ V.V.V.N.N.M.M.c.3 -XO p.l.A -X-X-X-X-X-X",
+"-X-X-X-X-X< A.S.A.v -XO 8.N.N.M.c.c.c.y.X -Xc l.k.k.+ -X-X-X-X-X",
+"-X-X-X-XO b.A.A.Z.n.O -XO M.M.c.c.c.c., -XO a.k.k.k.=.X -X-X-X-X",
+"-X-X-X-Xv A.Z.Z.V.V.U -X-XR M.c.c.x.0.O -XS k.k.k.j.i.4 -X-X-X-X",
+"-X-X-X+ B.Z.Z.V.N.N.z.X = $ $ & 9 G + -X+ k.k.j.j.i.i.2.X -X-X-X",
+"-X-XO 9.Z.V.V.N.s.L & ! ) w @ # q ^ 8 : x t.j.i.i.5.5.4.M X -X-X",
+"-X-X1 Z.V.N.s.y r Q.L.Y.# q U.` +.r y F 4.5.4.4.3.+ -X-X",
+"-XO g.V.h.P r X=X_.Y.( F.L.+X*X X| r S 1.3.<.%.X -X",
+"-XO q.L e @.&X*X=X~./.~ _ L.}.*X&X$X.Xo.u J Z V . -X",
+"-X-X- e `.#X$X&X*X^././ F.L.|.%X$X#XXX.X[.o.i i ; -X",
+"-X-X-X-Xt | .X$X%XOXY.Y.@ 7 Y.H.@X#XoXXX.X'.O.' a i -X-X",
+"-X. U S v K p @.oX@XE.(.U.q ~ Y.U.!.oX.X X`.| I I x g g . -X",
+"-XO f.x.x.l.f.E ' @.{.T./.).).).(.U.R.].@...] E 8.:.:.:.;.$.. -X",
+"-X-X3 l.l.l.k.k.y.W [ ..W.J.P.I.K.X.| [ W 7.,.:.:.;.*.*.*.> -X-X",
+"-X-XO 7.k.l.k.k.j.j.u.T ' | [ } .Y r X C :.:.;.;.;.*.;.m . -X-X",
+"-X-X-Xo a.k.j.j.i.i.4.o -XX 1.<.<.<.o -Xo :.:.;.*.*.;.&.X -X-X-X",
+"-X-X-X-Xh j.j.j.i.5.Z -X-Xh 3.3.<.>.V . X n ;.*.*.*.*.s -X-X-X-X",
+"-X-X-X-XX -.i.5.5.2.X -XX ,.<.>.>.:.:.o -XX &.;.*.*.#.X -X-X-X-X",
+"-X-X-X-X-X, i.4.3.h -X-Xj >.:.:.:.;.;.m X -Xg *.*.*.o -X-X-X-X-X",
+"-X-X-X-X-XX D 2.1.X -XX >.>.:.:.;.;.;.;.o -X. &.*.n X -X-X-X-X-X",
+"-X-X-X-X-X-XX ,.d -X-Xn >.:.:.;.;.*.*.*.N X -X2 &.X -X-X-X-X-X-X",
+"-X-X-X-X-X-X-X, X -XO :.:.:.;.;.*.;.*.*.;.o -XX > -X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X. -XX m :.;.;.*.*.*.*.*.*.*.B X -X. -X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X s s s s s s s s s s s s -X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X"
+};
diff -Nru aegisub-2.1.8/debian/changelog aegisub-2.1.8/debian/changelog
--- aegisub-2.1.8/debian/changelog 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/changelog 2010-04-11 15:29:16.000000000 +0100
@@ -1,3 +1,36 @@
+aegisub (1:2.1.8-0ubuntu1~riccetn4~karmic) karmic; urgency=low
+
+ * Add -Wl,--as-needed to LDFLAGS
+ * Add patch to fix --as-needed problems
+ * Split into several binary packages:
+ - aegisub: main executable
+ - aegisub-doc: Automation API documentation
+ - aegisub-scripts: Automation scripts
+ - aegisub-l10n: Translations
+ * Created a manual page for aegisub-2.1
+ * Completely rewrote debian/copyright
+ * Use quilt instead of dpatch
+
+ -- Rickard Närström Sat, 10 Apr 2010 09:58:50 +0200
+
+aegisub (1:2.1.8-0ubuntu1~riccetn3) lucid; urgency=low
+
+ * Add xpm image for debian menu
+ - add debian/aegisub.xpm
+ - edit debian/aegisub.menu
+ - edit debian/rules
+ * Reformat description to reduse line length to 80 characters at max
+ - edit debain/control
+ * Copy README.source from dpath
+
+ -- Rickard Närström Wed, 24 Mar 2010 10:24:13 +0100
+
+aegisub (1:2.1.8-0ubuntu1~riccetn2) lucid; urgency=low
+
+ * Build on lucid
+
+ -- Rickard Närström Fri, 05 Mar 2010 15:14:11 +0100
+
aegisub (1:2.1.8-0ubuntu1~riccetn1) karmic; urgency=low
* New upstream release
diff -Nru aegisub-2.1.8/debian/control aegisub-2.1.8/debian/control
--- aegisub-2.1.8/debian/control 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/control 2010-04-11 15:29:16.000000000 +0100
@@ -2,11 +2,11 @@
Section: video
Priority: optional
Maintainer: Rickard Närström
-Build-Depends: debhelper (>= 7),
- dpatch,
+Vcs-Bzr: https://code.launchpad.net/~riccetn/ubuntu/lucid/aegisub/aegisub
+Vcs-Browser: http://bazaar.launchpad.net/~riccetn/ubuntu/lucid/aegisub/aegisub/files
+Build-Depends: debhelper (>= 7), quilt, autotools-dev,
+ autoconf, automake | automaken, libtool, intltool,
aegisub-ffmpeg-dev,
- autotools-dev,
- intltool,
libasound2-dev,
libfontconfig1-dev,
libfreetype6-dev,
@@ -15,20 +15,57 @@
libhunspell-dev,
liblua5.1-0-dev,
libpulse-dev,
- libwxgtk2.8-dev
+ wx-common, libwxgtk2.8-dev
Standards-Version: 3.8.3
Homepage: http://www.aegisub.org/
Package: aegisub
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: hunspell-dictionary | myspell-dictionary
-Description: Advance subtitle editor.
+Recommends: aegisub-scripts
+Suggests: aegisub-l10n, aegisub-doc,
+ hunspell-dictionary | myspell-dictionary
+Description: Advance subtitle editor
An advanced subtitle editor for Windows, and UNIX-like systems, such as Linux,
Mac OS X and BSD. It is open source software and free for any use.
.
- Aegisub natively works with the Advanced SubStation Alpha format (abbreviated as ASS)
- which allows for many advanced effects in the subtitles, apart from just basic timed text.
- Aegisub's goal is to support using these advanced functions with ease.
+ Aegisub natively works with the Advanced SubStation Alpha format (abbreviated
+ as ASS) which allows for many advanced effects in the subtitles, apart from
+ just basic timed text. Aegisub's goal is to support using these advanced
+ functions with ease.
.
(Description copied with minjor changes from upstream developer blog)
+
+Package: aegisub-scripts
+Architecture: all
+Depends: aegisub (>= ${source:Version})
+Conflicts: aegisub (<< 1:2.1.8-0ubuntu1~riccetn3)
+Replaces: aegisub (<< 1:2.1.8-0ubuntu1~riccetn3)
+Description: Automation scripts for aegisub
+ An advanced subtitle editor for Windows, and UNIX-like systems, such as Linux,
+ Mac OS X and BSD. It is open source software and free for any use.
+ .
+ This package contains script for automated tasks, including generating of
+ advanced kaeroke effects.
+
+Package: aegisub-l10n
+Architecture: all
+Depends: aegisub (>= ${source:Version})
+Conflicts: aegisub (<< 1:2.1.8-0ubuntu1~riccetn3)
+Replaces: aegisub (<< 1:2.1.8-0ubuntu1~riccetn3)
+Description: Advance subtitle editor language package
+ An advanced subtitle editor for Windows, and UNIX-like systems, such as Linux,
+ Mac OS X and BSD. It is open source software and free for any use.
+ .
+ This package contain language and translation support
+
+Package: aegisub-doc
+Architecture: all
+Section: doc
+Replaces: aegisub (<< 1:2.1.8-0ubuntu1~riccetn3)
+Description: API documentation for aegisub automation
+ An advanced subtitle editor for Windows, and UNIX-like systems, such as Linux,
+ Mac OS X and BSD. It is open source software and free for any use.
+ .
+ This package contain additional documentation including API documentation for
+ writing automation scripts.
diff -Nru aegisub-2.1.8/debian/copyright aegisub-2.1.8/debian/copyright
--- aegisub-2.1.8/debian/copyright 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/copyright 2010-04-11 15:29:16.000000000 +0100
@@ -1,16 +1,25 @@
-This package was debianized by Rickard Närström on
-Tue, 15 Dec 2009 19:29:58 +0100.
-
-It was downloaded from
+Name: Aegisub
+Source: http://ftp.aegisub.org/pub/releases/
Copyright:
-
- Copyright (c) 2004-2010, Aegisub Project
- All rights reserved.
-
+ 2004-2009, Mike Matsnev
+ 2004-2009, Rodrigo Braz Monteiro
+ 2005-2009, Niels Martin Hansen
+ 2005-2008, Fredrik Mellbin
+ 2005-2009, Dan Donovan (Dansolo)
+ 2006-2007, Patryk Pomykalski
+ 2006-2007, Evgeniy Stepanov
+ 2007, 2points
+ 2007, Alysson Souza e Silva (demi_alucard)
+ 2007, David Lamparter
+ 2008-2009, Karl Blomster
+ 2008, Simone Cociancich
+ 2009, Grigori Goronzy
+ 2009, Thomas Goyne
+License: BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+ .
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +28,7 @@
* Neither the name of the Aegisub Group nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,35 +40,188 @@
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- --- END AEGISUB LICENSE --
-
- Any file that does not have a license in the header is covered by the above
- license with exception to any directories that contain a license file, or are
- covered by another license in the file itself.
-
- The following directories and file are covered by their respective licenses as
- follows:
-
- libass/
- - GPL-2 see libass/COPYING in the source tree or /usr/share/common-licenses/GPL-2 on a Debian system.
- libffms/
- - MIT license.
-
- src/boost/
- - Boost Software License Version 1.0
-
- src/gl/
- - SGI Free Software License. See src/gl/glext.h in the source tree.
-
- src/MatroskaParser.(c|h)
- - Licensed to BSDL with permission from the author.
-
- universalchardet/
- - MPL 1.1
-
-The Debian packaging is:
+Files: src/avisynth.h
+Copyright: 2002, Ben Rudiak-Gould et al.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
+ http://www.gnu.org/copyleft/gpl.html .
+ .
+ Linking Avisynth statically or dynamically with other modules is making a
+ combined work based on Avisynth. Thus, the terms and conditions of the GNU
+ General Public License cover the whole combination.
+ .
+ As a special exception, the copyright holders of Avisynth give you
+ permission to link Avisynth with independent modules that communicate with
+ Avisynth solely through the interfaces defined in avisynth.h, regardless of the license
+ terms of these independent modules, and to copy and distribute the
+ resulting combined work under terms of your choice, provided that
+ every copy of the combined work is accompanied by a complete copy of
+ the source code of Avisynth (the version of Avisynth used to produce the
+ combined work), being distributed under the terms of the GNU General
+ Public License plus this exception. An independent module is a module
+ which is not derived from or based on Avisynth, such as 3rd-party filters,
+ import and export plugins, or graphical user interfaces.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in the /usr/share/common-licenses/GPL file.
+
+Files: src/md5sum.h
+Copyright: 1999, 2002, Aladdin Enterprises
+License:
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: src/boost/*
+License:
+ Distributed under the Boost Software License, Version 1.0. (See
+ accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+
+Files: src/gl/*
+License:
+ License Applicability. Except to the extent portions of those files are
+ made subject to an alternative license as permitted in the SGI Free
+ Software License B, Version 1.1 (the "License"), the contents of those
+ files are subject only to the provisions of the License. You may not use
+ those files except in compliance with the License. You may obtain a copy
+ of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ .
+ http://oss.sgi.com/projects/FreeB
+ .
+ Note that, as provided in the License, the Software is distributed on an
+ "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+
+Files: libass/*
+Copyright:
+ 2006, Evgeniy Stepanov
+ 2009, Grigori Goronzy
+License: GPL-2+
+ libass is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ libass is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with libass; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in the /usr/share/common-licenses/GPL file.
- Copyright (C) 2009-2010 Rickard Närström
+Files: libass/ass_strtod.c
+Copyright:
+ 1988-1993, The Regents of the University of California.
+ 1994, Sun Microsystems, Inc.
+License:
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies. The University of California
+ makes no representations about the suitability of this
+ software for any purpose. It is provided "as is" without
+ express or implied warranty.
+
+Files: universalchardet/*
+Copyright: 1998-2000, 2005, Netscape Communications Corporation
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+ The contents of those files are subject to the Mozilla Public
+ License Version 1.1 (the "License"); you may not use those files
+ except in compliance with the License. You may obtain a copy of
+ the License at http://www.mozilla.org/MPL/
+ .
+ Software distributed under the License is distributed on an "AS
+ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ rights and limitations under the License.
+ .
+ Alternatively, the contents of those files may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of those files only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of those files under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of those files under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+Files: automation/autoload/cleantags-autoload.lua, automation/include/cleantags.lua
+Copyright: 2007-2009, Muhammad Lukman Nasaruddin (aka ai-chan, Aegisub's forum member)
+License: MIT
- You are free to use, change and redistrubute this packaging in any form.
+Files: libffms/*
+Copyright:
+ 2007-2009, Fredrik Mellbin
+ 2004-2009, Mike Matsnev
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: automation/demo/perl-console.pl, automation/demo/k-replacer.rb,
+ automation/include/Aegisub/*, automation/include/*.pm,
+ automation/include/*.rb, automation/autoload/macro-*
+Comment: UNCLEAR COPYRIGHT AND LICENSE
+
+Files: automation/demo/*.lua, automation/demo/auto3/*
+Commant: Given into the public domain by the authors
+
+Files: debian/*
+Copyright: 2009-2010, Rickard Närström
+License:
+ Copying and distribution of this package, with or without
+ modification, are permitted in any medium without royalty
+ provided the copyright notice and this notice are
+ preserved.
diff -Nru aegisub-2.1.8/debian/patches/00list aegisub-2.1.8/debian/patches/00list
--- aegisub-2.1.8/debian/patches/00list 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-myspell-path
diff -Nru aegisub-2.1.8/debian/patches/as-needed.patch aegisub-2.1.8/debian/patches/as-needed.patch
--- aegisub-2.1.8/debian/patches/as-needed.patch 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/patches/as-needed.patch 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,174 @@
+Fix compilation with -Wl,--as-needed, i.e. use *_LIBS instead of *_LDFLAGS.
+Upstream bug: http://devel.aegisub.org/ticket/1136
+
+Index: aegisub-2.1.8/configure.in
+===================================================================
+--- aegisub-2.1.8.orig/configure.in 2010-01-27 22:47:46.000000000 +0100
++++ aegisub-2.1.8/configure.in 2010-04-10 09:13:26.586615804 +0200
+@@ -464,10 +464,10 @@
+ AC_ARG_WITH(alsa, [ --without-alsa build without ALSA audio provider. (default: auto)], alsa_disabled="(disabled)")
+
+ AC_ARG_VAR([ALSA_CFLAGS], [CFLAGS to use for ALSA (default: CPPFLAGS)])
+-AC_ARG_VAR([ALSA_LDFLAGS], [LDFLAGS to use for ALSA (default: -lasound)])
++AC_ARG_VAR([ALSA_LIBS], [LIBS to use for ALSA (default: -lasound)])
+
+-if test -z "$ALSA_LDFLAGS"; then
+- ALSA_LDFLAGS="-lasound";
++if test -z "$ALSA_LIBS"; then
++ ALSA_LIBS="-lasound";
+ fi
+
+ if test -z "$ALSA_CFLAGS"; then
+@@ -475,10 +475,10 @@
+ fi
+
+ if test "$with_alsa" != "no"; then
+- aegisub_save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$ALSA_LDFLAGS"
+- AC_CHECK_LIB([asound], [snd_pcm_open], [ALSA_LDFLAGS="-lasound"; with_alsa="yes"], [with_alsa="no"])
+- LDFLAGS="$aegisub_save_LDFLAGS"
++ aegisub_save_LIBS="$LIBS"
++ LIBS="$ALSA_LIBS"
++ AC_CHECK_LIB([asound], [snd_pcm_open], [ALSA_LIBS="-lasound"; with_alsa="yes"], [with_alsa="no"])
++ LIBS="$aegisub_save_LIBS"
+ fi
+
+ if test "$with_alsa" != "no"; then
+@@ -487,7 +487,7 @@
+ fi
+
+ AM_CONDITIONAL([HAVE_ALSA], [test "$with_alsa" != "no"])
+-AC_SUBST(ALSA_LDFLAGS)
++AC_SUBST(ALSA_LIBS)
+
+
+ ############
+@@ -870,7 +870,7 @@
+ aegisub_save_LIBS="$LIBS"
+ LIBS="$LUA_LDFLAGS"
+ if test "$with_lua" != no; then
+- AC_AGI_COMPILE([Lua 5.1 (auto4)], [lua], [$LUA_CFLAGS], [],[
++ AC_AGI_COMPILE([Lua 5.1 (auto4)], [lua], [$LUA_CFLAGS], [$LUA_LDFLAGS],[
+ #include
+
+ int main () {
+Index: aegisub-2.1.8/m4macros/ac_agi.m4
+===================================================================
+--- aegisub-2.1.8.orig/m4macros/ac_agi.m4 2009-07-19 20:03:15.000000000 +0200
++++ aegisub-2.1.8/m4macros/ac_agi.m4 2010-04-10 09:13:26.586615804 +0200
+@@ -1,8 +1,8 @@
+ AC_DEFUN([AC_AGI_COMPILE],[
+- aegisub_save_LDFLAGS="$LDFLAGS"
++ aegisub_save_LIBS="$LIBS"
+ aegisub_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$3"
+- LDFLAGS="$4"
++ LIBS="$4"
+ AC_CACHE_CHECK(
+ [whether $1 works], [agi_cv_with_$2],
+ [AC_RUN_IFELSE([$5],
+@@ -15,7 +15,7 @@
+ fi])
+ ])
+ CPPFLAGS="$aegisub_save_CPPFLAGS"
+- LDFLAGS="$aegisub_save_LDFLAGS"
++ LIBS="$aegisub_save_LIBS"
+ ])
+
+
+Index: aegisub-2.1.8/src/Makefile.am
+===================================================================
+--- aegisub-2.1.8.orig/src/Makefile.am 2010-01-23 16:10:47.000000000 +0100
++++ aegisub-2.1.8/src/Makefile.am 2010-04-10 09:13:26.596617518 +0200
+@@ -52,32 +52,28 @@
+ if HAVE_ALSA
+ noinst_LIBRARIES += libaudio_alsa.a
+ libaudio_alsa_a_SOURCES = audio_player_alsa.cpp
+-aegisub_2_1_LDFLAGS += @ALSA_LDFLAGS@
+-aegisub_2_1_LDADD += libaudio_alsa.a
++aegisub_2_1_LDADD += libaudio_alsa.a @ALSA_LIBS@
+ endif
+
+ if HAVE_PORTAUDIO
+ noinst_LIBRARIES += libaudio_portaudio.a
+ libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp
+ libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@
+-aegisub_2_1_LDFLAGS += @PORTAUDIO_LIBS@
+-aegisub_2_1_LDADD += libaudio_portaudio.a
++aegisub_2_1_LDADD += libaudio_portaudio.a @PORTAUDIO_LIBS@
+ endif
+
+ if HAVE_PULSEAUDIO
+ noinst_LIBRARIES += libaudio_pulseaudio.a
+ libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp
+ libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@
+-aegisub_2_1_LDFLAGS += @LIBPULSE_LIBS@
+-aegisub_2_1_LDADD += libaudio_pulseaudio.a
++aegisub_2_1_LDADD += libaudio_pulseaudio.a @LIBPULSE_LIBS@
+ endif
+
+ if HAVE_OPENAL
+ noinst_LIBRARIES += libaudio_openal.a
+ libaudio_openal_a_SOURCES = audio_player_openal.cpp
+ libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@
+-aegisub_2_1_LDFLAGS += @OPENAL_LIBS@
+-aegisub_2_1_LDADD += libaudio_openal.a
++aegisub_2_1_LDADD += libaudio_openal.a @OPENAL_LIBS@
+ endif
+
+ if HAVE_OSS
+@@ -86,10 +82,6 @@
+ aegisub_2_1_LDADD += libaudio_oss.a
+ endif
+
+-if HAVE_FFMPEG
+-aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
+-endif
+-
+ if HAVE_PROVIDER_FFMPEG
+ noinst_LIBRARIES += libaudiovideo_ffmpeg.a
+ libaudiovideo_ffmpeg_a_SOURCES = audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp
+@@ -101,8 +93,11 @@
+ noinst_LIBRARIES += libaudiovideo_ffmpegsource.a
+ libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
+ libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
+-aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a
+-aegisub_2_1_LDFLAGS += @LIBPOSTPROC_LIBS@
++aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a @LIBPOSTPROC_LIBS@
++endif
++
++if HAVE_FFMPEG
++aegisub_2_1_LDADD += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
+ endif
+
+ noinst_LIBRARIES += libsubtitle_provider.a
+@@ -115,8 +110,7 @@
+ libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
+ libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@
+ LIBS += @LIBASS_LIBS@
+-aegisub_2_1_LDADD += libsubtitle_ass.a
+-aegisub_2_1_LDFLAGS += @FONTCONFIG_LIBS@
++aegisub_2_1_LDADD += libsubtitle_ass.a @FONTCONFIG_LIBS@
+ endif
+
+ if WITH_CSRI
+@@ -124,8 +118,7 @@
+ libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp
+ libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@
+ LIBS += @CSRI_LIBS@
+-aegisub_2_1_LDADD += libsubtitle_csri.a
+-aegisub_2_1_LDFLAGS += @FONTCONFIG_LIBS@
++aegisub_2_1_LDADD += libsubtitle_csri.a @FONTCONFIG_LIBS@
+ endif
+
+ if HAVE_AUTO4_LUA
+@@ -169,8 +162,7 @@
+ if HAVE_HUNSPELL
+ noinst_LIBRARIES += libmisc_hunspell.a
+ libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp
+-aegisub_2_1_LDFLAGS += @HUNSPELL_LIBS@
+-aegisub_2_1_LDADD += libmisc_hunspell.a
++aegisub_2_1_LDADD += libmisc_hunspell.a @HUNSPELL_LIBS@
+ endif
+
+ if HAVE_UNIVCHARDET
diff -Nru aegisub-2.1.8/debian/patches/myspell-path.dpatch aegisub-2.1.8/debian/patches/myspell-path.dpatch
--- aegisub-2.1.8/debian/patches/myspell-path.dpatch 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/patches/myspell-path.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## myspell-path.dpatch by
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adjust path to myspell dictionaries to what is used in Ubuntu
-
-@DPATCH@
-diff -urNad aegisub-2.1.8-dev-r3946~/src/options.cpp aegisub-2.1.8-dev-r3946/src/options.cpp
---- aegisub-2.1.8-dev-r3946~/src/options.cpp 2010-01-08 02:06:05.000000000 +0100
-+++ aegisub-2.1.8-dev-r3946/src/options.cpp 2010-01-13 09:43:40.799483913 +0100
-@@ -122,7 +122,7 @@
- #if defined(__WINDOWS__) || defined(__APPLE__)
- SetText(_T("Dictionaries path"),_T("?data/dictionaries"));
- #else
-- SetText(_T("Dictionaries path"),wxString::Format(_T("%s/%s"), _T(INSTALL_PREFIX),_T("/share/myspell")));
-+ SetText(_T("Dictionaries path"),wxString::Format(_T("%s/%s"), _T(INSTALL_PREFIX),_T("/share/myspell/dicts")));
- #endif
- SetText(_T("Spell Checker"),_T("hunspell"));
- SetModificationType(MOD_AUTOMATIC);
diff -Nru aegisub-2.1.8/debian/patches/myspell-path.patch aegisub-2.1.8/debian/patches/myspell-path.patch
--- aegisub-2.1.8/debian/patches/myspell-path.patch 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/patches/myspell-path.patch 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,15 @@
+Adjust path to myspell dictionaries to what is used in Ubuntu
+
+Index: aegisub-2.1.8/src/options.cpp
+===================================================================
+--- aegisub-2.1.8.orig/src/options.cpp 2010-01-12 13:57:21.000000000 +0100
++++ aegisub-2.1.8/src/options.cpp 2010-04-10 09:14:12.276613521 +0200
+@@ -122,7 +122,7 @@
+ #if defined(__WINDOWS__) || defined(__APPLE__)
+ SetText(_T("Dictionaries path"),_T("?data/dictionaries"));
+ #else
+- SetText(_T("Dictionaries path"),wxString::Format(_T("%s/%s"), _T(INSTALL_PREFIX),_T("/share/myspell")));
++ SetText(_T("Dictionaries path"),wxString::Format(_T("%s/%s"), _T(INSTALL_PREFIX),_T("/share/myspell/dicts")));
+ #endif
+ SetText(_T("Spell Checker"),_T("hunspell"));
+ SetModificationType(MOD_AUTOMATIC);
diff -Nru aegisub-2.1.8/debian/patches/series aegisub-2.1.8/debian/patches/series
--- aegisub-2.1.8/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/patches/series 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,2 @@
+as-needed.patch
+myspell-path.patch
diff -Nru aegisub-2.1.8/debian/README.Debian aegisub-2.1.8/debian/README.Debian
--- aegisub-2.1.8/debian/README.Debian 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/README.Debian 2010-04-11 15:29:16.000000000 +0100
@@ -1,6 +1,5 @@
Auto 4 Perl and Ruby status
---------------------------
-
Automation 4 Perl and Ruby is unmaintaind upstream and removed from trunk. This package
will be built without perl and ruby support until there is an upstream maintainer and
some commits are submited to upstream svn.
@@ -14,7 +13,6 @@
Spell checking
--------------
-
As of version 2.1.8-dev-3946-0ubuntu1~riccetn5 aegisub is built with spell checking
support. However in earlier versions the search path for dictionary files did not
match what is used in Ubuntu, if you are upgrading from an earlier version the
@@ -25,5 +23,5 @@
- Open Aegisub
- Open the Options dialogue (view->options or alt+o)
- On the left side choose "Subtitle edit box" under "General"
- - Change "Path to dictionary files" to be /usr/share/myspell/dicts
+ - Change "Path to dictionary files" to /usr/share/myspell/dicts
- After a restart of aegisub spell checking should work (if you have necessary dictionaries installed)
diff -Nru aegisub-2.1.8/debian/README.source aegisub-2.1.8/debian/README.source
--- aegisub-2.1.8/debian/README.source 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/README.source 2010-04-11 15:29:16.000000000 +0100
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+For more information see /usr/share/doc/quilt/README.source
diff -Nru aegisub-2.1.8/debian/rules aegisub-2.1.8/debian/rules
--- aegisub-2.1.8/debian/rules 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/rules 2010-04-11 15:29:16.000000000 +0100
@@ -8,6 +8,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -19,11 +20,7 @@
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
-# Extra flags to add when linking with ffmpeg libraries from aegisub-ffmpeg package
-RICCETN_FFMPEG_LIBS=-Wl,--rpath=/usr/lib/aegisub -L/usr/lib/aegisub
-
-
-config.status: configure patch-stamp
+configure: $(QUILT_STAMPFN) configure.in
dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -31,22 +28,16 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- # XXX: Hack to make sure aegisub binary is linked with correct rpath
- # and that the configure script will not fail.
- PKG_CONFIG_PATH="/usr/lib/aegisub/pkgconfig" \
- LIBAVFORMAT_LIBS="${RICCETN_FFMPEG_LIBS} -lavformat" \
- LIBAVCODEC_LIBS="${RICCETN_FFMPEG_LIBS} -lavcodec" \
- LIBAVUTIL_LIBS="${RICCETN_FFMPEG_LIBS} -lavutil" \
- LIBSWSCALE_LIBS="${RICCETN_FFMPEG_LIBS} -lswscale" \
- LIBPOSTPROC_LIBS="${RICCETN_FFMPEG_LIBS} -lpostproc" \
- ./configure $(CROSS) --prefix=/usr CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
- --with-alsa \
- --with-pulseaudio --with-player-audio=pulseaudio \
- --without-portaudio \
- --without-openal \
- --without-ruby \
- --without-perl
+ autoreconf
+config.status: configure
+ dh_testdir
+ PKG_CONFIG_PATH="/usr/lib/aegisub/pkgconfig" \
+ ./configure $(CROSS) --prefix=/usr CFLAGS="$(CFLAGS)" \
+ LDFLAGS="-L/usr/lib/argisub -Wl,--rpath=/usr/lib/aegisub -Wl,--as-needed" \
+ --with-alsa --with-pulseaudio --with-player-audio=pulseaudio \
+ --without-portaudio --without-openal \
+ --without-ruby --without-perl
build: build-stamp
build-stamp: config.status
@@ -54,8 +45,7 @@
$(MAKE)
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
@@ -66,42 +56,39 @@
install: build
dh_testdir
dh_testroot
- dh_prep
+ dh_prep
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/aegisub install
-
-# Dpatch stuff
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- dpatch apply-all
- touch $@
-
-unpatch:
- dh_testdir
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-independent files here.
binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_install -i
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_compress -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: install
dh_testdir
dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installmenu
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_install -a
+ dh_installchangelogs -a
+ dh_installman -a
+ dh_installdocs -a
+ dh_installmenu -a
+ dh_strip -a
+ dh_compress -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build clean patch unpatch binary-indep binary-arch binary install
diff -Nru aegisub-2.1.8/debian/source/format aegisub-2.1.8/debian/source/format
--- aegisub-2.1.8/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ aegisub-2.1.8/debian/source/format 2010-04-11 15:36:36.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru aegisub-2.1.8/debian/TODO aegisub-2.1.8/debian/TODO
--- aegisub-2.1.8/debian/TODO 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/TODO 2010-04-11 15:29:16.000000000 +0100
@@ -1,6 +1,3 @@
-* Create a manualpage as requiered by Debian policies.
-* Fix linking to unneeded wxGTK libreries.
- - Some libs are wrongly added to LDFLAGS instead of LDADD (i.e. LDFLAGS="-Wl,--as-needed" doesn't work)
* Link to external libass
- http://devel.aegisub.org/ticket/917
* Link to external FFmpegSource
diff -Nru aegisub-2.1.8/debian/watch aegisub-2.1.8/debian/watch
--- aegisub-2.1.8/debian/watch 2010-04-11 15:36:35.000000000 +0100
+++ aegisub-2.1.8/debian/watch 2010-04-11 15:29:16.000000000 +0100
@@ -1,7 +1,3 @@
# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
-#
ftp://ftp.aegisub.org/pub/releases/aegisub-(.*)\.tar\.gz