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

Ryan Niebur ryanryan52 at gmail.com
Mon Jun 8 07:04:08 UTC 2009


The following commit has been merged in the master branch:
commit 4802ae81b9d01c217488a06bb552e2735ee40e50
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Sun Jun 7 23:58:23 2009 -0700

    convert to debhelper 7

diff --git a/debian/changelog b/debian/changelog
index 7e4ac34..e1622b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,13 @@ apt-listbugs (0.1.0) UNRELEASED; urgency=low
   [ Ryan Niebur ]
   * Add DM-Upload-Allowed field, I am now a DM
   * updated Swedish translation, thanks to Martin Bagge (Closes: #531622)
+  * convert to debhelper 7
 
   [ Francesco Poli (t1000) ]
   * improve logic: apt-listbugs may now pin uninstalled packages too
   * simplify code and add some robustness checks in aptcleanup
 
- -- Francesco Poli (t1000) <frx at firenze.linux.it>  Fri, 05 Jun 2009 23:37:18 +0200
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sun, 07 Jun 2009 23:56:40 -0700
 
 apt-listbugs (0.0.96) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index ecf6ddc..a5684ba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ryan Niebur <ryanryan52 at gmail.com>
 DM-Upload-Allowed: yes
 Uploaders: Francesco Poli (t1000) <frx at firenze.linux.it>
-Build-Depends: debhelper (>> 5.0.0), cdbs
+Build-Depends: debhelper (>= 7.0.50)
 Build-Depends-Indep: ruby1.8, rdtool, gettext, time
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/apt-listbugs/apt-listbugs.git
diff --git a/debian/rules b/debian/rules
index 0f11370..60d57f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/scripts/cdbs/class/ruby-vars.mk
 
 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
@@ -22,21 +18,32 @@ update-po:
 %.mo: %.po
 	msgfmt -o $@ $<
 
-
 apt-listbugs.1: apt-listbugs
 	rd2 -r rd/rd2man-lib.rb -o apt-listbugs apt-listbugs
 
-common-build-indep:: apt-listbugs.1 $(MOFILES)
+build: apt-listbugs.1 $(MOFILES)
+	dh $@
+
+binary: binary-indep
+
+binary-indep:
+	dh $@
+
+install:
+	dh $@
 
-clean::
+clean:
+	dh $@
 	rm -f apt-listbugs.1
 	rm -f $(MOFILES)
 	[ ! -f Makefile ] || make clean
 
-common-install-indep:: common-build-indep
+.PHONY: clean build binary-arch binary-indep install
 
-	dh_installdirs
+override_dh_auto_test:
+	@echo "No tests during build"
 
+override_dh_auto_install:
 	# Add here commands to install the package into debian/apt-listbugs.
 	sed -e 's/#APT_LISTBUGS_VERSION#/$(VERSION)/' \
 		-e 's,#!/usr/bin/ruby -Ilib/,#!/usr/bin/ruby -I/usr/share/apt-listbugs,' \
diff --git a/debian/scripts/cdbs/class/ruby-vars.mk b/debian/scripts/cdbs/class/ruby-vars.mk
deleted file mode 100644
index 7d4a362..0000000
--- a/debian/scripts/cdbs/class/ruby-vars.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright (C) 2003 Masato Taruishi <taru at debian.org>
-# Description: Defines useful variables for ruby programs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_ruby_vars
-_cdbs_class_ruby_vars := 1
-
-DEB_RUBY := $(shell grep -e "^Build-Depends" debian/control | sed  -e 's/.*[: ,|]\(ruby[^|, ]*\).*/\1/' | head -1 )
-
-DEB_RUBY_VERSION = $(shell $(DEB_RUBY) -rrbconfig -e 'puts Config::CONFIG["ruby_version"]')
-DEB_RUBY_LIBDIR = $(shell $(DEB_RUBY) -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
-DEB_RUBY_ARCHDIR = $(shell $(DEB_RUBY) -rrbconfig -e 'puts Config::CONFIG["rubyarchdir"]')
-
-endif
-

-- 
apt-listbugs development tree



More information about the Apt-listbugs-commits mailing list