Imported Debian patch 0.5.0+svn5194~dfsg1-2

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index b408e6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.pc

diff --git a/debian/changelog b/debian/changelog
index 5bb52bc3fe086b212ccc60387e9a465809280fdf..16903f5dcb20c5d467940bf9af0a93ea7f6704a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gpac (0.5.0+svn5194~dfsg1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sun, 11 May 2014 19:00:36 -0400
+
 gpac (0.5.0+svn5194~dfsg1-1) experimental; urgency=low
 
   * New upstream version 0.5.0+svn5194~dfsg:

diff --git a/debian/control b/debian/control
index d881fd8b9afc5b8ddd6e5f9060b99680954f9e3c..37a48f21d17d49f901c237c0b34362c8e8fc6345 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders:
  Reinhard Tartler <siretart@tauware.de>,
- Andres Mejia <amejia@debian.org>,
  Alessio Treglia <alessio@debian.org>
 Build-Depends:
  debhelper (>= 9),
@@ -30,6 +29,7 @@ Build-Depends:
  libtheora-dev,
  libusb-1.0-0-dev,
  libvorbis-dev,
+ libwxgtk2.8-dev,
  libxml2-dev,
  libxmlrpc-c3-dev,
  libxv-dev,

diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644 (file)
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes