[debian-edu-commits] r82129 - in trunk/src/desktop-profiles: . debian
pere at alioth.debian.org
pere at alioth.debian.org
Sun Aug 18 06:49:42 UTC 2013
Author: pere
Date: 2013-08-18 06:49:42 +0000 (Sun, 18 Aug 2013)
New Revision: 82129
Added:
trunk/src/desktop-profiles/debian/desktop-profiles.install
trunk/src/desktop-profiles/debian/desktop-profiles.links
trunk/src/desktop-profiles/debian/desktop-profiles.lintian-overrides
trunk/src/desktop-profiles/debian/desktop-profiles.manpages
Removed:
trunk/src/desktop-profiles/debian/desktop-profiles.overrides
Modified:
trunk/src/desktop-profiles/Makefile
trunk/src/desktop-profiles/debian/changelog
trunk/src/desktop-profiles/debian/rules
Log:
Rewrite build rules to use dh.
Modified: trunk/src/desktop-profiles/Makefile
===================================================================
--- trunk/src/desktop-profiles/Makefile 2013-08-18 04:47:50 UTC (rev 82128)
+++ trunk/src/desktop-profiles/Makefile 2013-08-18 06:49:42 UTC (rev 82129)
@@ -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 @@
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
Modified: trunk/src/desktop-profiles/debian/changelog
===================================================================
--- trunk/src/desktop-profiles/debian/changelog 2013-08-18 04:47:50 UTC (rev 82128)
+++ trunk/src/desktop-profiles/debian/changelog 2013-08-18 06:49:42 UTC (rev 82129)
@@ -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.
Added: trunk/src/desktop-profiles/debian/desktop-profiles.install
===================================================================
--- trunk/src/desktop-profiles/debian/desktop-profiles.install (rev 0)
+++ trunk/src/desktop-profiles/debian/desktop-profiles.install 2013-08-18 06:49:42 UTC (rev 82129)
@@ -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
Added: trunk/src/desktop-profiles/debian/desktop-profiles.links
===================================================================
--- trunk/src/desktop-profiles/debian/desktop-profiles.links (rev 0)
+++ trunk/src/desktop-profiles/debian/desktop-profiles.links 2013-08-18 06:49:42 UTC (rev 82129)
@@ -0,0 +1 @@
+usr/share/desktop-profiles/path usr/share/doc/desktop-profiles/examples/path
Copied: trunk/src/desktop-profiles/debian/desktop-profiles.lintian-overrides (from rev 82107, trunk/src/desktop-profiles/debian/desktop-profiles.overrides)
===================================================================
--- trunk/src/desktop-profiles/debian/desktop-profiles.lintian-overrides (rev 0)
+++ trunk/src/desktop-profiles/debian/desktop-profiles.lintian-overrides 2013-08-18 06:49:42 UTC (rev 82129)
@@ -0,0 +1,2 @@
+# shell library, only sourced (executing doesn't make any sense, as it wouldn't do anything)
+desktop-profiles: script-not-executable ./usr/share/desktop-profiles/listingmodule
Added: trunk/src/desktop-profiles/debian/desktop-profiles.manpages
===================================================================
--- trunk/src/desktop-profiles/debian/desktop-profiles.manpages (rev 0)
+++ trunk/src/desktop-profiles/debian/desktop-profiles.manpages 2013-08-18 06:49:42 UTC (rev 82129)
@@ -0,0 +1,6 @@
+desktop-profiles.7
+list-desktop-profiles.1
+update-profile-cache.1
+dh_installlisting.1
+profile-manager.1
+path2listing.1
Deleted: trunk/src/desktop-profiles/debian/desktop-profiles.overrides
===================================================================
--- trunk/src/desktop-profiles/debian/desktop-profiles.overrides 2013-08-18 04:47:50 UTC (rev 82128)
+++ trunk/src/desktop-profiles/debian/desktop-profiles.overrides 2013-08-18 06:49:42 UTC (rev 82129)
@@ -1,2 +0,0 @@
-# shell library, only sourced (executing doesn't make any sense, as it wouldn't do anything)
-desktop-profiles: script-not-executable ./usr/share/desktop-profiles/listingmodule
Modified: trunk/src/desktop-profiles/debian/rules
===================================================================
--- trunk/src/desktop-profiles/debian/rules 2013-08-18 04:47:50 UTC (rev 82128)
+++ trunk/src/desktop-profiles/debian/rules 2013-08-18 06:49:42 UTC (rev 82129)
@@ -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 $@
More information about the debian-edu-commits
mailing list