Convert packaging to use dh with overrides and quilt addon.

diff --git a/debian/control b/debian/control
index ac71cb0a4157f855c87a6dbf5d8074c095ead2db..aebfdc444ae23807491736198a225128e4ea50ff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://gpac.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/gpac.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gpac.git
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50~),
  freeglut3-dev,
  liba52-0.7.4-dev,
  libasound2-dev,
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 7),
  libxml2-dev,
  libxmlrpc-c3-dev,
  libxv-dev,
- quilt,
+ quilt (>= 0.46-7~),
  xulrunner-dev
 
 Package: gpac

diff --git a/debian/gpac.docs b/debian/gpac.docs
new file mode 100644 (file)
index 0000000..f4e6595
--- /dev/null
+++ b/debian/gpac.docs
@@ -0,0 +1 @@
+doc/configuration.html

diff --git a/debian/gpac.manpages b/debian/gpac.manpages
new file mode 100644 (file)
index 0000000..a70e6f3
--- /dev/null
+++ b/debian/gpac.manpages
@@ -0,0 +1 @@
+doc/man/*.1

diff --git a/debian/rules b/debian/rules
index 91f7d7bd90dfa3dc7c461a53a308f0957a8ac38b..16c080ff321ee451ef4d5a4411f99f9dbe70589e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,92 +1,22 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEBIAN_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-CFLAGS = -Wall -g
-LDFLAGS=-Wl,--as-needed
-
-ifeq "$(DEBIAN_ARCH)" "amd64"
-       MOREOPTIONS= --use-js=no
-endif
-
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-        CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-        CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-configure: configure-stamp
-configure-stamp: debian/stamp-patched
-       dh_testdir
+%:
+       dh --with quilt $@
 
+override_dh_auto_configure:
        chmod 755 configure
-       ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \
+       dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man \
        --extra-cflags="-fPIC -DPIC -I/usr/include/mozjs -DXP_UNIX $(CFLAGS)" \
        --cc="$(CC)" CXX="$(CXX)" --enable-joystick --disable-ssl
 
-       touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
-       dh_testdir
-
-# -j doesn't work (06 march 2009).
-       $(MAKE)
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       [ ! -f config.mak ] || $(MAKE) distclean
-
-       debian/rules unpatch
-
-       dh_clean config.h bin/gcc/libgpac* *.opic
-       find $(CURDIR) -name *.opic -delete
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
+override_dh_auto_install:
        $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr \
-       moddir=$(CURDIR)/debian/tmp/usr/lib/gpac
-
+               moddir=$(CURDIR)/debian/tmp/usr/lib/gpac
        $(MAKE) install-lib prefix=$(CURDIR)/debian/tmp/usr
 
-       dh_install --fail-missing
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_clean:
+       dh_clean config.h bin/gcc/libgpac*
+       find $(CURDIR) -name *.opic -delete
 
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs Changelog
-       dh_installdocs doc/configuration.html
-       dh_installmenu
-       dh_installman doc/man/*.1
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
+override_dh_shlibdeps:
        dh_shlibdeps -ldebian/libgpac0.4.5/usr/lib
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install