[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. 0.0.96-18-g5bb3b43

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 133f5a9d574b7abd5f9b0f5455d8ce9cbd4108db
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Mon Jun 8 22:53:42 2009 -0700

    move a lot of stuff from debian/rules to Makefile, and remove unneeded stuff

diff --git a/Makefile b/Makefile
index cf4c18f..7053214 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,44 @@
+# bashisms in real-check
 SHELL = /bin/bash
 
-all:
+LINGUAS := $(shell cd po; ls *.po| cut -d'.' -f1)
+MOFILES := $(patsubst %.po,%.mo,$(wildcard po/*.po))
+
+all: apt-listbugs.1 $(MOFILES)
 
 clean:
 	find -name '*~' | xargs rm -f -- 
 	rm -f tests/log/tmp
+	rm -f apt-listbugs.1
+	rm -f $(MOFILES)
 
-check:
+real-check:
 	: > tests/log/SUMMARY 
 	set -e; set -o pipefail; for A in test_*.rb; do echo $$A; ( ./$$A  2>&1 | tee tests/log/$${A/*\//}.log ) && echo "[OK] $$A" >> tests/log/SUMMARY || echo "[NG] $$A" >> tests/log/SUMMARY ; done
 	set -e; set -o pipefail; for A in tests/???_*.sh; do echo $$A; ( bash $$A  2>&1 | tee tests/log/$${A/*\//}.log ) && echo "[OK] $$A" >> tests/log/SUMMARY || echo "[NG] $$A" >> tests/log/SUMMARY ; done
 	cat tests/log/SUMMARY
 
+apt-listbugs.1: apt-listbugs
+	rd2 -r rd/rd2man-lib.rb -o apt-listbugs apt-listbugs
+
 update-po:
-	debian/rules update-po
+	xgettext --language=python apt-listbugs lib/apt-listbugs/logic.rb -o po/apt-listbugs.pot
+	for po in $(LINGUAS); do \
+	  msgmerge -U po/$$po.po po/apt-listbugs.pot; \
+	done
+	for po in $(LINGUAS); do \
+	  echo -n $$po ": "; \
+	  msgfmt -v po/$$po.po -o /dev/null; \
+	done
+
+install:
+	# Add here commands to install the package into debian/apt-listbugs.
+	for mo in $(MOFILES); do \
+	  install -d $(DESTDIR)/usr/share/locale/`basename $$mo .mo`/LC_MESSAGES; \
+	  install -m644 $$mo $(DESTDIR)/usr/share/locale/`basename $$mo .mo`/LC_MESSAGES/apt-listbugs.mo; \
+	done
+
+%.mo: %.po
+	msgfmt -o $@ $<
 
-.PHONY: update-po check clean
+.PHONY: update-po real-check clean all install
diff --git a/debian/rules b/debian/rules
index 21ad3ac..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,4 @@
 #!/usr/bin/make -f
 
-LINGUAS := $(shell cd po; ls *.po| cut -d'.' -f1)
-MOFILES := $(patsubst %.po,%.mo,$(wildcard po/*.po))
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
-DEB_DESTDIR = debian/$(shell dh_listpackages)
-
-update-po:
-	xgettext --language=python apt-listbugs lib/apt-listbugs/logic.rb -o po/apt-listbugs.pot
-	for po in $(LINGUAS); do \
-	  msgmerge -U po/$$po.po po/apt-listbugs.pot; \
-	done
-	for po in $(LINGUAS); do \
-	  echo -n $$po ": "; \
-	  msgfmt -v po/$$po.po -o /dev/null; \
-	done
-
-%.mo: %.po
-	msgfmt -o $@ $<
-
-apt-listbugs.1: apt-listbugs
-	rd2 -r rd/rd2man-lib.rb -o apt-listbugs apt-listbugs
-
-build: apt-listbugs.1 $(MOFILES)
-	dh $@
-
-binary: binary-indep
-
-binary-indep:
+%:
 	dh $@
-
-install:
-	dh $@
-
-clean:
-	dh $@
-	rm -f apt-listbugs.1
-	rm -f $(MOFILES)
-	[ ! -f Makefile ] || make clean
-
-.PHONY: clean build binary-arch binary-indep install
-
-override_dh_auto_test:
-	@echo "No tests during build"
-
-override_dh_auto_install:
-	# Add here commands to install the package into debian/apt-listbugs.
-	for mo in $(MOFILES); do \
-	  install -d $(DEB_DESTDIR)/usr/share/locale/`basename $$mo .mo`/LC_MESSAGES; \
-	  install -m644 $$mo $(DEB_DESTDIR)/usr/share/locale/`basename $$mo .mo`/LC_MESSAGES/apt-listbugs.mo; \
-	done

-- 
apt-listbugs development tree