[28535] in Source-Commits
moira commit [debian]: Package 4.0.0.2
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jun 29 15:31:08 2015
Date: Mon, 29 Jun 2015 15:31:06 -0400
From: Jonathan D Reed <jdreed@mit.edu>
Message-Id: <201506291931.t5TJV6CC014487@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/moira/commit/2219c095627478adc1f30d28db3d195d27e06abc
commit 2219c095627478adc1f30d28db3d195d27e06abc
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Jun 29 08:54:49 2015 -0400
Package 4.0.0.2
- Update changelog
- Update manpage paths for new directory layout
- Update the rules file to pass -Dmoira to all debhelper commands
- Update dh_clean with the new paths
debian/changelog | 7 +++++++
debian/patches/fix-manpage-paths | 12 ++++++------
debian/rules | 4 ++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bd759c7..1a0b10c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-moira (4.0.0.2-0debathena1) unstable; urgency=low
+
+ * Release 4.0.0.2
+ * Update patches for new directory layout
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 29 Jun 2015 08:53:44 -0400
+
debathena-moira (4.0.0.1.0-0debathena1) unstable; urgency=low
* No-change rebuild to bump version number
diff --git a/debian/patches/fix-manpage-paths b/debian/patches/fix-manpage-paths
index e007148..0c74ec0 100644
--- a/debian/patches/fix-manpage-paths
+++ b/debian/patches/fix-manpage-paths
@@ -1,7 +1,7 @@
-Index: moira/man/update_server.8
+Index: moira/moira/man/update_server.8
===================================================================
---- moira.orig/man/update_server.8 2010-01-04 21:12:54.000000000 -0500
-+++ moira/man/update_server.8 2010-01-04 22:03:58.000000000 -0500
+--- moira.orig/moira/man/update_server.8 2010-01-04 21:12:54.000000000 -0500
++++ moira/moira/man/update_server.8 2010-01-04 22:03:58.000000000 -0500
@@ -14,7 +14,7 @@
it is needed.
.SH OPTIONS
@@ -21,10 +21,10 @@ Index: moira/man/update_server.8
+/etc/srvtab \- It must be able to get rcmd Kerberos tickets.
.SH "SEE ALSO"
The Project Athena Technical Plan section on Moira.
-Index: moira/man/moira.3
+Index: moira/moira/man/moira.3
===================================================================
---- moira.orig/man/moira.3 2010-01-04 22:04:05.000000000 -0500
-+++ moira/man/moira.3 2010-01-04 22:04:20.000000000 -0500
+--- moira.orig/moira/man/moira.3 2010-01-04 22:04:05.000000000 -0500
++++ moira/moira/man/moira.3 2010-01-04 22:04:20.000000000 -0500
@@ -239,9 +239,9 @@
except that it uses strcmp on the elements rather than comparing the
addresses directly.
diff --git a/debian/rules b/debian/rules
index 73ba270..23a7d10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh -Dmoira $@
override_dh_auto_configure:
dh_auto_configure -- \
@@ -25,4 +25,4 @@ override_dh_install:
# Why does distclean not deal with these two makefiles?
override_dh_clean:
dh_clean
- rm -f util/rsaref/Makefile incremental/kerberos/Makefile
+ rm -f moira/util/rsaref/Makefile moira/incremental/kerberos/Makefile
