The following commit has been merged in the master branch:
commit ceb2b636750b9b7b70d1f30c669482dd79ef3bed
Author: Rafael Laboissiere <[email protected]>
Date: Sun May 6 22:14:07 2012 +0200
debian/rules: Switch from CDBS to dh
Also, drop cdbs from the Build-Depends.
diff --git a/debian/control b/debian/control
index 9020362..a199249 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Med Packaging Team
<[email protected]>
Uploaders: Andreas Tille <[email protected]>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), cdbs, libasound2-dev, quilt, libgtk2.0-dev
+Build-Depends: debhelper (>= 8), libasound2-dev, quilt, libgtk2.0-dev
Standards-Version: 3.9.3
Homepage: http://www.praat.org
Vcs-Git: git://git.debian.org/debian-med/praat.git
diff --git a/debian/rules b/debian/rules
index cbdc4f8..523c936 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,9 @@
# -*- makefile -*-
# debian/rules for the Praat
-# Author: Rafael Laboissiere <[email protected]>
-# Licence: GPL
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
DEBDIR = $(CURDIR)/debian
INSTDIR = $(DEBDIR)/praat
-DB2MAN = $(DEBDIR)/manpage.xsl
-
PIXDIR = usr/share/pixmaps
BINDIR = usr/bin
APPDIR = usr/share/applications
@@ -19,6 +12,9 @@ APPDIR = usr/share/applications
SUBSTCMD = sed 's:@BINDIR@:$(BINDIR):g;s:@PIXDIR@:$(PIXDIR):g; \
s:@APPDIR@:$(APPDIR):g'
+%:
+ dh $@
+
get-upstream-changelog:
# Get upstream changelog (in HTML format) and replace some characters
# for correct display in the final ASCII file
@@ -26,20 +22,26 @@ get-upstream-changelog:
wget -N http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html ; \
perl -pi -e "s/ˈ/'/g;s/ˌ/,/g;" What_s_new_.html )
-build/praat::
+clean:
+ dh clean
+ # Fix the lacking cleaning command for the main/ directory
+ make -C main clean
+ rm -f makefile.defs $(DEBDIR)/praat.dirs \
+ $(DEBDIR)/praat.install $(DEBDIR)/praat.menu
+
+override_dh_auto_configure:
+ # Generate the debhelper files
for i in dirs install menu ; do \
$(SUBSTCMD) < $(DEBDIR)/$$i.in > $(DEBDIR)/praat.$$i ; \
done
-# Get rid of the
-# dpkg-shlibdeps: warning: dependency on lib??? could be avoided if
"debian/praat/usr/bin/praat" were not uselessly linked against it (they use
none of its symbols).
-# warnings and useless dependencies
- sed 's/^LIBS = /& -Wl,--as-needed /' makefiles/makefile.defs.linux >
makefile.defs
- $(MAKE)
-
-clean::
- rm -f `find . -name \*.a -o -name \*.o` praat makefile.defs praat.1 \
- $(DEBDIR)/praat.dirs $(DEBDIR)/praat.install $(DEBDIR)/praat.menu
-
-install/praat::
+ # Get rid of the
+ # dpkg-shlibdeps: warning: dependency on lib??? could be avoided if
"debian/praat/usr/bin/praat" were not uselessly linked against it (they use
none of its symbols).
+ # warnings and useless dependencies
+ sed 's/^LIBS = /& -Wl,--as-needed /' \
+ makefiles/makefile.defs.linux > makefile.defs
+
+override_dh_auto_install::
+ # Install the upstream changelog
dh_installchangelogs debian/What_s_new_.html
rm -f $(INSTDIR)/usr/share/doc/praat/changelog.html
+ dh_auto_install
--
Debian packaging for Praat
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
