Skip to content

Commit

Permalink
Merge pull request #2 from grml/modernize
Browse files Browse the repository at this point in the history
Use dh sequencer
  • Loading branch information
zeha authored Oct 4, 2024
2 parents 43c769c + 5218add commit bad8883
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 64 deletions.
16 changes: 13 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ Source: grml-scripts-core
Section: utils
Priority: optional
Maintainer: Michael Prokop <[email protected]>
Build-Depends: debhelper-compat (= 12), dietlibc-dev
Build-Depends:
debhelper-compat (= 12),
dietlibc-dev,
Standards-Version: 3.9.4
Homepage: http://git.grml.org/?p=grml-scripts-core.git
Vcs-git: git://git.grml.org/grml-scripts-core.git
Expand All @@ -12,8 +14,16 @@ Bugs: mailto:[email protected]

Package: grml-scripts-core
Architecture: any
Depends: ${misc:Depends}, less, dash, perl, screen, grml-etc-core, lockfile-progs
Conflicts: grml-scripts (<< 1.4.3)
Depends:
dash,
grml-etc-core,
less,
lockfile-progs,
perl,
screen,
${misc:Depends},
Conflicts:
grml-scripts (<< 1.4.3),
Description: reusable core scripts for the Grml system
This package includes some core scripts for the Grml system.
.
Expand Down
1 change: 0 additions & 1 deletion debian/dirs

This file was deleted.

3 changes: 3 additions & 0 deletions debian/grml-scripts-core.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
compile/cpu-screen usr/bin/
compile/ip-screen usr/bin/
usr_bin/* usr/bin/
4 changes: 4 additions & 0 deletions debian/grml-scripts-core.links
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/code2color.1.gz
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/cpu-screen.1.gz
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/ip-screen.1.gz
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/lesspipe.sh.1.gz
4 changes: 4 additions & 0 deletions debian/grml-scripts-core.lintian-overrides
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
grml-scripts-core: statically-linked-binary [usr/bin/cpu-screen]
grml-scripts-core: statically-linked-binary [usr/bin/ip-screen]
grml-scripts-core: bugs-field-does-not-refer-to-debian-infrastructure mailto:[email protected]
grml-scripts-core: script-with-language-extension [usr/bin/lesspipe.sh]
1 change: 1 addition & 0 deletions debian/grml-scripts-core.manpages
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
manpages/*.1
4 changes: 0 additions & 4 deletions debian/overrides

This file was deleted.

66 changes: 10 additions & 56 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,63 +1,17 @@
#!/usr/bin/make -f
# -*- makefile -*-
# 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
%:
dh $@

build: build-stamp
override_dh_auto_clean:
rm -rf $(CURDIR)/debian/grml-scripts/
make -C compile clean
dh_auto_clean

build-stamp:
dh_testdir
( cd $(CURDIR)/compile/ && make )
touch build-stamp
override_dh_auto_configure:

clean:
dh_testdir
dh_testroot
rm -f build-stamp
override_dh_auto_build:
make -C compile

# Add here commands to clean up after the build process.
rm -rf $(CURDIR)/debian/grml-scripts-core/
( cd compile && make clean )
override_dh_auto_install:

dh_clean

install: build
dh_testdir
dh_testroot
dh_prep
dh_installdirs

# Add here commands to install the package into debian/grml-scripts-core.
cp -a usr_bin/* debian/grml-scripts-core/usr/bin/
install -m 755 compile/cpu-screen debian/grml-scripts-core/usr/bin/cpu-screen
install -m 755 compile/ip-screen debian/grml-scripts-core/usr/bin/ip-screen

# Build architecture-independent files here.
binary-indep:

# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installman manpages/grml-scripts-core.1
dh_link /usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/code2color.1.gz \
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/cpu-screen.1.gz \
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/ip-screen.1.gz \
/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/lesspipe.sh.1.gz
dh_strip
dh_compress
mkdir -p $(CURDIR)/debian/grml-scripts-core/usr/share/lintian/overrides/
cp -av debian/overrides $(CURDIR)/debian/grml-scripts-core/usr/share/lintian/overrides/grml-scripts-core
dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb

binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Empty file removed debian/substvars
Empty file.

0 comments on commit bad8883

Please sign in to comment.