← Back to branch summary

~ubuntu-branches/ubuntu/utopic/knutclient/utopic

« back to all changes in this revision

Viewing changes to admin/Makefile.common

  • Committer: Bazaar Package Importer
  • Author(s): Arnaud Quette
  • Date: 2008-06-19 11:09:50 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080619110950-izi2q2vd0dhwlpym
Tags: 0.9.4-1
http://bugs.debian.org/471247
* New upstream release
* Merge back Ubuntu changes
* debian/knutclient.menu: update section to fix lintian warnings
* debian/watch: update the pattern for matching new releases (Closes: #471247)
* debian/control:
  - move Homepage to the field and update the URL
  - update Standards-Version to 3.8.0
  - update debhelper Build-Depends to 5.0.51
  - add automake and autoconf to Build-Depends
  - update NUT URL
* debian/rules:
  - fix lintian warning debian-rules-ignores-make-clean-error
  - add a commented call to dh_icons

Show diffs side-by-side

added added

removed removed

Lines of Context:
admin/Makefile.common
6
6
 
7
7
SHELL=/bin/sh
8
8
 
9
 
cvs dist cvs-clean configure.in configure.files subdirs package-messages package-merge:
 
9
cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
10
10
        @admindir=$(admindir); \
11
11
        if test "x$$admindir" = x; then \
12
12
          admindir=.; until test -f $$admindir/admin/cvs.sh; do \
23
23
        if test "$@" = "package-merge"; then \
24
24
                MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
25
25
                $(SHELL) $$admindir/cvs.sh package-merge ;\
26
 
        else MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
 
26
        else \
 
27
                MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
27
28
        fi
28
29
 
29
 
configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
 
30
configure.in: configure.files subdirs
30
31
configure.files: subdirs
31
32
 
 
33
svn: cvs
 
34
 
32
35
.SILENT:
33
36
 
34
 
.PHONY: cvs dist cvs-clean package-merge package-messages
 
37
.PHONY: svn cvs dist package-merge package-messages