Control: tags -1 patch Hi
Attached is a fix, also available at http://mentors.debian.net/package/yocto-reader I had to fix #518856 (FTBFS when version has NMU). The package is not in a good shape, with a bunch of undocumented bugs.
diff -Nru yocto-reader-0.9.4/apache-alias.conf yocto-reader-0.9.4+nmu1/apache-alias.conf
--- yocto-reader-0.9.4/apache-alias.conf 2007-12-29 11:31:30.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/apache-alias.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Alias /yocto-reader /usr/share/yocto-reader
diff -Nru yocto-reader-0.9.4/apache.conf yocto-reader-0.9.4+nmu1/apache.conf
--- yocto-reader-0.9.4/apache.conf 2007-12-29 11:31:30.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/apache.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-<Directory /usr/share/yocto-reader>
- Options FollowSymLinks
- Order allow,deny
- Allow from all
-</Directory>
diff -Nru yocto-reader-0.9.4/debian/apache2 yocto-reader-0.9.4+nmu1/debian/apache2
--- yocto-reader-0.9.4/debian/apache2 1970-01-01 01:00:00.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/debian/apache2 2015-03-26 19:15:30.000000000 +0100
@@ -0,0 +1 @@
+conf yocto-reader.conf
diff -Nru yocto-reader-0.9.4/debian/changelog yocto-reader-0.9.4+nmu1/debian/changelog
--- yocto-reader-0.9.4/debian/changelog 2008-12-22 16:22:22.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/debian/changelog 2015-03-26 21:08:22.000000000 +0100
@@ -1,3 +1,20 @@
+yocto-reader (0.9.4+nmu1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix FTFS with nmu versions: (closes: #518856)
+ - Makefile: Use dpkg-parsechangelog to get current version.
+ - Add Build-Depends on dpkg >= 1.17.
+ * Apache2.4 transition: (closes: #669777)
+ - Merge apache.conf and apache-alias.conf in a single yocto-reader.conf,
+ upgrade it to new apache Require style, update DIST_FILES in Makefile.
+ - d/rules: Add dh_apache2, no longer copying files to /etc/apache2/conf.d/
+ - d/control: Add ${misc:Recommends}, Build-depends on dh-apache2.
+ - d/maintscript: rm_conffile /etc/apache2/conf.d/yocto-reader*.
+ - New d/apache2: Handle configuration.
+ - d/exemples: Use the new configuration name.
+
+ -- Jean-Michel Nirgal Vourgère <[email protected]> Thu, 26 Mar 2015 21:08:06 +0100
+
yocto-reader (0.9.4) unstable; urgency=medium
* Removed link to proprietary Google javascript and added source
diff -Nru yocto-reader-0.9.4/debian/control yocto-reader-0.9.4+nmu1/debian/control
--- yocto-reader-0.9.4/debian/control 2008-12-22 16:22:22.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/debian/control 2015-03-26 19:14:37.000000000 +0100
@@ -2,12 +2,13 @@
Section: web
Priority: extra
Maintainer: Loic Dachary (OuoU) <[email protected]>
-Build-Depends: debhelper (>= 5), coreutils, perl-base, cpio, tar
+Build-Depends: dpkg (>= 1.17), debhelper (>= 5), coreutils, perl-base, cpio, tar, dh-apache2
Standards-Version: 3.7.2
Package: yocto-reader
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${misc:Recommends}
Description: web based RSS reader
Yocto-reader is a prototype of a web based RSS reader written in
Javascript. In this release the GUI front end is fully functional but
diff -Nru yocto-reader-0.9.4/debian/examples yocto-reader-0.9.4+nmu1/debian/examples
--- yocto-reader-0.9.4/debian/examples 2007-12-29 11:31:30.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/debian/examples 2015-03-26 19:16:12.000000000 +0100
@@ -1,2 +1 @@
-apache.conf
-apache-alias.conf
\ No newline at end of file
+yocto-reader.conf
diff -Nru yocto-reader-0.9.4/debian/maintscript yocto-reader-0.9.4+nmu1/debian/maintscript
--- yocto-reader-0.9.4/debian/maintscript 1970-01-01 01:00:00.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/debian/maintscript 2015-03-26 18:42:42.000000000 +0100
@@ -0,0 +1,2 @@
+rm_conffile /etc/apache2/conf.d/yocto-reader.conf 0.9.4+nmu1~
+rm_conffile /etc/apache2/conf.d/yocto-reader-alias.conf 0.9.4+nmu1~
diff -Nru yocto-reader-0.9.4/debian/rules yocto-reader-0.9.4+nmu1/debian/rules
--- yocto-reader-0.9.4/debian/rules 2007-12-29 12:13:01.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/debian/rules 2015-03-26 19:11:51.000000000 +0100
@@ -55,9 +55,6 @@
# Add here commands to install the package into debian/yocto-reader.
$(MAKE) DESTDIR=$(CURDIR)/debian/yocto-reader install
- mkdir -p $(CURDIR)/debian/yocto-reader/etc/apache2/conf.d
- cp apache.conf $(CURDIR)/debian/yocto-reader/etc/apache2/conf.d/yocto-reader.conf
- cp apache-alias.conf $(CURDIR)/debian/yocto-reader/etc/apache2/conf.d/yocto-reader-alias.conf
# Build architecture-independent files here.
@@ -83,6 +80,7 @@
# dh_installcron
# dh_installinfo
dh_installman
+ dh_apache2
dh_link
dh_strip
dh_compress
diff -Nru yocto-reader-0.9.4/Makefile yocto-reader-0.9.4+nmu1/Makefile
--- yocto-reader-0.9.4/Makefile 2008-12-22 16:22:22.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/Makefile 2015-03-26 20:43:39.000000000 +0100
@@ -17,8 +17,8 @@
# <http://www.gnu.org/licenses/>.
-DIST_FILES = ./ChangeLog ./LICENSE.txt ./Makefile ./README.txt ./apache-alias.conf \
- ./apache.conf ./backend/resttest.php ./debian/README.Debian ./debian/changelog \
+DIST_FILES = ./ChangeLog ./LICENSE.txt ./Makefile ./README.txt \
+ ./backend/resttest.php ./debian/README.Debian ./debian/changelog \
./debian/compat ./debian/control ./debian/copyright ./debian/examples \
./debian/rules ./feedread.html ./keycuts.html ./permalinks.html \
./reader/cache.js ./reader/common.js ./reader/feed.js ./reader/feeddata.js \
@@ -68,7 +68,7 @@
./themes/default/settings.zip ./themes/default/theme-merged.css \
./themes/default/theme-saved.css ./themes/default/theme.css \
./themes/default/trends-label-corner.gif ./tools/runuitests \
- ./uitest.html
+ ./uitest.html ./yocto-reader.conf
all:
@@ -88,10 +88,10 @@
$(DESTDIR)/etc/yocto-reader
ln -s /etc/yocto-reader/mockapi.js \
$(DESTDIR)/usr/share/yocto-reader/reader/mockapi.js
- (VERSION=`/usr/bin/head -1 debian/changelog | /usr/bin/perl -pe 's/^\s*yocto-reader\s+\(([\d\.]+)\)\s+.*$$/$$1/'`; /bin/cp yocto-reader-$$VERSION.tar.gz $(DESTDIR)/usr/share/yocto-reader; cd $(DESTDIR)/usr/share/yocto-reader; /bin/ln -s yocto-reader-$$VERSION.tar.gz yocto-reader.tar.gz)
+ (VERSION=`dpkg-parsechangelog -S version`; /bin/cp yocto-reader-$$VERSION.tar.gz $(DESTDIR)/usr/share/yocto-reader; cd $(DESTDIR)/usr/share/yocto-reader; /bin/ln -s yocto-reader-$$VERSION.tar.gz yocto-reader.tar.gz)
dist:
- @(VERSION=`/usr/bin/head -1 debian/changelog | /usr/bin/perl -pe 's/^\s*yocto-reader\s+\(([\d\.]+)\)\s+.*$$/$$1/'`; \
+ @(VERSION=`dpkg-parsechangelog -S version`; \
/bin/rm -rf yocto-reader-$$VERSION; \
mkdir yocto-reader-$$VERSION; \
/bin/echo $(DIST_FILES) | /usr/bin/perl -ne 'foreach $$f (split(/\s+/)) { print "$$f\n";}' | /bin/cpio -padum yocto-reader-$$VERSION; \
@@ -100,4 +100,4 @@
clean:
rm -Rf tests.coverage
- (VERSION=`/usr/bin/head -1 debian/changelog | /usr/bin/perl -pe 's/^\s*yocto-reader\s+\(([\d\.]+)\)\s+.*$$/$$1/'`; /bin/rm -rf yocto-reader-$$VERSION yocto-reader-$$VERSION.tar.gz)
+ (VERSION=`dpkg-parsechangelog -S version`; /bin/rm -rf yocto-reader-$$VERSION yocto-reader-$$VERSION.tar.gz)
diff -Nru yocto-reader-0.9.4/yocto-reader.conf yocto-reader-0.9.4+nmu1/yocto-reader.conf
--- yocto-reader-0.9.4/yocto-reader.conf 1970-01-01 01:00:00.000000000 +0100
+++ yocto-reader-0.9.4+nmu1/yocto-reader.conf 2015-03-26 19:18:23.000000000 +0100
@@ -0,0 +1,5 @@
+<Directory /usr/share/yocto-reader>
+ Options FollowSymLinks
+ Require all granted
+</Directory>
+Alias /yocto-reader /usr/share/yocto-reader
signature.asc
Description: OpenPGP digital signature
