[debian-edu-commits] debian-edu/ 180/183: Rewrite build rules to use dh.
Alexander Alemayhu
ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.
commit b34844ff9359c5eb711a396dbc21cac09ea15108
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Sun Aug 18 06:49:42 2013 +0000
Rewrite build rules to use dh.
---
Makefile | 17 +++--
debian/changelog | 6 ++
debian/desktop-profiles.install | 14 +++++
debian/desktop-profiles.links | 1 +
...verrides => desktop-profiles.lintian-overrides} | 0
debian/desktop-profiles.manpages | 6 ++
debian/rules | 73 +---------------------
7 files changed, 41 insertions(+), 76 deletions(-)
diff --git a/Makefile b/Makefile
index 4e7a53e..fa00a19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
#!/usr/bin/make -f
-PREFIX=/usr/local
+DESTDIR =
+PREFIX = /usr
-build: documentation l10n zip-tests
+build: documentation l10n check
documentation: dh_installlisting.1
dh_installlisting.1: dh_installlisting
@@ -23,21 +24,25 @@ pot: po/profile-manager.pot
l10n: po/ca.mo po/cs.mo po/eu.mo po/fr.mo po/it.mo po/nl.mo po/pt.mo po/pt_BR.mo po/sv.mo po/vi.mo
install-l10n: install-ca.mo install-cs.mo install-eu.mo install-fr.mo install-it.mo install-nl.mo install-pt.mo install-pt_BR.mo install-sv.mo install-vi.mo
update-l10n: update-ca.mo update-cs.po update-eu.po update-fr.po update-it.po update-nl.po update-pt.po update-pt_BR.po update-sv.po update-vi.po
-
+
po/%.mo: po/%.po update-%.po
msgfmt -o $@ $<
install-%.mo: po/%.mo
- mkdir -p ${PREFIX}/share/locale/$*/LC_MESSAGES/
- install --mode 644 $< ${PREFIX}/share/locale/$*/LC_MESSAGES/profile-manager.mo
+ install -d $(DESTDIR)${PREFIX}/share/locale/$*/LC_MESSAGES/
+ install --mode 644 $< $(DESTDIR)${PREFIX}/share/locale/$*/LC_MESSAGES/profile-manager.mo
update-%.po: po/%.po po/profile-manager.pot
cd po && intltool-update -g profile-manager -d $*
- cd ..
+
+install: install-l10n
+ ./dh_installlisting
zip-tests:
tar -cvzf tests.tgz tests
+check: zip-tests
+
clean:
if(ls po/*.mo 2> /dev/null > /dev/null); then rm po/*.mo; fi;
if(test -e tests.tgz); then rm tests.tgz; fi
diff --git a/debian/changelog b/debian/changelog
index 6a2e12d..84d1148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+desktop-profiles (1.4.18) UNRELEASED; urgency=low
+
+ * Rewrite build rules to use dh.
+
+ -- Petter Reinholdtsen <pere at debian.org> Sun, 18 Aug 2013 08:32:24 +0200
+
desktop-profiles (1.4.17) unstable; urgency=low
* Update Standards-Version from 3.8.0.0 to 3.9.4. No changes needed.
diff --git a/debian/desktop-profiles.install b/debian/desktop-profiles.install
new file mode 100644
index 0000000..e065ea6
--- /dev/null
+++ b/debian/desktop-profiles.install
@@ -0,0 +1,14 @@
+dh_installlisting update-profile-cache profile-manager usr/bin
+listingmodule get_desktop-profiles_variables path usr/share/desktop-profiles/
+postinst-desktop-profiles usr/share/debhelper/autoscripts/
+profile-snippet zlogin-snippet usr/share/doc/desktop-profiles/examples
+tests.tgz usr/share/doc/desktop-profiles
+list-desktop-profiles usr/bin/
+profile-manager.kmdr usr/share/desktop-profiles/kommander-scripts/
+desktop-profiles etc/default
+desktop-profiles.csh etc/csh/login.d/
+desktop-profiles.fish etc/fish.d/
+desktop-profiles_pshrc.pl etc/pshrc.d/
+desktop-profiles_zoidrc.pl etc/zoidrc.d/
+20desktop-profiles_activateDesktopProfiles etc/X11/Xsession.d/
+path2listing usr/sbin
diff --git a/debian/desktop-profiles.links b/debian/desktop-profiles.links
new file mode 100644
index 0000000..bb79866
--- /dev/null
+++ b/debian/desktop-profiles.links
@@ -0,0 +1 @@
+usr/share/desktop-profiles/path usr/share/doc/desktop-profiles/examples/path
diff --git a/debian/desktop-profiles.overrides b/debian/desktop-profiles.lintian-overrides
similarity index 100%
rename from debian/desktop-profiles.overrides
rename to debian/desktop-profiles.lintian-overrides
diff --git a/debian/desktop-profiles.manpages b/debian/desktop-profiles.manpages
new file mode 100644
index 0000000..d7e003a
--- /dev/null
+++ b/debian/desktop-profiles.manpages
@@ -0,0 +1,6 @@
+desktop-profiles.7
+list-desktop-profiles.1
+update-profile-cache.1
+dh_installlisting.1
+profile-manager.1
+path2listing.1
diff --git a/debian/rules b/debian/rules
index 347c9f4..45fd0b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,71 +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.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build:
- # build man-page for dh_installlisting and generate .mo files (l10n)
- $(MAKE)
-
-clean:
- dh_testdir
- dh_testroot
- # Add here commands to clean up after the build process.
- $(MAKE) clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- # Add here commands to install the package into debian/desktop-profiles.
- # everything done by dh_* scripts
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- install --mode 644 debian/desktop-profiles.overrides debian/desktop-profiles/usr/share/lintian/overrides/desktop-profiles
- $(MAKE) install-l10n PREFIX=./debian/desktop-profiles/usr
- dh_installchangelogs
- dh_installdocs
- dh_installmenu
- dh_installcron
- dh_installman desktop-profiles.7 list-desktop-profiles.1 update-profile-cache.1 dh_installlisting.1 profile-manager.1 path2listing.1
- dh_install dh_installlisting update-profile-cache profile-manager usr/bin
- dh_install listingmodule get_desktop-profiles_variables path usr/share/desktop-profiles/
- dh_install postinst-desktop-profiles usr/share/debhelper/autoscripts/
- dh_link usr/share/desktop-profiles/path usr/share/doc/desktop-profiles/examples/path
- dh_install profile-snippet zlogin-snippet usr/share/doc/desktop-profiles/examples
- dh_install tests.tgz usr/share/doc/desktop-profiles
- dh_install list-desktop-profiles usr/bin/
- dh_install profile-manager.kmdr usr/share/desktop-profiles/kommander-scripts/
- dh_install desktop-profiles etc/default
- dh_install desktop-profiles.csh etc/csh/login.d/
- dh_install desktop-profiles.fish etc/fish.d/
- dh_install desktop-profiles_pshrc.pl etc/pshrc.d/
- dh_install desktop-profiles_zoidrc.pl etc/zoidrc.d/
- dh_install 20desktop-profiles_activateDesktopProfiles etc/X11/Xsession.d/
- dh_install path2listing usr/sbin
- ./dh_installlisting
- dh_installdebconf
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
+# -*- mode: makefile; coding: utf-8 -*-
+%:
+ dh $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git
More information about the debian-edu-commits
mailing list