From a0310d8d5c9034c708bec303f85cfc89c2f304f5 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 16 Nov 2010 01:56:17 +0100 Subject: * Switch from CDBS to dh 7 and simplifying packaging by improving Makefiles. - add Makefile - update debian/compat - update debian/control - remove debian/manpages - update debian/rules - update src/Makefile --- debian/changelog | 9 ++++++++- debian/compat | 2 +- debian/control | 10 ++++------ debian/manpages | 1 - debian/rules | 37 ++----------------------------------- 5 files changed, 15 insertions(+), 44 deletions(-) delete mode 100644 debian/manpages (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 46b040a..e9a7017 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,15 @@ mozilla-devscripts (0.25) UNRELEASED; urgency=low - update src/xul-app-data.csv.Ubuntu * Drop backwards compatibility for Icedove/Thunderbird << 3.0. - update src/install-xpi + * Switch from CDBS to dh 7 and simplifying packaging by improving Makefiles. + - add Makefile + - update debian/compat + - update debian/control + - remove debian/manpages + - update debian/rules + - update src/Makefile - -- Benjamin Drung Tue, 16 Nov 2010 00:07:17 +0100 + -- Benjamin Drung Tue, 16 Nov 2010 01:35:04 +0100 mozilla-devscripts (0.24) 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 2ef920c..2a0c057 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Fabien Tassin , Alexander Sack , Alexander Sack , Benjamin Drung -Build-Depends: cdbs, debhelper (>= 5) -Build-Depends-Indep: python, python-support +Build-Depends: debhelper (>= 7), python +Build-Depends-Indep: python-support Standards-Version: 3.9.1 DM-Upload-Allowed: yes Homepage: https://launchpad.net/mozilla-devscripts @@ -26,10 +26,8 @@ Depends: dpkg-dev, ${misc:Depends}, ${perl:Depends}, ${python:Depends} -Suggests: cvs, - git-core, - mercurial +Suggests: cvs, git, mercurial Description: Collection of dev scripts used by Ubuntu Mozilla packages This package contains mozilla-devscripts, a collection of scripts based on Makefile inheritance which provides targets usable by Mozilla - packages in Ubuntu and Debian + packages in Ubuntu and Debian. diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index bf519d7..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -man/*.1 diff --git a/debian/rules b/debian/rules index 8285ed4..2d33f6a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,37 +1,4 @@ #!/usr/bin/make -f -# Copyright (c) 2007-2008 Fabien Tassin -# -# 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: *\(.*\)$$/\1/ p') -DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p') -DEB_ISNATIVE := 1 - -DEB_INDEP_PACKAGES = $(DEB_SOURCE_PACKAGE) -DEB_ARCH_PACKAGES = $(NULL) - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk - -DEB_SRCDIR := $(CURDIR)/src -DEB_MAKE_BUILD_TARGET := build -DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/mozilla-devscripts/ -DEB_MAKE_CHECK_TARGET := test - -DEB_INSTALL_DOCS_ALL := README - -install/mozilla-devscripts:: - dh_pysupport +%: + dh $@ -- cgit v1.2.3