[SCM] VLC media player packaging branch, jaunty, updated. debian/0.9.9a-1-13-g373c73e

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Apr 18 18:07:21 UTC 2009


The following commit has been merged in the jaunty branch:
commit 72f63417290215c89772363557b5f7d547328fda
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Mon Apr 6 13:58:06 2009 +0200

    Imported Debian patch 0.9.9a-1ubuntu1

diff --git a/debian/.bzr-builddeb/default.conf b/debian/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/debian/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
diff --git a/debian/NEWS b/debian/NEWS
index 5f51a79..dd18804 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,21 @@
+vlc (0.9.8a-2) unstable; urgency=low
+
+  HTTP interface:
+
+   The .hosts file used to control which remote hosts have access to the http
+  interface has been moved to /etc/vlc/http/hosts and is now a conffile.
+   If you do more change to the http interface, you need to do that out of
+  /usr/share/vlc/http and use --http-src option of vlc. If you don't, your
+  modifications will get lost at the next upgrade of vlc.
+
+  Running VLC as root:
+
+   Since 0.9.0, VLC can't be run as root. If you need realtime priority or if
+  you need to have VLC listening on a privileged port (<1024), then you need to
+  use vlc-wrapper.
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Mon, 23 Feb 2009 22:41:46 +0000
+
 vlc (0.9.2-1) experimental; urgency=low
 
   Important changes in this new upstream version:
diff --git a/debian/bug/presubj b/debian/bug/presubj
index 88ea241..792ba01 100644
--- a/debian/bug/presubj
+++ b/debian/bug/presubj
@@ -10,10 +10,10 @@ at all, you need to check that the module handling it is present.
    If you have yellow warning lines at the top, that could well be the
    problem
 
- * If you have installed libraries from other reposotories (e.g. to use
-   patent-encumbred encoders), revert to the official Debian libraries
-   before reporting a bug.
+ * If you have installed libraries from other repositories (e.g. to use
+   allegedly patent-encumbred encoders), revert to the official Debian 
+   libraries before reporting a bug.
 
-The debug log of vlc ("vlc -vvv --options") is very usefull for the
+The debug log of vlc ("vlc -vvv --options") is very useful for the
 developers, do include it in your report.
 
