rev 14765 - in krap/mlt/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Mon Jun 1 09:25:00 UTC 2009 

Author: fabo
Date: 2009-06-01 09:24:59 +0000 (Mon, 01 Jun 2009)
New Revision: 14765

Added:
   krap/mlt/trunk/debian/patches/01_remove_ldconfig.diff
   krap/mlt/trunk/debian/patches/02_update_have_mmx.diff
Modified:
   krap/mlt/trunk/debian/changelog
   krap/mlt/trunk/debian/control
   krap/mlt/trunk/debian/melt.docs
   krap/mlt/trunk/debian/patches/series
Log:
Cleanup mlt before uploading (the package should be ready):
* re-add patches and add comments:
  - 01_remove_ldconfig
  - 02_update_have_mmx
* re-words the changelog
* do not install TODO


Modified: krap/mlt/trunk/debian/changelog
===================================================================
--- krap/mlt/trunk/debian/changelog	2009-06-01 07:59:11 UTC (rev 14764)
+++ krap/mlt/trunk/debian/changelog	2009-06-01 09:24:59 UTC (rev 14765)
@@ -1,18 +1,20 @@
-mlt (0.4.2-1) UNRELEASED; urgency=low
+mlt (0.4.2-1) unstable; urgency=low
 
   * New upstream release.
     - inigo has been renamed to melt.
-    - mlt++ is not anymore a separate source package, also build and install
-      mlt++ in mlt.
-    - Bump libmlt++ SONAME to 2.
-    - miracle, westley and valerie have gone.
+    - build and install mlt++ in mlt, they are not a separate source package
+      anymore.
+    - Bump libmlt++ SONAME to 2 (introduce libmlt++2 package).
+    - miracle, westley and valerie were moved out of mlt into melted project.
     - mlt-config is deprecated.
-    - Drop 02_update_have_mmx, 04_update_install_target, 05_update_docs,
-      06_disable_example and 08_add_missing_ldlags patches.
-    - Drop 03_update_prefix_data patch, it is not needed anymore and will break
-      melt.
-  * Add missing descriptions to the patches. Fixes lintian warning
-    quilt-patch-missing-description. Thanks lintian.
+    - Drop patches:
+      - 03_update_prefix_data patch (not needed anymore and will break melt)
+      - 04_update_install_target
+      - 05_update_docs
+      - 06_disable_example
+      - 08_add_missing_ldlags
+  * Fix lintian warning quilt-patch-missing-description:
+    add missing descriptions to the patches. Thanks lintian.
   * Bump compat/debhelper to 7 (no changes needed).
   * Drop cdbs build dependency.
 

Modified: krap/mlt/trunk/debian/control
===================================================================
--- krap/mlt/trunk/debian/control	2009-06-01 07:59:11 UTC (rev 14764)
+++ krap/mlt/trunk/debian/control	2009-06-01 09:24:59 UTC (rev 14765)
@@ -2,11 +2,11 @@
 Priority: optional
 Maintainer: Fathi Boudra <fabo at debian.org>
 Uploaders: Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: debhelper (>= 7), quilt, ffmpeg (>= 0.svn20081115), imagemagick,
+Build-Depends: debhelper (>= 7), quilt (>= 0.46), ffmpeg (>= 0.svn20081115),
  kdelibs5-dev, ladspa-sdk, libavdevice-dev, libavformat-dev, libdv4-dev,
  libgtk2.0-dev, libjack-dev, libquicktime-dev, libsamplerate-dev,
  libsdl1.2-dev, libsox-dev (>= 14.1.0), libswscale-dev, libvorbis-dev,
- libxine-dev, libxml2-dev
+ libxine-dev, libxml2-dev, imagemagick
 Standards-Version: 3.8.1
 Section: libs
 Homepage: http://www.mltframework.org
@@ -103,3 +103,4 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: command line media player and video editor
  melt is a powerful multitrack command line oriented video editor.
+

Modified: krap/mlt/trunk/debian/melt.docs
===================================================================
--- krap/mlt/trunk/debian/melt.docs	2009-06-01 07:59:11 UTC (rev 14764)
+++ krap/mlt/trunk/debian/melt.docs	2009-06-01 09:24:59 UTC (rev 14765)
@@ -1,4 +1,3 @@
-docs/TODO
 docs/framework.txt
 docs/melt.txt
 docs/policies.txt

Added: krap/mlt/trunk/debian/patches/01_remove_ldconfig.diff
===================================================================
--- krap/mlt/trunk/debian/patches/01_remove_ldconfig.diff	                        (rev 0)
+++ krap/mlt/trunk/debian/patches/01_remove_ldconfig.diff	2009-06-01 09:24:59 UTC (rev 14765)
@@ -0,0 +1,14 @@
+# upstream build system should not call ldconfig
+
+--- a/Makefile
++++ b/Makefile
+@@ -35,9 +35,6 @@ install:
+ 	for subdir in $$list; do \
+ 		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
+ 	done; \
+-	if test -z "$(DESTDIR)"; then \
+-	  /sbin/ldconfig -n "$(DESTDIR)$(libdir)" 2> /dev/null || true; \
+-	fi
+ 
+ uninstall:
+ 	rm -f "$(DESTDIR)$(bindir)"/mlt-config

Added: krap/mlt/trunk/debian/patches/02_update_have_mmx.diff
===================================================================
--- krap/mlt/trunk/debian/patches/02_update_have_mmx.diff	                        (rev 0)
+++ krap/mlt/trunk/debian/patches/02_update_have_mmx.diff	2009-06-01 09:24:59 UTC (rev 14765)
@@ -0,0 +1,55 @@
+# Bring have_mmx.S up-to-date
+
+--- a/src/modules/gtk2/have_mmx.S
++++ b/src/modules/gtk2/have_mmx.S
+@@ -1,21 +1,42 @@
++/*
++ * Copyright (C) 2000 Red Hat, Inc
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
+ 	.file	"have_mmx.S"
+ 	.version	"01.01"
+-	.section .note.GNU-stack,"",%progbits
+-
+ gcc2_compiled.:
+ .text
+ 	.align 16
+ 
+-#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
++#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
+ 
+-.globl pixops_have_mmx
+-	.type	 pixops_have_mmx, at function
+-pixops_have_mmx:
++/* Magic indicating no need for an executable stack */
++#if !defined __powerpc64__ && !defined __ia64__
++.section .note.GNU-stack;  .previous
++#endif
++	
++.globl _pixops_have_mmx
++	.type	 _pixops_have_mmx, at function
++_pixops_have_mmx:
+ 
+ #else
+ 
+-.globl _pixops_have_mmx
+-_pixops_have_mmx:
++.globl __pixops_have_mmx
++__pixops_have_mmx:
+ 
+ #endif
+ 	

Modified: krap/mlt/trunk/debian/patches/series
===================================================================
--- krap/mlt/trunk/debian/patches/series	2009-06-01 07:59:11 UTC (rev 14764)
+++ krap/mlt/trunk/debian/patches/series	2009-06-01 09:24:59 UTC (rev 14765)
@@ -1,3 +1,5 @@
+01_remove_ldconfig.diff
+02_update_have_mmx.diff
 07_custom_ldflags.diff
 09_add_gcc4.3_support.diff
 10_fix_xine_module_cflags.diff

More information about the pkg-kde-commits mailing list