[Glibc-bsd-commits] r3698 - in trunk/istgt/debian: . patches
Arno Töll
atoell-guest at alioth.debian.org
Mon Sep 12 17:40:15 UTC 2011
Author: atoell-guest
Date: 2011-09-12 17:40:15 +0000 (Mon, 12 Sep 2011)
New Revision: 3698
Removed:
trunk/istgt/debian/patches/handle-destdir.patch
trunk/istgt/debian/patches/make-build-failures-fatal.patch
Modified:
trunk/istgt/debian/changelog
trunk/istgt/debian/patches/fix-installdir.patch
trunk/istgt/debian/patches/series
Log:
Package new upstream version, refresh fix-installdir.patch, remove patches merged upstream
Modified: trunk/istgt/debian/changelog
===================================================================
--- trunk/istgt/debian/changelog 2011-09-04 13:28:35 UTC (rev 3697)
+++ trunk/istgt/debian/changelog 2011-09-12 17:40:15 UTC (rev 3698)
@@ -1,10 +1,14 @@
-istgt (0.4~20110717-2) UNRELEASED; urgency=low
+istgt (0.4~20110907-1) UNRELEASED; urgency=low
+ * New upstream release
* Make debian/copyright more readable
* Provide a non-functional watch file to follow glibc-bsd conventions to
denote the problem with it in a comment
* Fix a not detected build failure due to a problem in upstream's Makefile
- for the GNU/Hurd architecture (`make-build-failures-fatal.patch').
+ for the GNU/Hurd architecture (`make-build-failures-fatal.patch'). This
+ patch has been forwarded and merged upstream
+ * Remove `handle-destdir.patch' - it has been merged upstream
+ * Refresh `fix-installdir.patch'
-- Arno Töll <debian at toell.net> Sun, 21 Aug 2011 08:01:52 -0400
Modified: trunk/istgt/debian/patches/fix-installdir.patch
===================================================================
--- trunk/istgt/debian/patches/fix-installdir.patch 2011-09-04 13:28:35 UTC (rev 3697)
+++ trunk/istgt/debian/patches/fix-installdir.patch 2011-09-12 17:40:15 UTC (rev 3698)
@@ -12,29 +12,14 @@
$(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
install: install-dirs
-- install -c -m 0755 istgt $(DESTDIR)/$(bindir)
-- install -c -m 0755 istgtcontrol $(DESTDIR)/$(bindir)
-+ install -c -m 0755 istgt $(DESTDIR)/$(sbindir)
-+ install -c -m 0755 istgtcontrol $(DESTDIR)/$(sbindir)
+- install -c -m 0755 istgt $(DESTDIR)$(bindir)
+- install -c -m 0755 istgtcontrol $(DESTDIR)$(bindir)
++ install -c -m 0755 istgt $(DESTDIR)$(sbindir)
++ install -c -m 0755 istgtcontrol $(DESTDIR)$(sbindir)
install-dirs:
-- mkdir -p $(DESTDIR)/$(bindir)
-+ mkdir -p $(DESTDIR)/$(sbindir)
+- mkdir -p $(DESTDIR)$(bindir)
++ mkdir -p $(DESTDIR)$(sbindir)
dist: $(DISTFILES)
mkdir $(DISTDIR)/$(subdir)
---- a/doc/istgt.1.in
-+++ b/doc/istgt.1.in
-@@ -46,10 +46,10 @@
- .SH FILES
- .PD 0
- .TP
--.I %%PREFIX%%/etc/istgt/istgt.conf
-+.I /etc/istgt/istgt.conf
- Configuration file
- .TP
--.I %%PREFIX%%/etc/istgt/auth.conf
-+.I /etc/istgt/auth.conf
- Authentication information file
- .TP
- .I /var/run/istgt.pid
Deleted: trunk/istgt/debian/patches/handle-destdir.patch
===================================================================
--- trunk/istgt/debian/patches/handle-destdir.patch 2011-09-04 13:28:35 UTC (rev 3697)
+++ trunk/istgt/debian/patches/handle-destdir.patch 2011-09-12 17:40:15 UTC (rev 3698)
@@ -1,92 +0,0 @@
-Description: Make the Makefile honor $(DESTDIR)
- The Makefile does not honor the $(DESTDIR) environment variable
- which is used to build Debian packages (see [1]).
- .
- * doc/Makefile.in: Add $(DESTDIR) to install targets
- * etc/Makefile.in: Same
- * src/Makefile.in: Same
-
- [1] http://www.gnu.org/prep/standards/standards.html#DESTDIR
-
-Forwarded: not-needed
-Author: Arno Töll <debian at toell.net>
-
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -39,21 +39,21 @@
- done
-
- install: install-dirs
-- install -c -m 0644 istgt.1 $(mandir)/man1/
-- -rm -f $(mandir)/man1/istgt.1.gz
-- gzip -9 $(mandir)/man1/istgt.1
-+ install -c -m 0644 istgt.1 $(DESTDIR)/$(mandir)/man1/
-+ -rm -f $(DESTDIR)/$(mandir)/man1/istgt.1.gz
-+ gzip -9 $(DESTDIR)/$(mandir)/man1/istgt.1
-
- install-doc: install-doc-dirs
-- install -c -m 0644 $(top_srcdir)/README $(datadir)/doc/istgt/
-- install -c -m 0644 $(top_srcdir)/ChangeLog.jp $(datadir)/doc/istgt/
-- install -c -m 0644 QUICKSTART $(datadir)/doc/istgt/
-- install -c -m 0644 QUICKSTART.jp $(datadir)/doc/istgt/
-+ install -c -m 0644 $(top_srcdir)/README $(DESTDIR)/$(datadir)/doc/istgt/
-+ install -c -m 0644 $(top_srcdir)/ChangeLog.jp $(DESTDIR)/$(datadir)/doc/istgt/
-+ install -c -m 0644 QUICKSTART $(DESTDIR)/$(datadir)/doc/istgt/
-+ install -c -m 0644 QUICKSTART.jp $(DESTDIR)/$(datadir)/doc/istgt/
-
- install-dirs:
-- mkdir -p $(mandir)/man1
-+ mkdir -p $(DESTDIR)/$(mandir)/man1
-
- install-doc-dirs:
-- mkdir -p $(datadir)/doc/istgt
-+ mkdir -p $(DESTDIR)/$(datadir)/doc/istgt
-
- clean:
- -rm -f istgt.1
---- a/etc/Makefile.in
-+++ b/etc/Makefile.in
-@@ -44,19 +44,19 @@
- done
-
- install: install-dirs
-- install -c -m 0644 istgt.conf $(sysconfdir)/istgt/istgt.conf.sample
-+ install -c -m 0644 istgt.conf $(DESTDIR)/$(sysconfdir)/istgt/istgt.conf.sample
- install -c -m 0644 istgt.large.conf \
-- $(sysconfdir)/istgt/istgt.large.conf.sample
-- install -c -m 0600 auth.conf $(sysconfdir)/istgt/auth.conf.sample
-- install -c -m 0600 istgtcontrol.conf $(sysconfdir)/istgt/istgtcontrol.conf.sample
-+ $(DESTDIR)/$(sysconfdir)/istgt/istgt.large.conf.sample
-+ install -c -m 0600 auth.conf $(DESTDIR)/$(sysconfdir)/istgt/auth.conf.sample
-+ install -c -m 0600 istgtcontrol.conf $(DESTDIR)/$(sysconfdir)/istgt/istgtcontrol.conf.sample
- # if [ ! -f $(sysconfdir)/rc.d/istgt ]; then \
- # install -c -m 0555 istgt.sh $(sysconfdir)/rc.d/istgt; \
- # fi
-- install -c -m 0555 istgt.sh $(sysconfdir)/rc.d/istgt
-+ install -c -m 0555 istgt.sh $(DESTDIR)/$(sysconfdir)/rc.d/istgt
-
- install-dirs:
-- mkdir -p $(sysconfdir)/istgt
-- mkdir -p $(sysconfdir)/rc.d
-+ mkdir -p $(DESTDIR)/$(sysconfdir)/istgt
-+ mkdir -p $(DESTDIR)/$(sysconfdir)/rc.d
-
- clean:
- -rm -f istgt.large.conf istgt.conf istgt.sh
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -83,11 +83,11 @@
- $(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
-
- install: install-dirs
-- install -c -m 0755 istgt $(bindir)
-- install -c -m 0755 istgtcontrol $(bindir)
-+ install -c -m 0755 istgt $(DESTDIR)/$(bindir)
-+ install -c -m 0755 istgtcontrol $(DESTDIR)/$(bindir)
-
- install-dirs:
-- mkdir -p $(bindir)
-+ mkdir -p $(DESTDIR)/$(bindir)
-
- dist: $(DISTFILES)
- mkdir $(DISTDIR)/$(subdir)
Deleted: trunk/istgt/debian/patches/make-build-failures-fatal.patch
===================================================================
--- trunk/istgt/debian/patches/make-build-failures-fatal.patch 2011-09-04 13:28:35 UTC (rev 3697)
+++ trunk/istgt/debian/patches/make-build-failures-fatal.patch 2011-09-12 17:40:15 UTC (rev 3698)
@@ -1,68 +0,0 @@
-Description: Make `make' errors fatal
- Currently, the Makefile does not detect when a subsequent call to `make'
- in a subdirectory failed for some reasons. This patch checks return status
- of those calls and makes the top level Makefile fail if needed.
- .
- * Makefile.in: Add sanity check
-
-Forwarded: yes
-Author: Arno Töll <debian at toell.net>
-
-Index: istgt-0.4~20110717/Makefile.in
-===================================================================
---- istgt-0.4~20110717.orig/Makefile.in 2011-08-20 13:17:57.000000000 -0400
-+++ istgt-0.4~20110717/Makefile.in 2011-08-20 13:19:56.500943276 -0400
-@@ -36,17 +36,17 @@
-
- all:
- for subdir in $(SUBDIRS); do \
-- cd $$subdir; $(MAKE) $@; cd ..; \
-+ $(MAKE) -C $$subdir $@ || exit $?; \
- done
-
- install:
- for subdir in $(SUBDIRS); do \
-- cd $$subdir; $(MAKE) $@; cd ..; \
-+ $(MAKE) -C $$subdir $@ || exit $?; \
- done
-
- install-doc:
- for subdir in doc; do \
-- cd $$subdir; $(MAKE) $@; cd ..; \
-+ $(MAKE) -C $$subdir $@; \
- done
-
-
-@@ -57,7 +57,7 @@
- cp -p $(srcdir)/$$file $(DISTDIR); \
- done
- for subdir in $(SUBDIRS); do \
-- cd $$subdir; $(MAKE) subdir=$$subdir $@; cd ..; \
-+ $(MAKE) -C $$subdir subdir=$$subdir $@ || exit $?; \
- done
- tar cf - $(DISTDIR) | gzip -9c > $(DISTNAME)
- rm -rf $(DISTDIR) distdir
-@@ -67,12 +67,12 @@
-
- clean: local-clean
- for subdir in $(SUBDIRS); do \
-- cd $$subdir; $(MAKE) $@; cd ..; \
-+ $(MAKE) -C $$subdir $@ || exit $?; \
- done
-
- distclean: clean local-distclean
- for subdir in $(SUBDIRS); do \
-- cd $$subdir; $(MAKE) $@; cd ..; \
-+ $(MAKE) -C $$subdir $@ || exit $?; \
- done
-
- local-clean:
-@@ -85,7 +85,7 @@
-
- depend:
- for subdir in $(SUBDIRS); do \
-- cd $$subdir; $(MAKE) $@; cd ..; \
-+ $(MAKE) -C $$subdir $@ || exit $?; \
- done
-
- #########################################################################
Modified: trunk/istgt/debian/patches/series
===================================================================
--- trunk/istgt/debian/patches/series 2011-09-04 13:28:35 UTC (rev 3697)
+++ trunk/istgt/debian/patches/series 2011-09-12 17:40:15 UTC (rev 3698)
@@ -1,3 +1 @@
-handle-destdir.patch
fix-installdir.patch
-make-build-failures-fatal.patch
More information about the Glibc-bsd-commits
mailing list