cvsd commit: MODIFIED: ., . ...

[Date Prev][Date Next] [Thread Prev][Thread Next]
From: Commits of the cvsd project <cvsd-commits [at] lists.arthurdejong.org>
To: cvsd-commits [at] lists.arthurdejong.org
Reply-to: cvsd-users [at] lists.arthurdejong.org
Subject: cvsd commit: MODIFIED: ., . ...
Date: Sun, 07 Aug 2011 23:11:37 +0200
User: arthur
Date: 11/08/07 23:11:37

Modified:    . Makefile.am
Log:
switch to dh for debian/rules and bump debhelper compatibility to 8


Revision  Changes    Path
1.62      +1 -1      cvsd/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /home/arthur/devel/repos/cvsd/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- Makefile.am 12 Jun 2011 10:47:52 -0000      1.61
+++ Makefile.am 7 Aug 2011 21:11:37 -0000       1.62
@@ -36,7 +36,7 @@
            debian/control debian/changelog debian/rules debian/docs \
            debian/postinst debian/postrm debian/copyright \
            debian/config debian/templates debian/cvsd.init \
-           debian/cvsd.bug.script debian/lintian-overrides \
+           debian/cvsd.bug-script debian/lintian-overrides \
            debian/compat debian/source/format \
            debian/po/POTFILES.in \
            debian/po/templates.pot \



Modified:    . compat control rules
Added:       . cvsd.bug-script
Removed:     . cvsd.bug.script
Log:
switch to dh for debian/rules and bump debhelper compatibility to 8


Revision  Changes    Path
1.3       +1 -1      cvsd/debian/compat

Index: compat
===================================================================
RCS file: /home/arthur/devel/repos/cvsd/debian/compat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- compat      30 Dec 2009 21:53:33 -0000      1.2
+++ compat      7 Aug 2011 21:11:37 -0000       1.3
@@ -1 +1 @@
-7
+8


1.40      +1 -1      cvsd/debian/control

Index: control
===================================================================
RCS file: /home/arthur/devel/repos/cvsd/debian/control,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- control     12 Jun 2011 11:12:38 -0000      1.39
+++ control     7 Aug 2011 21:11:37 -0000       1.40
@@ -2,7 +2,7 @@
 Section: vcs
 Priority: optional
 Maintainer: Arthur de Jong <adejong@debian.org>
-Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends: debhelper (>= 8), po-debconf
 Standards-Version: 3.9.2
 Homepage: http://arthurdejong.org/cvsd/
 Vcs-Cvs: :pserver:anonymous@arthurdejong.org:/arthur/


1.17      +9 -86     cvsd/debian/rules

Index: rules
===================================================================
RCS file: /home/arthur/devel/repos/cvsd/debian/rules,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- rules       30 Dec 2009 21:53:33 -0000      1.16
+++ rules       7 Aug 2011 21:11:37 -0000       1.17
@@ -2,92 +2,15 @@
 
 export DH_VERBOSE=1
 
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+%:
+       dh $@
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       ./configure $(confflags) \
-                   --prefix=/usr \
-                   --mandir=\$${prefix}/share/man \
-                   --infodir=\$${prefix}/share/info \
-                   --sysconfdir=/etc \
+override_dh_auto_configure:
+       dh_auto_configure -- \
                    --enable-warnings \
-                   --disable-dependency-tracking \
                    --with-cvs=/usr/bin/cvs \
                    --with-perl=/usr/bin/perl
-       touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       -test -r /usr/share/misc/config.sub && \
-         cp -f /usr/share/misc/config.sub config.sub
-       -test -r /usr/share/misc/config.guess && \
-         cp -f /usr/share/misc/config.guess config.guess
-       dh_testdir
-       dh_testroot
-       [ ! -f Makefile ] || $(MAKE) distclean
-       dh_clean
-       debconf-updatepo --verbose
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs usr/share/bug/cvsd
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/cvsd
-       # make configfile fully generated
+# make configfile fully generated
+override_dh_install:
        rm -f $(CURDIR)/debian/cvsd/etc/cvsd/cvsd.conf
-       # ship the reportbug script
-       install $(CURDIR)/debian/cvsd.bug.script \
-         $(CURDIR)/debian/cvsd/usr/share/bug/cvsd/script
-       # install a lintian override file
-       install -D -m 644 $(CURDIR)/debian/lintian-overrides \
-               $(CURDIR)/debian/cvsd/usr/share/lintian/overrides/cvsd
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdebconf
-       dh_installdocs
-#      dh_installexamples
-#      dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-       dh_installinit
-#      dh_installcron
-       dh_installman
-#      dh_installinfo
-#      dh_undocumented
-       dh_installchangelogs
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
-#      dh_perl
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch


1.1                  cvsd/debian/cvsd.bug-script

Index: cvsd.bug-script
===================================================================
#!/bin/sh

# cvsd reportbug script - output cvsd configuration info
# Copyright (C) 2004 Arthur de Jong
#
# 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 of the License, 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 St, Fifth Floor, Boston, MA 02110-1301 USA

echo ""
echo "I can automatically add pieces of your cvsd configuration and chroot"
echo "jail layout to your bug report. This information will probably help to"
echo "diagnose the problem."
echo ""
echo "Encrypted passwords are removed from the gathered information but there"
echo "may however be other data you do not want leaked. Please review this"
echo "information before submitting the report!"
echo ""

yesno "Include extra configuration information? [Y/n] " yep

if [ "$REPLY" = "yep" ]; then
  /usr/sbin/cvsd-buginfo >&3
fi



-- 
To unsubscribe send an email to
cvsd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/cvsd-commits
cvsd commit: MODIFIED: ., . ..., Commits of the cvsd project
- <Possible follow-ups>
- cvsd commit: MODIFIED: ., . ..., Commits of the cvsd project
Prev by Date: cvsd commit: MODIFIED: . ...
Next by Date: cvsd commit: MODIFIED: . ...
Previous by thread: cvsd commit: MODIFIED: ., . ...