From cab81f81aa4c2442185003992540c4c2eaa4552b Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Sat, 27 Apr 2013 18:02:26 -0700 Subject: [master]: Iteratively fix the build process. Signed-off-by: Manoj Srivastava --- debian/changelog | 2 +- debian/rules | 33 +++++++++++++++++++++++++++++---- debian/wm-icons.docs | 10 ++++++++++ debian/wm-icons.install | 9 --------- debian/wm-icons.lintian-overrides | 1 + debian/wm-icons.menu-method | 1 + 6 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 debian/wm-icons.docs delete mode 100644 debian/wm-icons.install create mode 100644 debian/wm-icons.menu-method diff --git a/debian/changelog b/debian/changelog index 82ee1c7..0a7b108 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ wm-icons (0.4.0-6) experimental; urgency=low * Bug fix: "wrong code in postrm update-menu hook", thanks to Ian Zimmerman (Closes: #618434). - -- Manoj Srivastava Sat, 27 Apr 2013 02:26:58 -0700 + -- Manoj Srivastava Sat, 27 Apr 2013 18:53:26 -0700 wm-icons (0.4.0-5) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 52e6bbe..23a63cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,20 @@ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -TMPTOP=debian/wm-icons +SRCTOP:= $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) +TMPTOP=$(SRCTOP)/debian/wm-icons +DOCDIR=$(TMPTOP)/usr/share/doc/wm-icons +INSTALL = install +ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +install_file = $(INSTALL) -p -o root -g root -m 644 +install_program = $(INSTALL) -p -o root -g root -m 755 +install_script = $(INSTALL) -p -o root -g root -m 755 +make_directory = $(INSTALL) -p -d -o root -g root -m 755 +package:=wm-icons +METHODSDIR = $(TMPTOP)/etc/menu-methods +METHODSLOC = $(TMPTOP)/etc/X11/fvwm/wm-icons %: dh $@ --with autoreconf @@ -17,6 +30,18 @@ override_dh_install: ln -s 16x16-general menu; \ ln -s 14x14-general mini; \ ln -s 48x48-general norm;) - mv $(TMPTOP)/usr/share/wm-icons \ - $(TMPTOP)/usr/share/doc/wm-icons/examples/ - rm -rf $(TMPTOP)/usr/share/doc/wm-icons/examples/debian-menu-system + +override_dh_installdocs: + $(make_directory) $(DOCDIR) + $(make_directory) $(METHODSDIR) + mv $(TMPTOP)/usr/share/wm-icons $(DOCDIR)/examples/ + $(install_file) $(DOCDIR)/examples/debian-menu-system/wm-icons.h \ + $(METHODSDIR)/ + $(install_file) $(DOCDIR)/examples/debian-menu-system/wm-icons-data.h \ + $(METHODSDIR)/ + rm -rf $(DOCDIR)/examples/debian-menu-system + dh_installdocs + +#Local variables: +#mode: makefile +#End: diff --git a/debian/wm-icons.docs b/debian/wm-icons.docs new file mode 100644 index 0000000..97cde72 --- /dev/null +++ b/debian/wm-icons.docs @@ -0,0 +1,10 @@ +AUTHORS +NEWS +README +TODO +doc/FAQ +doc/icons.lst +doc/README.3dpixmaps +doc/README.martys +doc/README.penguins +doc/wm-icons.lsm diff --git a/debian/wm-icons.install b/debian/wm-icons.install deleted file mode 100644 index f7049fa..0000000 --- a/debian/wm-icons.install +++ /dev/null @@ -1,9 +0,0 @@ -etc/debian-menu-system/wm-icons etc/menu-methods/ -etc/debian-menu-system/wm-icons.h etc/menu-methods/ -etc/debian-menu-system/wm-icons-data.h etc/menu-methods/ -doc/FAQ usr/share/doc/wm-icons -doc/icons.lst usr/share/doc/wm-icons -doc/README.3dpixmaps usr/share/doc/wm-icons -doc/README.martys usr/share/doc/wm-icons -doc/README.penguins usr/share/doc/wm-icons -doc/wm-icons.lsm usr/share/doc/wm-icons diff --git a/debian/wm-icons.lintian-overrides b/debian/wm-icons.lintian-overrides index f4c3787..0a246c5 100644 --- a/debian/wm-icons.lintian-overrides +++ b/debian/wm-icons.lintian-overrides @@ -1,2 +1,3 @@ wm-icons: menu-method-should-include-menu-h etc/menu-methods/wm-icons-data.h wm-icons: menu-method-should-include-menu-h etc/menu-methods/wm-icons.h +wm-icons: menu-method-should-include-menu-h etc/menu-methods/wm-icons diff --git a/debian/wm-icons.menu-method b/debian/wm-icons.menu-method new file mode 100644 index 0000000..2f7ee74 --- /dev/null +++ b/debian/wm-icons.menu-method @@ -0,0 +1 @@ +etc/debian-menu-system/wm-icons-fvwm2rc-men -- cgit v1.2.3