debian: Remove legacy packaging

debian control files are maintained by packagers

Yes there is a "convenience" factor to roll your
own debian package, but this is not maintained by
us and represents a fork from debian packagers.
As with the bit rot of libva.spec, remove this.

fixes #22

Signed-off-by: Sean V Kelley <seanvk@posteo.de>

diff --git a/.gitignore b/.gitignore
index b99c09a..32d8737 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,3 @@ config.sub
 configure
 depcomp
 TAGS
-/debian.upstream/changelog
-/debian.upstream/control

diff --git a/Makefile.am b/Makefile.am
index 37ef353..0eecd50 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = debian.upstream src
+SUBDIRS = src
 
 if ENABLE_TESTS
 SUBDIRS += test
@@ -13,18 +13,4 @@ MAINTAINERCLEANFILES = \
        configure depcomp install-sh ltmain.sh     \
        Makefile.in missing
 
-DEB_BUILDDIR = debian.build
-
-deb:
-       @[ -d debian ] || ln -s debian.upstream debian
-       dpkg-buildpackage -rfakeroot -uc -us
-
-deb.upstream: dist
-       -mkdir -p $(DEB_BUILDDIR)
-       cd $(DEB_BUILDDIR)                              && \
-       rm -rf $(PACKAGE)-$(VERSION)                    && \
-       tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz        && \
-       cd $(PACKAGE)-$(VERSION)                        && \
-       $(MAKE) deb -f Makefile.am
-
 EXTRA_DIST = Android.mk

diff --git a/configure.ac b/configure.ac
index 88403f2..b31afef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,6 @@ AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
 AC_OUTPUT([
     Makefile
-    debian.upstream/Makefile 
     src/Makefile
     src/shaders/Makefile
     src/shaders/h264/Makefile

diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am
deleted file mode 100644 (file)
index 04a848f..0000000
--- a/debian.upstream/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-DEBIANFILES = \
-       changelog.in                            \
-       compat                                  \
-       control.in                              \
-       copyright                               \
-       libva-intel-driver.install              \
-       rules                                   \
-       $(NULL)
-
-DEBIANGENFILES =                               \
-       changelog                               \
-       control                                 \
-       $(NULL)
-
-EXTRA_DIST = $(DEBIANFILES)
-
-dist_noinst_DATA = $(DEBIANGENFILES)
-
-DISTCLEANFILES = $(DEBIANGENFILES)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
-
-$(DEBIANGENFILES): %: %.in Makefile
-       -$(AM_V_GEN)sed \
-         -e 's|\@DATE\@|'"`LC_ALL=C date +'%a, %d %b %Y %X %z'`"'|' \
-         -e 's|\@LIBDRM_VERSION\@|$(LIBDRM_VERSION)|' \
-         -e 's|\@LIBVA_PACKAGE_VERSION\@|$(LIBVA_PACKAGE_VERSION)|' \
-         -e 's|\@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|' \
-         $< > $@

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

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 08b1029..0000000
--- a/debian.upstream/control.in
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: libva-intel-driver
-Section: libs
-Priority: optional
-Maintainer: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-Build-Depends: debhelper (>= 5),
-              cdbs,
-              libdrm-dev (>= @LIBDRM_VERSION@),
-              libva-dev (>= @LIBVA_PACKAGE_VERSION@)
-Standards-Version: 3.7.2
-
-Package: libva-intel-driver
-Section: libs
-Architecture: any
-Depends: libva1 (>= @LIBVA_PACKAGE_VERSION@),
-        ${shlibs:Depends}, ${misc:Depends}
-Description: VA driver for Intel G45 & HD Graphics family
- Video decode & encode driver for Intel G45 chipsets and Intel HD
- Graphics for Intel Core processor family.
-
-Package: libva-intel-driver-dbg
-Section: libdevel
-Architecture: any
-Depends: libva-intel-driver (= ${Source-Version})
-Description: VA driver for Intel G45 & HD Graphics family (debug symbols)
- Video decode & encode driver for Intel G45 chipsets and Intel HD
- Graphics for Intel Core processor family.
- .
- This package contains the debug files.

diff --git a/debian.upstream/copyright b/debian.upstream/copyright
deleted file mode 100644 (file)
index 8f3c4c3..0000000
--- a/debian.upstream/copyright
+++ /dev/null
@@ -1,25 +0,0 @@
-This package is maintained by:
-Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-
-
-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, sub license, 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 (including the
-    next paragraph) shall be included in all copies or substantial portions
-    of the Software.
-
-    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 NON-INFRINGEMENT.
-    IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

diff --git a/debian.upstream/libva-intel-driver.install b/debian.upstream/libva-intel-driver.install
deleted file mode 100644 (file)
index daa01dc..0000000
--- a/debian.upstream/libva-intel-driver.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/dri/*.so

diff --git a/debian.upstream/rules b/debian.upstream/rules
deleted file mode 100755 (executable)
index 40b76be..0000000
--- a/debian.upstream/rules
+++ /dev/null
@@ -1,14 +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/utils.mk
-
-# Allow SMP build
-ifeq ($(DEBIAN_BUILD_NCPUS),)
-  DEBIAN_BUILD_NCPUS = $(shell /usr/bin/getconf _NPROCESSORS_ONLN)
-endif
-ifneq ($(DEBIAN_BUILD_NCPUS),)
-  EXTRA_MAKE_FLAGS += -j$(DEBIAN_BUILD_NCPUS)
-endif
-MAKE += $(EXTRA_MAKE_FLAGS)