From: etrunko Date: Thu, 8 May 2008 17:16:57 +0000 (+0000) Subject: Updated epeg package X-Git-Url: http://git.maemo.org/git/?p=maemo-efl;a=commitdiff_plain;h=824ddeb6404e546275a7a34510b0d85de4dcaa45 Updated epeg package --- diff --git a/trunk/epeg/debian/changelog b/trunk/epeg/debian/changelog index bd2838b..6aefda4 100644 --- a/trunk/epeg/debian/changelog +++ b/trunk/epeg/debian/changelog @@ -1,3 +1,9 @@ +epeg (0.9.1.042-maemo2) unstable; urgency=low + + * New upstream version. + + -- Eduardo Lima (Etrunko) Tue, 06 May 2008 15:49:22 -0300 + epeg (0.9.1.042-maemo1) unstable; urgency=low * New upstream version. diff --git a/trunk/epeg/debian/copyright b/trunk/epeg/debian/copyright index 403c746..dd541ed 100644 --- a/trunk/epeg/debian/copyright +++ b/trunk/epeg/debian/copyright @@ -1,40 +1,43 @@ -This package was debianized by Sytse Wielinga on -Thu, 4 Mar 2004 22:07:34 +0100. +This package was debianized by Eduardo Lima (Etrunko) on +Tue, 06 May 2008 15:49:22 -0300. -The source is downloaded from the e17/libs/epeg module of the enlightenment CVS +The source is downloaded from the e17/libs/epeg module of the enlightenment CVS tree. For more information, see: - http://www.enlightenment.org/cvs.html + http://www.enlightenment.org -Upstream Authors: Enlightenment team +Upstream Authors + + Enlightenment team Copyright: -Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS) - -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 of the Software and its Copyright notices. In addition publicly -documented acknowledgment must be given that this software has been used if no -source code of this software is made available publicly. This includes -acknowledgments in either Copyright notices, Manuals, Publicity and Marketing -documents or any documentation provided with any product containing this -software. This License does not apply to any software that links to the -libraries provided by this software (statically or dynamically), but only to -the software provided. - -Please see the COPYING.PLAIN for a plain-english explanation of this notice -and it's intent. - -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 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. + Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS) + +License: + + 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 of the Software, its documentation and marketing & publicity + materials, and acknowledgment shall be given in the documentation, + materials and software packages that this Software was used. + + 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 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. + +On Debian systems, the complete text of the BSD License can be found +in `/usr/share/common-licenses/BSD'. + +The Debian packaging is: + (C) 2006 2007,Debian Pkg-e Team + and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/trunk/epeg/debian/patches/01_dont_overwrite_changelog.diff b/trunk/epeg/debian/patches/01_dont_overwrite_changelog.diff index 1c1d0a5..1183f01 100644 --- a/trunk/epeg/debian/patches/01_dont_overwrite_changelog.diff +++ b/trunk/epeg/debian/patches/01_dont_overwrite_changelog.diff @@ -1,12 +1,7 @@ -diff -upNr epeg/Makefile.am /tmp/epeg/Makefile.am ---- epeg/Makefile.am 2008-02-18 19:15:22.000000000 -0200 -+++ epeg/Makefile.am 2008-02-18 19:14:48.000000000 -0200 -@@ -6,19 +6,11 @@ MAINTAINERCLEANFILES = Makefile.in acloc - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in epeg.c depcomp \ -- epeg.spec debian/changelog -+ epeg.spec +diff -upr epeg/Makefile.am epeg.new/Makefile.am +--- epeg/Makefile.am 2008-03-06 10:50:27.000000000 -0300 ++++ epeg.new/Makefile.am 2008-05-08 12:00:59.000000000 -0300 +@@ -10,15 +10,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \ autogen.sh epeg.spec epeg.spec.in epeg.c.in gendoc \ @@ -23,9 +18,9 @@ diff -upNr epeg/Makefile.am /tmp/epeg/Makefile.am pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = epeg.pc -diff -upNr epeg/Makefile.in /tmp/epeg/Makefile.in ---- epeg/Makefile.in 2008-02-18 19:15:38.000000000 -0200 -+++ epeg/Makefile.in 2008-02-18 19:15:19.000000000 -0200 +diff -upr epeg/Makefile.in epeg.new/Makefile.in +--- epeg/Makefile.in 2008-05-08 12:00:41.000000000 -0300 ++++ epeg.new/Makefile.in 2008-05-08 12:01:13.000000000 -0300 @@ -36,10 +36,9 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -50,12 +45,7 @@ diff -upNr epeg/Makefile.in /tmp/epeg/Makefile.in SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -@@ -193,19 +191,11 @@ MAINTAINERCLEANFILES = Makefile.in acloc - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in epeg.c depcomp \ -- epeg.spec debian/changelog -+ epeg.spec +@@ -197,15 +195,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \ autogen.sh epeg.spec epeg.spec.in epeg.c.in gendoc \ @@ -81,9 +71,9 @@ diff -upNr epeg/Makefile.in /tmp/epeg/Makefile.in mostlyclean-libtool: -rm -f *.lo -diff -upNr epeg/configure /tmp/epeg/configure ---- epeg/configure 2008-02-18 19:15:36.000000000 -0200 -+++ epeg/configure 2008-02-18 19:15:18.000000000 -0200 +diff -upr epeg/configure epeg.new/configure +--- epeg/configure 2008-05-08 12:00:40.000000000 -0300 ++++ epeg.new/configure 2008-05-08 12:01:12.000000000 -0300 @@ -14899,7 +14899,7 @@ my_libs="-ljpeg" @@ -101,9 +91,9 @@ diff -upNr epeg/configure /tmp/epeg/configure *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -diff -upNr epeg/configure.in /tmp/epeg/configure.in ---- epeg/configure.in 2008-02-18 19:15:22.000000000 -0200 -+++ epeg/configure.in 2008-02-18 19:14:48.000000000 -0200 +diff -upr epeg/configure.in epeg.new/configure.in +--- epeg/configure.in 2008-03-06 10:50:27.000000000 -0300 ++++ epeg.new/configure.in 2008-05-08 12:01:03.000000000 -0300 @@ -44,7 +44,6 @@ epeg.spec src/Makefile src/lib/Makefile