[27217] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r26026 - trunk/third/moira/debian

daemon@ATHENA.MIT.EDU (Alexander Chernyakhovsky)
Fri May 31 17:21:11 2013

Date: Fri, 31 May 2013 17:21:04 -0400
From: Alexander Chernyakhovsky <achernya@MIT.EDU>
Message-Id: <201305312121.r4VLL4iw013963@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: achernya
Date: 2013-05-31 17:21:04 -0400 (Fri, 31 May 2013)
New Revision: 26026

Added:
   trunk/third/moira/debian/control
Removed:
   trunk/third/moira/debian/control.in
Modified:
   trunk/third/moira/debian/changelog
   trunk/third/moira/debian/compat
   trunk/third/moira/debian/rules
Log:
In moira:
  * Switch to dh7
  * Bump standards version


Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog	2013-05-31 20:51:49 UTC (rev 26025)
+++ trunk/third/moira/debian/changelog	2013-05-31 21:21:04 UTC (rev 26026)
@@ -1,3 +1,10 @@
+debathena-moira (4.0.0-r4113-0debathena2) unstable; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 17:18:31 -0400
+
 debathena-moira (4.0.0-r4113-0debathena1) unstable; urgency=low
 
   * Snapshot moira at r4113 to pick up new firewall-related changes

Modified: trunk/third/moira/debian/compat
===================================================================
--- trunk/third/moira/debian/compat	2013-05-31 20:51:49 UTC (rev 26025)
+++ trunk/third/moira/debian/compat	2013-05-31 21:21:04 UTC (rev 26026)
@@ -1 +1 @@
-6
+7

Copied: trunk/third/moira/debian/control (from rev 26025, trunk/third/moira/debian/control.in)
===================================================================
--- trunk/third/moira/debian/control	                        (rev 0)
+++ trunk/third/moira/debian/control	2013-05-31 21:21:04 UTC (rev 26026)
@@ -0,0 +1,104 @@
+Source: debathena-moira
+Section: debathena/net
+Priority: extra
+Maintainer: Debathena Project <debathena@mit.edu>
+Build-Depends: debhelper (>= 7.0.50~), comerr-dev, libkrb5-dev, libhesiod-dev,
+ libzephyr-dev, libreadline-dev, libncurses-dev, libssl-dev
+Standards-Version: 3.9.3
+
+Package: debathena-moira-clients
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzephyr4-krb5 | libzephyr3-krb
+Conflicts: debathena-moira-update-server (<= 4.0.0+cvs20090728-0debathena1), stella
+Description: Clients for the Moira database
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains clients such as moira, stella, blanche, etc.
+
+Package: debathena-moira-update-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzephyr4-krb5 |
+ libzephyr3-krb
+Description: Athena update_server
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains the update_server daemon, which is used for
+ servers that automatically receive information dumps from moira.
+
+Package: debathena-libmoira0
+Section: debathena/libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: The Moira library
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains the shared Moira library.
+
+Package: debathena-libmoira0-dbg
+Section: debathena/libdevel
+Architecture: any
+Depends: debathena-libmoira0 (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}
+Description: The Moira library - library with debugging symbols
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains an unstripped shared library. It will be used
+ automatically by gdb for debugging libmoira-related issues.
+
+Package: debathena-libmoira-dev
+Section: debathena/libdevel
+Architecture: any
+Provides: libmoira-dev
+Depends: debathena-libmoira0 (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}, comerr-dev, libkrb5-dev, libhesiod-dev,
+ libzephyr-dev, libzephyr4-krb5 | libzephyr3-krb
+Description: Development files for Moira library
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains headers and static libraries for development.
+
+Package: debathena-libmrclient0
+Section: debathena/libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: The Moira client library
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains the shared Moira client library.
+
+Package: debathena-libmrclient0-dbg
+Section: debathena/libdevel
+Architecture: any
+Depends: debathena-libmrclient0 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: The Moira client library - library with debugging symbols.
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains an unstripped shared library. It will be used
+ automatically by gdb for debugging libmrclient-related issues.
+
+Package: debathena-libmrclient-dev
+Section: debathena/libdevel
+Architecture: any
+Depends: debathena-libmrclient0 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}, debathena-libmoira-dev
+Description: Development files for the Moira client library
+ Moira is the Athena Service Management system.  It serves as the 
+ central repository for information about users, groups hosts, print 
+ queues, and several other aspects of the Athena environment.
+ .
+ This package contains headers and static libraries for development.

Modified: trunk/third/moira/debian/rules
===================================================================
--- trunk/third/moira/debian/rules	2013-05-31 20:51:49 UTC (rev 26025)
+++ trunk/third/moira/debian/rules	2013-05-31 21:21:04 UTC (rev 26026)
@@ -1,21 +1,23 @@
 #!/usr/bin/make -f
+%:
+	dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	--without-krb4 --with-krb5 --with-hesiod --with-zephyr \
+	--with-com_err=/usr --without-oracle --without-afs \
+	--disable-rpath --with-openssl
 
-DEB_CONFIGURE_EXTRA_FLAGS += --without-krb4 --with-krb5 --with-hesiod --with-zephyr --with-com_err=/usr --without-oracle --without-afs --disable-rpath --with-openssl
-DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
-DEB_DH_STRIP_ARGS_debathena-libmoira0 += --dbg-package=debathena-libmoira0-dbg
-DEB_DH_STRIP_ARGS_debathena-libmrclient0 += --dbg-package=debathena-libmrclient0-dbg
+override_dh_strip:
+	dh_strip --package=debathena-libmoira0 --dbg-package=debathena-libmoira0-dbg
+	dh_strip --package=debathena-libmrclient0 --dbg-package=debathena-libmrclient0-dbg
+	dh_strip --remaining-packages
 
-common-install-impl::
-	mv $(DEB_DESTDIR)/usr/bin/chfn $(DEB_DESTDIR)/usr/bin/chfn.moira
-	mv $(DEB_DESTDIR)/usr/bin/chsh $(DEB_DESTDIR)/usr/bin/chsh.moira
-	mv $(DEB_DESTDIR)/usr/share/man/man1/chsh.1 \
-		$(DEB_DESTDIR)/usr/share/man/man1/chsh.moira.1
-	mv $(DEB_DESTDIR)/usr/share/man/man1/chfn.1 \
-		$(DEB_DESTDIR)/usr/share/man/man1/chfn.moira.1
-
-clean::
-	rm -f libtool util/rsaref/Makefile
+override_dh_install:
+	dh_install
+	mv debian/debathena-moira-clients/usr/bin/chfn debian/debathena-moira-clients/usr/bin/chfn.moira
+	mv debian/debathena-moira-clients/usr/bin/chsh debian/debathena-moira-clients/usr/bin/chsh.moira
+	mv debian/debathena-moira-clients/usr/share/man/man1/chsh.1 \
+		debian/debathena-moira-clients/usr/share/man/man1/chsh.moira.1
+	mv debian/debathena-moira-clients/usr/share/man/man1/chfn.1 \
+		debian/debathena-moira-clients/usr/share/man/man1/chfn.moira.1


home help back first fref pref prev next nref lref last post