[debian-edu-commits] debian-edu/ 01/01: debian/rules: switch to dh9 style.
Holger Levsen
holger at moszumanska.debian.org
Mon Oct 13 20:37:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-install.
commit b84002174da09fdcbfc6c99295ae714703a19969
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Oct 13 19:12:48 2014 +0000
debian/rules: switch to dh9 style.
---
apt-setup/generators/70debian-edu-install | 0
debian/changelog | 1 +
debian/debian-edu-profile-udeb.dirs | 1 +
debian/rules | 131 +++++-------------------------
lib/debian-edu-common | 0
5 files changed, 24 insertions(+), 109 deletions(-)
diff --git a/apt-setup/generators/70debian-edu-install b/apt-setup/generators/70debian-edu-install
old mode 100644
new mode 100755
diff --git a/debian/changelog b/debian/changelog
index f1e9a5d..c20d5f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ debian-edu-install (1.810) UNRELEASED; urgency=low
* Dutch by Frans Spiesschaert (Closes: #763642)
[ Holger Levsen ]
+ * debian/rules: switch to dh9 style.
* debian/control:
- Bump standards version to 3.9.6.
- Use https for Alioth cgit URL.
diff --git a/debian/debian-edu-profile-udeb.dirs b/debian/debian-edu-profile-udeb.dirs
index 8237152..ca58ae6 100644
--- a/debian/debian-edu-profile-udeb.dirs
+++ b/debian/debian-edu-profile-udeb.dirs
@@ -5,6 +5,7 @@ usr/lib/apt-setup/generators
usr/lib/post-base-installer.d
usr/lib/base-installer.d
usr/lib/debian-edu-install
+usr/lib/pre-pkgsel.d
lib/partman/recipes
lib/partman/recipes-powerpc-powermac_newworld
lib/partman/recipes-powerpc-prep
diff --git a/debian/rules b/debian/rules
index dc64f28..627c4ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,126 +1,39 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
DEFAULTS = \
common networked main-server workstation thin-client-server \
standalone ltsp-chroot
-INSTALL = install -D -m0755
-INSTALL_DATA = install -D -m0644
-
-PACKAGES=$(shell dh_listpackages)
-
-INSTALLUDEB=debian-edu-install-udeb
-PROFILEUDEB=debian-edu-profile-udeb
-VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-ARCH=all
-INSTALLUDEBFILENAME=$(INSTALLUDEB)_$(VERSION)_$(ARCH).udeb
-REPORTBUGUDEBFILENAME=$(REPORTBUGUDEB)_$(VERSION)_$(ARCH).udeb
-PROFILEUDEBFILENAME=$(PROFILEUDEB)_$(VERSION)_$(ARCH).udeb
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- $(MAKE)
+%:
+ dh $@
-clean:
- debconf-updatepo
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- $(MAKE) clean
- dh_clean
-
-install-common: build
- dh_prep
- dh_testdir
- dh_testroot
- dh_installdirs
-
-install-debian-edu-install: install-common
+override_dh_auto_install:
+ #
+ # debian-edu-install
+ #
$(MAKE) install DESTDIR=$(CURDIR)/debian/debian-edu-install
cp debian/debian-edu-install.lintian-override $(CURDIR)/debian/debian-edu-install/usr/share/lintian/overrides/debian-edu-install
- $(INSTALL) -d $(CURDIR)/debian/debian-edu-install/lib/debian-edu-install/
-
-.PHONY: install-debian-edu-profile-udeb
-install-debian-edu-profile-udeb: install-common
- $(INSTALL) base-installer $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/base-installer.d/10debian-edu-profile-udeb
- $(INSTALL) post-base-installer $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/post-base-installer.d/01debian-edu-profile-udeb
- $(INSTALL) pre-pkgsel $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/pre-pkgsel.d/10debian-edu-profile-udeb
- $(INSTALL) finish-install $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/finish-install.d/13debian-edu-profile-udeb
- $(INSTALL) apt-setup/generators/70debian-edu-install $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/apt-setup/generators/70debian-edu-install
- for profile in $(DEFAULTS) ; do \
- $(INSTALL_DATA) preseed-values/defaults.$$profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install ; \
- done
+ #
+ # debian-edu-profile-udeb
+ #
$(MAKE) install-partman-recipes DESTDIR=$(CURDIR)/debian/debian-edu-profile-udeb
- $(INSTALL) lib/partman/not-enough-space.d/01debian-edu-install-udeb $(CURDIR)/debian/debian-edu-profile-udeb/lib/partman/not-enough-space.d/01debian-edu-install-udeb
- $(INSTALL) lib/debian-edu-common $(CURDIR)/debian/debian-edu-profile-udeb/lib/
- $(INSTALL) debian-edu-profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin
touch $(CURDIR)/debian/debian-edu-profile-udeb/etc/uselvm
- $(INSTALL_DATA) version $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install/.
-
for p in edu-etcvcs edu-is-testinstall laptop-detect report-if-disk-too-small edu-eatmydata-install ; do \
- $(INSTALL) tools/$$p $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin/. ; \
+ cp tools/$$p $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin/ ; \
done
+ cp base-installer $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/base-installer.d/10debian-edu-profile-udeb
+ cp post-base-installer $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/post-base-installer.d/01debian-edu-profile-udeb
+ cp pre-pkgsel $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/pre-pkgsel.d/10debian-edu-profile-udeb
+ cp finish-install $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/finish-install.d/13debian-edu-profile-udeb
+ cp apt-setup/generators/70debian-edu-install $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/apt-setup/generators/70debian-edu-install
+ for profile in $(DEFAULTS) ; do \
+ cp preseed-values/defaults.$$profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install ; \
+ done
+ cp lib/partman/not-enough-space.d/01debian-edu-install-udeb $(CURDIR)/debian/debian-edu-profile-udeb/lib/partman/not-enough-space.d/01debian-edu-install-udeb
+ cp lib/debian-edu-common $(CURDIR)/debian/debian-edu-profile-udeb/lib/
+ cp debian-edu-profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin
-# Build architecture-independent files here.
-binary-indep: install debian-edu-install debian-edu-install-udeb debian-edu-profile-udeb
-
-debian-edu-install-udeb: # install-debian-edu-install-udeb
- dh_testdir -p$@
- dh_testroot -p$@
- dh_installdebconf -p$@ -n
- dh_strip -p$@
- dh_compress -p$@
- dh_fixperms -p$@
- cp debian/debian-edu-install-udeb.isinstallable debian/debian-edu-install-udeb/DEBIAN/isinstallable
- chmod 755 debian/debian-edu-install-udeb/DEBIAN/isinstallable
- dh_installdeb -p$@
- dh_gencontrol -p$@ -- -n$(INSTALLUDEBFILENAME)
- dh_builddeb -p$@ --filename=$(INSTALLUDEBFILENAME)
-
-.PHONY: debian-edu-profile-udeb
-debian-edu-profile-udeb: install-debian-edu-profile-udeb
- dh_testdir -p$@
- dh_testroot -p$@
- dh_installdebconf -p$@ -n
- dh_strip -p$@
- dh_compress -p$@
- dh_fixperms -p$@
- cp debian/debian-edu-profile-udeb.isinstallable debian/debian-edu-profile-udeb/DEBIAN/isinstallable
- dh_installdeb -p$@
- dh_gencontrol -p$@ -- -n$(PROFILEUDEBFILENAME)
- dh_builddeb -p$@ --filename=$(PROFILEUDEBFILENAME)
-
-debian-edu-install: install-debian-edu-install
- dh_testdir -p$@
- dh_testroot -p$@
- dh_installdebconf -p$@
- dh_installdocs -p$@
- dh_installexamples -p$@
- dh_installmenu -p$@
- dh_installcron -p$@
- dh_installman -p$@
- dh_installinfo -p$@
+override_dh_installinit:
# Use prefix 99x* to make sure it is the very last script in the boot sequence.
dh_installinit -pdebian-edu-install --name=xdebian-edu-firstboot --no-start -u"start 99 2 3 4 5 ."
- dh_installchangelogs -p$@
- dh_link -p$@
- dh_strip -p$@
- dh_compress -p$@
- dh_fixperms -p$@
- dh_installdeb -p$@
- dh_gencontrol -p$@
- dh_md5sums -p$@
- dh_builddeb -p$@
-
-# Build architecture-dependent files here.
-binary-arch: build install
-binary: binary-indep binary-arch
-.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install configure
diff --git a/lib/debian-edu-common b/lib/debian-edu-common
old mode 100644
new mode 100755
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git
More information about the debian-edu-commits
mailing list