[SCM] frei0r/master: Simplified debian/rules file

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue May 20 16:02:52 UTC 2014


The following commit has been merged in the master branch:
commit 7b639b6b5eb133e0b5b02d822496708fabe0e0dc
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue May 20 15:19:15 2014 +0200

    Simplified debian/rules file

diff --git a/debian/rules b/debian/rules
index 2695081..8699069 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+# regenerate configure, so that patches to configure.ac take effect
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 pkg = $(DEB_SOURCE_PACKAGE)
@@ -12,19 +14,21 @@ pkgdoc = frei0r-plugins-doc
 #DEB_UPSTREAM_PACKAGE = frei0r-plugins
 #DEB_UPSTREAM_TARBALL_MD5 = a2eb63feeeb0c5cf439ccca276cbf70c
 
-# TODO: have autotools build docs as part of main build, when doxygen is found
-DEB_BUILDDIR_$(pkgdoc) = doc
-build/$(pkgdoc)::
-	$(DEB_MAKE_INVOKE)
-# TODO: have autotools support DESTDIR for doc install target
-#install/$(pkgdoc)::
-#	$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
-DEB_DH_INSTALL_ARGS_$(pkgdoc) = doc/html usr/share/$(pkg)
-# TODO: have autotools support DESTDIR for doc clean target
-#DEB_PHONY_RULES += doc-clean/$(pkgdoc)
-#doc-clean/$(pkgdoc):
-#	$(DEB_MAKE_INVOKE) distclean
-#clean:: doc-clean/$(pkgdoc)
+## # TODO: have autotools build docs as part of main build, when doxygen is found
+## DEB_BUILDDIR_$(pkgdoc) = doc
+## build/$(pkgdoc)::
+## 	$(DEB_MAKE_INVOKE)
+## # TODO: have autotools support DESTDIR for doc install target
+## #install/$(pkgdoc)::
+## #	$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
+## DEB_DH_INSTALL_ARGS_$(pkgdoc) = doc/html usr/share/$(pkg)
+## # TODO: have autotools support DESTDIR for doc clean target
+## #DEB_PHONY_RULES += doc-clean/$(pkgdoc)
+## #doc-clean/$(pkgdoc):
+## #	$(DEB_MAKE_INVOKE) distclean
+## #clean:: doc-clean/$(pkgdoc)
+
 clean::
 	rm -f $(patsubst %,doc/html/*.%,html js css png map md5)
 	rm -f doc/Makefile
+#	rm -f Makefile aclocal.m4 config.log config.status configure

-- 
frei0r packaging



More information about the pkg-multimedia-commits mailing list