diff --git a/debian/changelog b/debian/changelog
index bb5947f..431fe1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,77 @@
+vlc (0.9.9a-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian. (LP: #356310)
+  * Remaining changes:
+    - build against libxul-dev instead of iceape-dev
+    - build against libass-dev and libx264-dev
+    - build against and install libx264 plugin
+    - adjust Vcs-Bzr Headers in debian/control
+    - add Xb-Npp header to vlc package
+    - debian/patches/301_DVD_media.diff: Change %U to %f
+       in VLC .desktop file, cf LP #275043
+    - Remove arts from dependencies. (LP: #320915)
+      - debian/control:
+        - Remove libarts1-dev from build depends
+        - Don't build package vlc-plugin-arts
+        - Remove all notions of vlc-plugin-arts from packages descriptions
+      - debian/rules:
+        - Remove --enable-arts from confflags
+      - Delete debian/vlc-plugin-arts.install
+      - Delete debian/vlc-plugin-arts.links
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Mon, 06 Apr 2009 13:58:06 +0200
+
+vlc (0.9.9a-1) unstable; urgency=low
+
+  * New upstream version 0.9.9a
+   + Closes: #520149, #522170, #522185, #522554
+   + Update symbol files
+  * Fix some typo in bug/presubj
+  * Remove some Replaces/Conflicts against version not in etch
+  * Move the caca module to vlc-nox
+    + Re-add some Replaces/Conflicts
+    + Closes: #522040
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Fri, 03 Apr 2009 00:12:49 +0200
+
+vlc (0.9.8a-3) unstable; urgency=low
+
+  [ Reinhard Tartler ]
+  * fix typo in '--enable-maintainer-mode' (Closes: #517155)
+
+  [ Christophe Mutricy ]
+  * Fix build on non-Linux arch
+  * Fix cross-compilation
+  * VLC is GPV v2 or later. So point to v2 of the GPL
+  * We can use debhelper v7 without trouble
+  * Add lintian overrides.
+  * Set policy to 3.8.1
+  * debian/patches/*
+    + Prune doc/fortunes.txt from personnal attack (Closes: #401560,
+      #518300)
+    + Delete unused patches
+    + Add comments to the patches
+  * Move to the video and debug sections  
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Sun, 15 Mar 2009 16:50:18 +0000
+
+vlc (0.9.8a-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Rebuild against new libraries (Closes: #516316, #516731)
+  * Move packaging to Git
+    + Add a conf file for git-buildpackage
+    + Reflect change to git in Vcs fields
+    + Ignore file generated by dpkg-buildpackage
+  * Disable the DV access module until it's ported to the new API
+  * Move http/.hosts to /etc (Closes: #501791)
+  * Improve some short descriptions
+  * Depends on debhelper >7
+  * Fix for 2 builds in a row
+  * Add a note in NEWS about running as root and vlc-wrapper (Closes: #507872)
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Tue, 24 Feb 2009 16:00:31 +0100
+
 vlc (0.9.8a-1ubuntu4) jaunty; urgency=low
 
   [ Cody Russell ]
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 8c5479c..0518b8a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: vlc
-Section: graphics
+Section: video
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@ -8,7 +8,7 @@ Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Loic Minier <lool at dooz.org>,
            Christophe Mutricy <xtophe at videolan.org>,
            Mohammed Adnène Trojette <adn+deb at diwi.org>
-Build-Depends: debhelper (>= 6),
+Build-Depends: debhelper (>= 7),
                dh-buildinfo,
                gettext,
                quilt,
@@ -22,12 +22,10 @@ Build-Depends: debhelper (>= 6),
                libass-dev (>= 0.9.5-2),
                libaudiofile-dev,
                libavahi-client-dev,
-               libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libavcodec-dev (>= 0.cvs20060823),
                libavformat-dev (>= 0.cvs20060823),
                libcaca-dev (>= 0.99.beta4),
                libcdio-dev,
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libdca-dev,
                libdvbpsi4-dev,
                libdvdnav-dev,
@@ -61,7 +59,6 @@ Build-Depends: debhelper (>= 6),
                libpostproc-dev (>= 0.cvs20060823),
                libpulse-dev,
                libqt4-dev,
-               libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libschroedinger-dev,
                libsdl-image1.2-dev,
                libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
@@ -88,13 +85,13 @@ Build-Depends: debhelper (>= 6),
                pkg-config,
                qt4-dev-tools,
                zlib1g-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.videolan.org/vlc
 Vcs-Bzr: https://code.launchpad.net/~motumedia/vlc/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~motumedia/vlc/ubuntu/files
 
 Package: vlc
-Section: graphics
+Section: video
 Architecture: any
 Depends: vlc-nox (= ${binary:Version}), 
          ${shlibs:Depends}, 
@@ -102,11 +99,8 @@ Depends: vlc-nox (= ${binary:Version}),
          ttf-dejavu-core
 Suggests: mozilla-plugin-vlc,
           videolan-doc
-Replaces: wxvlc (<< 0.8.5-test3.debian-4),
-          vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
-          vlc-nox (<< 0.9.2-1)
-Conflicts: vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
-           vlc-nox (<< 0.9.2-1)
+Replaces:  vlc-nox (<< 0.9.2-1)
+Conflicts: vlc-nox (<< 0.9.2-1)
 Provides: mp3-decoder
 Description: multimedia player and streamer
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -125,7 +119,7 @@ Description: multimedia player and streamer
  also a web browser plugin in the mozilla-plugin-vlc package.
 
 Package: vlc-dbg
-Section: graphics
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -139,16 +133,12 @@ Description: debugging symbols for vlc
  This package contains the debugging symbols for vlc.
 
 Package: vlc-nox
-Section: net
+Section: video
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Replaces: wxvlc (<< 0.8.5-test3.debian-4),
-          vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
-          vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
-Conflicts: wxvlc (<< 0.8.5-test3.debian-4),
-           vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
-           vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Replaces: vlc (<< 0.9.8a-3)
+Conflicts: vlc (<< 0.9.8a-3)
 Provides: mp3-decoder
 Description: multimedia player and streamer (without X support)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -163,9 +153,9 @@ Description: multimedia player and streamer (without X support)
  for broadcasting purposes or for movie format transformations. Support for
  most output methods is provided by this package, but features can be added
  by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-sdl,
- vlc-plugin-jack) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
- vlc-plugin-svgalib). There is also a web browser plugin in the
- mozilla-plugin-vlc package.
+ vlc-plugin-arts, vlc-plugin-jack) or video plugins (vlc-plugin-sdl, 
+ vlc-plugin-ggi, vlc-plugin-svgalib). There is also a web browser plugin in 
+ the mozilla-plugin-vlc package.
  .
  This package contains a version of VLC that does not require X and that is
  thus suitable for headless servers.
@@ -176,7 +166,7 @@ Architecture: any
 Depends: vlc-data,
          ${shlibs:Depends},
          ${misc:Depends}
-Description: multimedia player and streamer library
+Description: base library for VLC and its modules
  This package contains the shared library required by VLC modules and libvlc.
  .
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -203,7 +193,7 @@ Section: libdevel
 Architecture: any
 Depends: libvlccore0 (= ${binary:Version}), pkg-config, 
          ${shlibs:Depends}, ${misc:Depends}
-Description: development files for VLC
+Description: development files for libvlccore
  This package contains headers and a static library required to build plugins
  for VLC.
  .
@@ -218,7 +208,7 @@ Depends: libvlc2 (= ${binary:Version}), libvlccore-dev, pkg-config,
          ${shlibs:Depends}, ${misc:Depends}
 Replaces: libvlc0-dev
 Conflicts: libvlc0-dev
-Description: development files for VLC
+Description: development files for libvlc
  This package contains headers and a static library required to build 
  standalone applications that use VLC features.
  .
diff --git a/debian/copyright b/debian/copyright
index 9da9ad9..4d02666 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -242,7 +242,7 @@ The blurb for the GNU General Publice License, version 2 or later:
  | Foundation, Inc., 51 Franklin St, 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 `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 The NetBSD license:
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..658446a
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+# the default build command
+builder=debuild -i\.git -I.git
+# the default branch for upstream sources
+upstream-branch=upstream
+# the default branch for the debian patch
+debian-branch=sid
+#versioning conventions (defaults)
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+# use pristine tar
+pristine-tar = True
diff --git a/debian/libvlc2.symbols b/debian/libvlc2.symbols
index 02e9e96..05bfbad 100644
--- a/debian/libvlc2.symbols
+++ b/debian/libvlc2.symbols
@@ -38,6 +38,7 @@ libvlc.so.2 libvlc2 #MINVER#
  libvlc_log_iterator_next at Base 0.9.1
  libvlc_log_open at Base 0.9.1
  libvlc_media_add_option at Base 0.9.1
+ libvlc_media_add_option_untrusted at Base 0.9.9
  libvlc_media_discoverer_event_manager at Base 0.9.1
  libvlc_media_discoverer_is_running at Base 0.9.1
  libvlc_media_discoverer_localized_name at Base 0.9.1
@@ -144,6 +145,7 @@ libvlc.so.2 libvlc2 #MINVER#
  libvlc_new at Base 0.9.1
  libvlc_playlist_add at Base 0.9.1
  libvlc_playlist_add_extended at Base 0.9.1
+ libvlc_playlist_add_extended_untrusted at Base 0.9.9
  libvlc_playlist_clear at Base 0.9.1
  libvlc_playlist_delete_item at Base 0.9.1
  libvlc_playlist_get_current_index at Base 0.9.1
diff --git a/debian/libvlccore0.symbols b/debian/libvlccore0.symbols
index 7e62296..0ab1641 100644
--- a/debian/libvlccore0.symbols
+++ b/debian/libvlccore0.symbols
@@ -342,6 +342,7 @@ libvlccore.so.0 libvlccore0 #MINVER#
  plane_CopyPixels at Base 0.9.1
  playlist_Add at Base 0.9.1
  playlist_AddExt at Base 0.9.1
+ playlist_AddExtOpt at Base 0.9.9
  playlist_AddInput at Base 0.9.1
  playlist_AskForArtEnqueue at Base 0.9.1
  playlist_BothAddInput at Base 0.9.1
diff --git a/debian/patches/052_as-needed.diff b/debian/patches/052_as-needed.diff
index 9beab21..729a40f 100644
--- a/debian/patches/052_as-needed.diff
+++ b/debian/patches/052_as-needed.diff
@@ -1,3 +1,6 @@
+Patch originally taken from the BTS #347650 and then adapted for 
+later libtool version
+
 Index: vlc-0.9.1/autotools/ltmain.sh
 ===================================================================
 --- vlc-0.9.1.orig/autotools/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
diff --git a/debian/patches/101_certificates_paths.diff b/debian/patches/101_certificates_paths.diff
index ed73706..2f501c1 100644
--- a/debian/patches/101_certificates_paths.diff
+++ b/debian/patches/101_certificates_paths.diff
@@ -1,3 +1,7 @@
+Add the certificates from the ca-certificates package to the path where gnutls
+look for certificates
+
+
 Index: vlc-debian/modules/misc/gnutls.c
 ===================================================================
 --- vlc-debian.orig/modules/misc/gnutls.c	2008-06-01 00:46:01.000000000 +0200
diff --git a/debian/patches/102_dejavu_font.diff b/debian/patches/102_dejavu_font.diff
index e435a1e..d30d45f 100644
--- a/debian/patches/102_dejavu_font.diff
+++ b/debian/patches/102_dejavu_font.diff
@@ -1,3 +1,5 @@
+Change the default font to one very likely to be present on a Debian box
+
 Index: vlc-debian/modules/misc/freetype.c
 ===================================================================
 --- vlc-debian.orig/modules/misc/freetype.c	2008-06-01 00:46:01.000000000 +0200
diff --git a/debian/patches/104_notify.diff b/debian/patches/104_notify.diff
index ce20294..e5c6ef8 100644
--- a/debian/patches/104_notify.diff
+++ b/debian/patches/104_notify.diff
@@ -1,3 +1,7 @@
+We don't install the icons where upstream expects them.
+so modify the code where needed.
+
+
 Index: vlc-0.9.1/modules/misc/notify/notify.c
 ===================================================================
 --- vlc-0.9.1.orig/modules/misc/notify/notify.c	2008-08-25 23:40:43.000000000 +0200
diff --git a/debian/patches/200_osdmenu_paths.diff b/debian/patches/200_osdmenu_paths.diff
index 6ae76b4..4fcb6ee 100644
--- a/debian/patches/200_osdmenu_paths.diff
+++ b/debian/patches/200_osdmenu_paths.diff
@@ -1,3 +1,5 @@
+Use the installed files for osdmenu rather than the ones in the current dir
+
 Index: vlc-debian/share/osdmenu/default.cfg
 ===================================================================
 --- vlc-debian.orig/share/osdmenu/default.cfg	2008-06-01 00:46:01.000000000 +0200
diff --git a/debian/patches/300_manpage_syntax.diff b/debian/patches/300_manpage_syntax.diff
index 02dc4b6..6176207 100644
--- a/debian/patches/300_manpage_syntax.diff
+++ b/debian/patches/300_manpage_syntax.diff
@@ -1,3 +1,5 @@
+Add a note about the videolan-doc package (even if it's not really up-to-date)
+
 Index: vlc-debian/doc/vlc.1
 ===================================================================
 --- vlc-debian.orig/doc/vlc.1	2008-01-20 00:13:51.000000000 +0000
diff --git a/debian/patches/402_fortune_pruning.diff b/debian/patches/402_fortune_pruning.diff
new file mode 100644
index 0000000..7bffa1e
--- /dev/null
+++ b/debian/patches/402_fortune_pruning.diff
@@ -0,0 +1,34 @@
+commit 7bbb46c1e2d22e7a144bcca18f6e0ca1e0eaf8e2
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date:   Thu Mar 5 12:11:43 2009 +0100
+
+    Remove insult in the fortunes...
+    
+    This doesn't mean I don't share the opinion, but let's try to ease the work for packagers that get bugs on that part.
+    And of course VLC + debian-multimedia in debian is still completly broken...
+
+diff --git a/doc/fortunes.txt b/doc/fortunes.txt
+index 9406996..2ee386f 100644
+--- a/doc/fortunes.txt
++++ b/doc/fortunes.txt
+@@ -76,20 +76,6 @@
+ 
+   -- #videolan
+ %
+-<sam> CHRISTIAN
+-<sam> MARILLAT
+-<sam> IS
+-<sam> A
+-<sam> COMPLETE
+-<sam>  ____ ___ ____ _  ___   _ _____    _    ____    _ 
+-<sam> |  _ \_ _/ ___| |/ / | | | ____|  / \  |  _ \  | |
+-<sam> | | | | | |   | ' /| |_| |  _|   / _ \ | | | | | |
+-<sam> | |_| | | |___| . \|  _  | |___ / ___ \| |_| | |_|
+-<sam> |____/___\____|_|\_\_| |_|_____/_/   \_\____/  (_)
+-<sam> 
+-
+-  -- #videolan
+-%
+ <bozo> you really shouldn't have touched a computer when you were a little boy
+ <stef> _it_ came to me
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3db5726..67d537b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@
 300_manpage_syntax.diff
 301_DVD_media.diff
 401_detect_xinerama_fullscreen.diff
-vlc-notify.diff
+402_fortune_pruning.diff
diff --git a/debian/patches/vlc-notify.diff b/debian/patches/vlc-notify.diff
deleted file mode 100644
index 7ce6b44..0000000
--- a/debian/patches/vlc-notify.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-=== modified file 'modules/misc/notify/notify.c'
---- vlc-0.9.8a/modules/misc/notify/notify.c	2008-11-28 09:56:50 +0000
-+++ vlc-0.9.8a/modules/misc/notify/notify.c	2009-02-25 12:38:32 +0000
-@@ -272,6 +272,35 @@
-     pl_Release( ((vlc_object_t*) p) );
- }
- 
-+static gboolean
-+can_support_actions ()
-+{
-+    static gboolean supports_actions = FALSE;
-+    static gboolean have_checked = FALSE;
-+
-+    if( !have_checked ) {
-+        GList *caps = NULL;
-+        GList *c;
-+
-+        have_checked = TRUE;
-+
-+        caps = notify_get_server_caps ();
-+        if( caps != NULL ) {
-+            for( c = caps; c != NULL; c = c->next ) {
-+                if( strcmp( (char*)c->data, "actions" ) == 0 ) {
-+                    supports_actions = TRUE;
-+                    break;
-+                }
-+            }
-+        }
-+
-+	g_list_foreach( caps, (GFunc)g_free, NULL );
-+	g_list_free( caps );
-+    }
-+
-+    return supports_actions;
-+}
-+
- static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
-                    intf_thread_t *p_intf )
- {
-@@ -296,11 +325,13 @@
-         gdk_pixbuf_unref( pix );
-     }
- 
--    /* Adds previous and next buttons in the notification */
--    notify_notification_add_action( notification, "previous", _("Previous"), Prev,
--                                    (gpointer*) p_intf, NULL );
--    notify_notification_add_action( notification, "next", _("Next"), Next,
--                                    (gpointer*) p_intf, NULL );
-+    /* Adds previous and next buttons in the notification if actions are supported. */
-+    if( can_support_actions() ) {
-+      notify_notification_add_action( notification, "previous", _("Previous"), Prev,
-+				      (gpointer*) p_intf, NULL );
-+      notify_notification_add_action( notification, "next", _("Next"), Next,
-+				      (gpointer*) p_intf, NULL );
-+    }
- 
-     notify_notification_show( notification, NULL);
- 
-
diff --git a/debian/rules b/debian/rules
index 0abac5b..b85d6a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 #DH_VERBOSE=1
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 VERSION = $(shell  dpkg-parsechangelog|sed -n 's/^Version: //p')
@@ -30,7 +30,7 @@ include /usr/share/quilt/quilt.make
 LDFLAGS = -Wl,--as-needed
 
 # configure flags
-confflags += --enable-maintaner-mode --enable-release --prefix=/usr
+confflags += --enable-maintainer-mode --enable-release --prefix=/usr
 confflags += \
 	--enable-libtool \
 	--enable-fast-install \
@@ -44,10 +44,9 @@ confflags += \
 	--enable-sdl \
 	--enable-esd \
 	--enable-mad \
-	--enable-alsa \
 	--enable-jack \
-        --enable-pulse \
-        --enable-lirc \
+	--enable-pulse \
+	--enable-lirc \
 	--enable-a52 \
 	--enable-aa \
 	--enable-dvbpsi \
@@ -98,6 +97,7 @@ confflags += \
 	--enable-libass \
 	--enable-libdca \
 	--enable-realrtsp \
+	--disable-dv \
 	--enable-x264 \
 	$(NULL)
 
@@ -105,11 +105,11 @@ confflags += \
 
 # Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-confflags += --enable-alsa --enable-dv --enable-v4l --enable-v4l2 --enable-pvr
+confflags += --enable-alsa --enable-v4l --enable-v4l2 --enable-pvr
 endif
 
 # svgalib is only for x86 and x86-64 on Linux
-ifneq ($(filter $(DEB_BUILD_ARCH), amd64 i386),)
+ifneq ($(filter $(DEB_HOST_ARCH), amd64 i386),)
 confflags += --enable-svgalib
 endif
 
@@ -144,7 +144,7 @@ clean-real:
 	dh_testroot
 	rm -f build-stamp
 	# Clean VLC
-	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -rf tmp/
 	# Clean zsh completion stuff
 	rm -f extras/zsh
@@ -181,6 +181,11 @@ install: build
 	mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
 	# Install stuff
 	dh_install -si --fail-missing --sourcedir=debian/tmp
+	# move .hosts
+	mkdir -p debian/vlc-data/etc/vlc/http
+	mv debian/vlc-data/usr/share/vlc/http/.hosts debian/vlc-data/etc/vlc/http
+	ln -s /etc/vlc/http/hosts debian/vlc-data/usr/share/vlc/http/.hosts
+
 	#install BTS stuff
 	mkdir -p  debian/vlc-nox/usr/share/bug/vlc-nox
 	cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox
@@ -227,6 +232,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog -p vlc
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_desktop
+	dh_lintian 
 	dh_strip -s --dbg-package=vlc-dbg
 	dh_compress -s
 	dh_fixperms -s
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 2a2be7a..6f7da8f 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -4,7 +4,6 @@ usr/bin/rvlc
 usr/bin/vlc
 usr/bin/vlc-wrapper
 usr/lib/vlc/access/libaccess_directory_plugin.so
-usr/lib/vlc/access/libaccess_dv_plugin.so
 usr/lib/vlc/access/libaccess_fake_plugin.so
 usr/lib/vlc/access/libaccess_file_plugin.so
 usr/lib/vlc/access/libaccess_ftp_plugin.so
@@ -129,6 +128,7 @@ usr/lib/vlc/video_filter/libswscale_plugin.so
 usr/lib/vlc/video_filter/libtransform_plugin.so
 usr/lib/vlc/video_filter/libwall_plugin.so
 usr/lib/vlc/video_filter/libwave_plugin.so
+usr/lib/vlc/video_output/libcaca_plugin.so
 usr/lib/vlc/video_output/libimage_plugin.so
 usr/lib/vlc/video_output/libvmem_plugin.so
 usr/lib/vlc/visualization/libvisual_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index c079eb4..26a8c67 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -9,7 +9,6 @@ usr/lib/vlc/misc/libnotify_plugin.so
 usr/lib/vlc/misc/libscreensaver_plugin.so
 usr/lib/vlc/video_filter/libpanoramix_plugin.so
 usr/lib/vlc/video_output/libaa_plugin.so
-usr/lib/vlc/video_output/libcaca_plugin.so
 usr/lib/vlc/video_output/libglx_plugin.so
 usr/lib/vlc/video_output/libopengl_plugin.so
 usr/lib/vlc/video_output/libx11_plugin.so
diff --git a/debian/vlc.lintian-overrides b/debian/vlc.lintian-overrides
new file mode 100644
index 0000000..d0b97d0
--- /dev/null
+++ b/debian/vlc.lintian-overrides
@@ -0,0 +1,2 @@
+vlc binary: desktop-command-not-in-package /usr/share/applications/vlc.desktop vlc
+vlc binary: menu-icon-missing /usr/share/vlc/vlc.xpm

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list