[SCM] wavbreaker/master: Switch to 3.0 (quilt) packaging format. Adopt DH7 pure form.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue May 17 22:29:39 UTC 2011


The following commit has been merged in the master branch:
commit 80c9795f13cbb71d267da991dad9096a9c304f69
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 18 00:29:00 2011 +0200

    Switch to 3.0 (quilt) packaging format. Adopt DH7 pure form.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b408e6c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.pc
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 552742f..7ca7a88 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: wavbreaker
 Section: x11
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Free Ekanayaka <freee at debian.org>, Thomas Perl <thp at perli.net>
-Build-Depends: debhelper (>= 5),
- quilt,
+Uploaders: Free Ekanayaka <freee at debian.org>,
+ Thomas Perl <thp at perli.net>
+Build-Depends: debhelper (>= 7),
  autotools-dev,
  libxml2-dev,
  libgtk2.0-dev,
diff --git a/debian/rules b/debian/rules
index 0d2ad79..24e6d95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,99 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-include /usr/share/quilt/quilt.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure patch
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp:  config.status
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp #CONFIGURE-STAMP#
-
-	$(MAKE) distclean || true
-	rm -f po/*.gmo po/stamp-po
-	dh_clean 
-
-install: install-arch
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s 
-	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into 
-	# debian/tmp.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/wavbreaker install
-
-	dh_install -s
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-#
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary-indep:
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary-indep binary install install-arch 
+%:
+	dh $@ --parallel --with=autotools_dev
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

-- 
wavbreaker packaging



More information about the pkg-multimedia-commits mailing list