[SCM] ois/master: Switch to DH 7 short-form.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 6 08:07:54 UTC 2012


The following commit has been merged in the master branch:
commit 9e0a04ac4b7de043b36625d69c1070d4c0114e83
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 6 09:47:04 2012 +0200

    Switch to DH 7 short-form.

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 16c4b05..45e5882 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Philippe Coval <rzr at gna.org>,
  Federico Di Gregorio <fog at debian.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 7.0.50~),
  automake (>= 1.9),
- autotools-dev,
+ dh-autoreconf,
  autoconf,
  libtool,
  libltdl-dev,
diff --git a/debian/libois-dev.docs b/debian/libois-dev.docs
new file mode 100644
index 0000000..484b17a
--- /dev/null
+++ b/debian/libois-dev.docs
@@ -0,0 +1 @@
+ReadMe.txt
diff --git a/debian/libois-dev.examples b/debian/libois-dev.examples
new file mode 100644
index 0000000..e4ecc90
--- /dev/null
+++ b/debian/libois-dev.examples
@@ -0,0 +1 @@
+demos/*.cpp
diff --git a/debian/rules b/debian/rules
index 76422f2..bc95e9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,80 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-#export DH_VERBOSE=1
-CFLAGS = -Wall -g
 export REPACK_SH=$(CURDIR)/debian/repack.sh
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	${SHELL} ./bootstrap
-	./configure --prefix=/usr/
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-
-generated_files=\
- configure  \
- config.status config.guess config.sub config.log \
- ltmain.sh libtool depcomp install-sh missing \
- Makefile  Makefile.in aclocal.m4 \
- */Makefile */Makefile.in */config.h */config.h.in */stamp-h1 \
- *.pc *.tmp \
- mkinstalldirs compile
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	$(MAKE) clean  || echo "# $@"
-	rm -f -- ${generated_files}
-	rm -rf -- */.deps 
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs ./ReadMe.txt
-	dh_installexamples -p libois-dev ./demos/*.cpp
-	dh_install --sourcedir=debian/tmp
-	dh_installman
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
+%:
+	dh $@ --with autoreconf
 
 get-orig-source:
 	uscan --force-download
-
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-#eof "$Id: rzr --  -- rzr at users.sf.net $"

-- 
ois packaging



More information about the pkg-multimedia-commits mailing list