[SCM] mjpegtools/master: Migrate from cdbs to dh 7

lucidfox-guest at users.alioth.debian.org lucidfox-guest at users.alioth.debian.org
Sun May 1 06:40:58 UTC 2011


The following commit has been merged in the master branch:
commit 3a7dd0a2f08bbafb703cc74b1453ba27d118a4ce
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun May 1 13:09:55 2011 +0700

    Migrate from cdbs to dh 7

diff --git a/debian/control b/debian/control
index 7dd0925..85177d7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>,
            Maia Kozheva <sikon at ubuntu.com>
 Bugs: mailto:pkg-multimedia-maintainers at lists.alioth.debian.org
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.41),
                debhelper (>= 7.0.50~),
                libdv4-dev,
                libjpeg62-dev,
diff --git a/debian/rules b/debian/rules
index 492cd6b..3b57d1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 
-binary-predeb/mjpegtools:: binary-predeb/libmjpegtools-1.10-0
-binary-predeb/mjpegtools-gtk:: binary-predeb/libmjpegtools-1.10-0
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-simd-accel
+%:
+	dh $@
 
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-simd-accel
 
-binary-install/mjpegtools::
-	rm -f debian/mjpegtools/usr/bin/glav
+override_dh_install:
+	dh_install --sourcedir=debian/tmp
+	[ ! -f debian/mjpegtools/usr/bin/glav] || rm -f debian/mjpegtools/usr/bin/glav
 
 PACKAGE = mjpegtools
 VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | sed -r "s/Version: (.*)\+debian.*/\1/")

-- 
mjpegtools packaging



More information about the pkg-multimedia-commits mailing list