Remove debian.upstream packaging

https://bugzilla.gnome.org/show_bug.cgi?id=759192

diff --git a/Makefile.am b/Makefile.am
index b10a0c7..1f2bcdb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = debian.upstream gst-libs gst tests docs
+SUBDIRS = gst-libs gst tests docs
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
@@ -12,18 +12,4 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/gtk-doc.make $(srcdir)/m4/gtk-doc.m4  \
        $(NULL)
 
-DEB_BUILDDIR = debian.build
-
-deb:
-       dpkg-buildpackage -rfakeroot -uc -us
-
-deb.upstream: dist-bzip2
-       -mkdir -p $(DEB_BUILDDIR)
-       cd $(DEB_BUILDDIR)                              && \
-       rm -rf $(PACKAGE)-$(VERSION)                    && \
-       tar jxvf ../$(PACKAGE)-$(VERSION).tar.bz2       && \
-       cd $(PACKAGE)-$(VERSION)                        && \
-       $(LN_S) debian.upstream debian                  && \
-       $(MAKE) deb -f Makefile.am
-
 -include $(top_srcdir)/git.mk

diff --git a/configure.ac b/configure.ac
index 554ff34..c16e534 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1067,13 +1067,6 @@ AC_SUBST(pkgconfigdir)
 
 AC_CONFIG_FILES([
     Makefile
-    debian.upstream/Makefile
-    debian.upstream/changelog
-    debian.upstream/control
-    debian.upstream/gstreamer$GST_API_VERSION-vaapi-doc.install:\
-debian.upstream/gstreamer-vaapi-doc.install.in
-    debian.upstream/gstreamer$GST_API_VERSION-vaapi.install:\
-debian.upstream/gstreamer-vaapi.install.in
     docs/Makefile
     docs/reference/Makefile
     docs/reference/libs/Makefile

diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am
deleted file mode 100644 (file)
index ea97d15..0000000
--- a/debian.upstream/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-DOCS = \
-       AUTHORS         \
-       COPYING.LIB     \
-       NEWS            \
-       README          \
-       $(NULL)
-
-DEBIANFILES = \
-       changelog.in                                            \
-       compat                                                  \
-       control.in                                              \
-       copyright                                               \
-       gstreamer-vaapi-doc.install.in                          \
-       gstreamer-vaapi.install.in                              \
-       rules                                                   \
-       $(NULL)
-
-DEBIANGENFILES = \
-       changelog                                               \
-       control                                                 \
-       gstreamer$(GST_API_VERSION)-vaapi-doc.install           \
-       gstreamer$(GST_API_VERSION)-vaapi.install               \
-       $(NULL)
-
-EXTRA_DIST = $(DEBIANFILES)
-
-dist_noinst_DATA = $(DEBIANGENFILES)
-DISTCLEANFILES = $(DEBIANGENFILES)
-
--include $(top_srcdir)/git.mk

diff --git a/debian.upstream/changelog.in b/debian.upstream/changelog.in
deleted file mode 100644 (file)
index e84ef3e..0000000
--- a/debian.upstream/changelog.in
+++ /dev/null
@@ -1,5 +0,0 @@
-gstreamer@GST_API_VERSION@-vaapi (@PACKAGE_VERSION@-1) unstable; urgency=low
-
-  * Autogenerated package, see NEWS file for ChangeLog.
-
- -- Gwenole Beauchesne <gwenole.beauchesne@intel.com>  @TODAY@

diff --git a/debian.upstream/compat b/debian.upstream/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
--- a/debian.upstream/compat
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/debian.upstream/control.in b/debian.upstream/control.in
deleted file mode 100644 (file)
index a66e6c8..0000000
--- a/debian.upstream/control.in
+++ /dev/null
@@ -1,47 +0,0 @@
-Source: gstreamer@GST_API_VERSION@-vaapi
-Section: libs
-Priority: optional
-Maintainer: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-Build-Depends: debhelper (>= 5),
-              cdbs,
-              libglib2.0-dev (>= @GLIB_VERSION_REQUIRED@),
-              libgstreamer@GST_PKG_VERSION@-dev (>= @GST_VERSION_REQUIRED@),
-              libgstreamer-plugins-base@GST_PKG_VERSION@-dev (>= @GST_PLUGINS_BASE_VERSION_REQUIRED@),
-              libgstreamer-plugins-bad@GST_PKG_VERSION@-dev (>= @GST_PLUGINS_BAD_VERSION_REQUIRED@),
-@USE_DRM_TRUE@        libdrm-dev, libudev-dev,
-@USE_X11_TRUE@        libx11-dev, libxrandr-dev,
-@USE_GLX_TRUE@        libgl-dev,
-@USE_WAYLAND_TRUE@            libwayland-dev (>= @WAYLAND_API_VERSION@),
-              libva-dev (>= @LIBVA_PACKAGE_VERSION@),
-              yasm
-Build-Depends-Indep: gtk-doc-tools (>= @GTKDOC_VERSION@)
-Standards-Version: 3.7.2
-
-Package: gstreamer@GST_API_VERSION@-vaapi
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: gstreamer@GST_API_VERSION@-vaapi-doc
-Description: VA-API plugins for GStreamer
- This package contains GStreamer plugins for VA-API support:
- - `vaapidecode': decode bitstreams using VA-API
-@USE_ENCODERS_TRUE@ - `vaapiencode_mpeg2': encode bitstreams using VA-API (MPEG-2 codec)
-@USE_ENCODERS_TRUE@ - `vaapiencode_h264': encode bitstreams using VA-API (H.264 codec)
- - `vaapipostproc': postprocess VA surfaces, e.g. for deinterlacing
- - `vaapisink': a VA-API based video sink
-
-Package: gstreamer@GST_API_VERSION@-vaapi-doc
-Architecture: all
-Section: doc
-Recommends: libgstvaapi@GST_API_VERSION@-dev (= ${source:Version})
-Description: GStreamer VA-API documentation and manuals
- This packages contains documentation for libraries and elements.
-
-Package: gstreamer@GST_API_VERSION@-vaapi-dbg
-Section: libdevel
-Architecture: any
-Depends: gstreamer@GST_API_VERSION@-vaapi (= ${Source-Version})
-Description: VA-API plugins for GStreamer
- VA-API support plugins for GStreamer.
- .
- This package contains the debug files.

diff --git a/debian.upstream/copyright b/debian.upstream/copyright
deleted file mode 100644 (file)
index 4ebb78e..0000000
--- a/debian.upstream/copyright
+++ /dev/null
@@ -1,35 +0,0 @@
-This package is maintained by:
-Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-
-Copyright:
-
-    gstreamer-vaapi helper libraries
-    and plugins elements: LGPL (v2.1 or later)
-
-License:
-
-    Copyright (C) 2010-2011, Splitted-Desktop Systems.
-    Copyright (C) 2011-2014, Intel Corporation.
-    Copyright (C) 2011, Collabora Ltd.
-
-    gstreamer-vaapi helper libraries and plugins elements are available under
-    the terms of the GNU Lesser General Public License v2.1+.
-
-    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.1
-    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., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-

diff --git a/debian.upstream/gstreamer-vaapi-doc.install.in b/debian.upstream/gstreamer-vaapi-doc.install.in
deleted file mode 100644 (file)
index ff90f75..0000000
--- a/debian.upstream/gstreamer-vaapi-doc.install.in
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/gstreamer@GST_API_VERSION@-vaapi

diff --git a/debian.upstream/gstreamer-vaapi.install.in b/debian.upstream/gstreamer-vaapi.install.in
deleted file mode 100644 (file)
index 2417257..0000000
--- a/debian.upstream/gstreamer-vaapi.install.in
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp@plugindir@/libgstvaapi*.so

diff --git a/debian.upstream/rules b/debian.upstream/rules
deleted file mode 100755 (executable)
index fe7eae2..0000000
--- a/debian.upstream/rules
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-# Allow HTML documentation build
-indep_conf_flags = \
-       --with-html-dir=\$${prefix}/share/doc/$(DEB_SOURCE_PACKAGE)
-
-# only build the docs if gtk-doc-tools is installed, i.e. binary-indep is
-# called
-ifeq ($(shell test "`dpkg -l gtk-doc-tools | grep ^ii`" && echo binary-indep),binary-indep)
-indep_conf_flags += --enable-gtk-doc
-endif
-
-DEB_CONFIGURE_EXTRA_FLAGS += $(indep_conf_flags)