[27081] in Source-Commits
Re: /svn/athena r25935 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Apr 18 17:12:25 2013
Date: Thu, 18 Apr 2013 17:12:15 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201304182047.r3IKldwM005043@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1304181712120.9389@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Thu, 18 Apr 2013, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2013-04-18 16:47:39 -0400 (Thu, 18 Apr 2013)
> New Revision: 25935
>
> Added:
> trunk/debathena/debathena/evolution-wrapper/debian/debathena-evolution-wrapper.displace
> Modified:
> trunk/debathena/debathena/evolution-wrapper/debian/changelog
> trunk/debathena/debathena/evolution-wrapper/debian/control
> trunk/debathena/debathena/evolution-wrapper/debian/rules
> Log:
> In evolution-wrapper:
> * Switch to dh7 from CDBS
> * Remove shlibs:Depends and Build-Dep on lsb-release (both unused)
>
>
> Modified: trunk/debathena/debathena/evolution-wrapper/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/evolution-wrapper/debian/changelog 2013-04-18 19:09:43 UTC (rev 25934)
> +++ trunk/debathena/debathena/evolution-wrapper/debian/changelog 2013-04-18 20:47:39 UTC (rev 25935)
> @@ -1,11 +1,12 @@
> -debathena-evolution-wrapper (10.0.13) UNRELEASED; urgency=low
> +debathena-evolution-wrapper (10.0.13) unstable; urgency=low
>
> * Switch from control.in to control (Trac: #561)
> * Bump Standards-Version to 3.9.3
> * Bump compat level to 7
> - * Replace obsolete divert.mk with config-package.mk
> + * Switch to dh7 from CDBS
> + * Remove shlibs:Depends and Build-Dep on lsb-release (both unused)
>
> - -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:37:41 -0400
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 18 Apr 2013 16:47:34 -0400
>
> debathena-evolution-wrapper (10.0.12) unstable; urgency=low
>
>
> Modified: trunk/debathena/debathena/evolution-wrapper/debian/control
> ===================================================================
> --- trunk/debathena/debathena/evolution-wrapper/debian/control 2013-04-18 19:09:43 UTC (rev 25934)
> +++ trunk/debathena/debathena/evolution-wrapper/debian/control 2013-04-18 20:47:39 UTC (rev 25935)
> @@ -2,12 +2,12 @@
> Section: debathena/web
> Priority: extra
> Maintainer: Debathena Project <debathena@mit.edu>
> -Build-Depends: cdbs, debhelper, dh-buildinfo, config-package-dev (>= 5.0~), lsb-release
> +Build-Depends: debhelper (>= 7.0~), dh-buildinfo, config-package-dev (>= 5.0~)
> Standards-Version: 3.9.3
>
> Package: debathena-evolution-wrapper
> Architecture: all
> -Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome2-gconf-perl, evolution
> +Depends: ${misc:Depends}, libgnome2-gconf-perl, evolution
> Provides: ${diverted-files}
> Conflicts: ${diverted-files}
> Description: Wrapper to configure Evolution for Debathena
>
> Added: trunk/debathena/debathena/evolution-wrapper/debian/debathena-evolution-wrapper.displace
> ===================================================================
> --- trunk/debathena/debathena/evolution-wrapper/debian/debathena-evolution-wrapper.displace (rev 0)
> +++ trunk/debathena/debathena/evolution-wrapper/debian/debathena-evolution-wrapper.displace 2013-04-18 20:47:39 UTC (rev 25935)
> @@ -0,0 +1 @@
> +/usr/bin/evolution.debathena
>
> Modified: trunk/debathena/debathena/evolution-wrapper/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/evolution-wrapper/debian/rules 2013-04-18 19:09:43 UTC (rev 25934)
> +++ trunk/debathena/debathena/evolution-wrapper/debian/rules 2013-04-18 20:47:39 UTC (rev 25935)
> @@ -1,10 +1,4 @@
> #!/usr/bin/make -f
>
> -DEB_AUTO_UPDATE_AUTOCONF = 2.50
> -
> -DEB_DIVERT_EXTENSION=.debathena
> -DEB_DIVERT_FILES_debathena-evolution-wrapper += \
> - /usr/bin/evolution.debathena
> -
> -include /usr/share/cdbs/1/rules/debhelper.mk
> -include /usr/share/cdbs/1/rules/config-package.mk
> +%:
> + dh $@ --with=config-package
>
>
