[debconf] bump to version 1.5.49 (used by Debian/wheezy)

Oron Peled oron at fedoraproject.org
Sat Apr 6 21:40:26 UTC 2013 

commit 9f6f24efebddd5adf49d420f1a525615c93d8da9
Author: Oron Peled <oron at actcom.co.il>
Date:   Wed Apr 3 12:25:37 2013 +0300

    bump to version 1.5.49 (used by Debian/wheezy)

 debconf-1.5.32-no-utf8-to-pod2man.patch            |   12 ------
 debconf-1.5.49-double-encoding.patch               |   12 ++++++
 debconf-1.5.49-fix-find.patch                      |   39 ++++++++++++++++++++
 ... => debconf-1.5.49-python_version_support.patch |   12 +++---
 debconf.spec                                       |   22 ++++++++----
 5 files changed, 72 insertions(+), 25 deletions(-)
---
diff --git a/debconf-1.5.49-double-encoding.patch b/debconf-1.5.49-double-encoding.patch
new file mode 100644
index 0000000..24ac581
--- /dev/null
+++ b/debconf-1.5.49-double-encoding.patch
@@ -0,0 +1,12 @@
+diff -up ./doc/Makefile.old ./doc/Makefile
+--- ./doc/Makefile.old	2013-04-03 04:35:25.155298275 +0300
++++ ./doc/Makefile	2013-04-03 04:36:36.260406638 +0300
+@@ -5,7 +5,7 @@ pod2man=pod2man -c Debconf -r '' --utf8
+ manpages:
+ 	cd man && po4a po4a/po4a.cfg
+ 	for pod in man/*.pod; do \
+-		perl -pi -e 'if (not $$seen and /^=head1/) { print "=encoding UTF-8\n\n"; $$seen = 1; }' $$pod; \
++		perl -pi -e '/^=encoding/ and $$seen =1 ;' -e 'if (not $$seen and /^=head1/) { print "=encoding UTF-8\n\n"; $$seen = 1; }' $$pod; \
+ 	done
+ 	install -d man/gen
+ 	for num in 1 3 8; do \
diff --git a/debconf-1.5.49-fix-find.patch b/debconf-1.5.49-fix-find.patch
new file mode 100644
index 0000000..118529c
--- /dev/null
+++ b/debconf-1.5.49-fix-find.patch
@@ -0,0 +1,39 @@
+diff -up ./doc/Makefile.old ./doc/Makefile
+--- ./doc/Makefile.old	2013-04-07 00:22:01.063639304 +0300
++++ ./doc/Makefile	2013-04-07 00:22:33.195724268 +0300
+@@ -14,9 +14,9 @@ manpages:
+ 	done
+ 	$(pod2man) --section=3 ../Debconf/Client/ConfModule.pm \
+ 		> man/gen/Debconf::Client::ConfModule.3pm
+-	find .. -maxdepth 1 -perm +100 -type f \( -name debconf -or -name 'debconf-*' \) -printf '%P\n' | \
++	find .. -maxdepth 1 -perm /100 -type f \( -name debconf -or -name 'debconf-*' \) -printf '%P\n' | \
+ 		xargs -i sh -c "cd .. ; $(pod2man) --section=1 {} > doc/man/gen/{}.1"
+-	find .. -maxdepth 1 -perm +100 -type f -name 'dpkg-*' -printf '%P\n' | \
++	find .. -maxdepth 1 -perm /100 -type f -name 'dpkg-*' -printf '%P\n' | \
+ 		xargs -i sh -c "cd .. ; $(pod2man) --section=8 {} > doc/man/gen/{}.8"
+ 
+ clean:
+diff -up ./Makefile.old ./Makefile
+--- ./Makefile.old	2013-04-07 00:21:55.258622405 +0300
++++ ./Makefile	2013-04-07 00:22:28.043711543 +0300
+@@ -27,7 +27,7 @@ install: install-utils install-rest
+ # Anything that goes in the debconf-utils package.
+ install-utils:
+ 	install -d $(prefix)/usr/bin
+-	find . -maxdepth 1 -perm +100 -type f -name 'debconf-*' | grep -v debconf-set-selections | grep -v debconf-show | grep -v debconf-copydb | grep -v debconf-communicate | grep -v debconf-apt-progress | grep -v debconf-escape | \
++	find . -maxdepth 1 -perm /100 -type f -name 'debconf-*' | grep -v debconf-set-selections | grep -v debconf-show | grep -v debconf-copydb | grep -v debconf-communicate | grep -v debconf-apt-progress | grep -v debconf-escape | \
+ 		xargs -i install {} $(prefix)/usr/bin
+ 
+ # Anything that goes in the debconf-i18n package.
+@@ -69,9 +69,9 @@ install-rest:
+ 	install -m 0755 transition_db.pl fix_db.pl $(prefix)/usr/share/debconf/
+ 	# Install essential programs.
+ 	install -d $(prefix)/usr/sbin $(prefix)/usr/bin
+-	find . -maxdepth 1 -perm +100 -type f -name 'dpkg-*' | \
++	find . -maxdepth 1 -perm /100 -type f -name 'dpkg-*' | \
+ 		xargs -i install {} $(prefix)/usr/sbin
+-	find . -maxdepth 1 -perm +100 -type f -name debconf -or -name debconf-show -or -name debconf-copydb -or -name debconf-communicate -or -name debconf-set-selections -or -name debconf-apt-progress -or -name debconf-escape | \
++	find . -maxdepth 1 -perm /100 -type f -name debconf -or -name debconf-show -or -name debconf-copydb -or -name debconf-communicate -or -name debconf-set-selections -or -name debconf-apt-progress -or -name debconf-escape | \
+ 		xargs -i install {} $(prefix)/usr/bin
+ 	# Now strip all pod documentation from all .pm files and scripts.
+ 	find $(prefix)/usr/share/perl5/ $(prefix)/usr/sbin		\
diff --git a/debconf-1.5.42-python_version_support.patch b/debconf-1.5.49-python_version_support.patch
similarity index 74%
rename from debconf-1.5.42-python_version_support.patch
rename to debconf-1.5.49-python_version_support.patch
index b09d781..028351a 100644
--- a/debconf-1.5.42-python_version_support.patch
+++ b/debconf-1.5.49-python_version_support.patch
@@ -1,7 +1,7 @@
-diff -ur debconf-1.5.42.orig/Makefile debconf-1.5.42/Makefile
---- debconf-1.5.42.orig/Makefile	2012-02-10 23:21:12.000000000 +0000
-+++ debconf-1.5.42/Makefile	2012-03-26 14:00:00.907278606 +0100
-@@ -35,8 +35,7 @@
+diff -up ./Makefile.old ./Makefile
+--- ./Makefile.old	2013-04-03 04:54:30.830945272 +0300
++++ ./Makefile	2013-04-03 05:04:43.305687227 +0300
+@@ -35,8 +35,7 @@ install-i18n:
  	$(MAKE) -C po install
  
  # This would probably be easier if we used setup.py ...
@@ -11,7 +11,7 @@ diff -ur debconf-1.5.42.orig/Makefile debconf-1.5.42/Makefile
  
  # Install all else.
  install-rest:
-@@ -56,10 +55,8 @@
+@@ -56,10 +55,8 @@ install-rest:
  	# Install modules.
  	find Debconf -type f -name '*.pm' |grep -v CVS | \
  		xargs -i install -m 0644 {} $(prefix)/usr/share/perl5/{}
@@ -22,5 +22,5 @@ diff -ur debconf-1.5.42.orig/Makefile debconf-1.5.42/Makefile
 +	install -d $(prefix)$(PYTHON_SITEDIR)
 +	install -m 0644 debconf.py $(prefix)$(PYTHON_SITEDIR)
  	install -d $(prefix)/usr/lib/python3/dist-packages
- 	install -m 0644 debconf3.py $(prefix)/usr/lib/python3/dist-packages/debconf.py
+ 	install -m 0644 debconf.py $(prefix)/usr/lib/python3/dist-packages/
  	# Special case for back-compatability.
diff --git a/debconf.spec b/debconf.spec
index 63f3b2d..6df1e1e 100644
--- a/debconf.spec
+++ b/debconf.spec
@@ -1,14 +1,15 @@
 Name:           debconf
-Version:        1.5.42
-Release:        8%{?dist}
+Version:        1.5.49
+Release:        1%{?dist}
 Summary:        Debian configuration management system
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://packages.debian.org/sid/debconf
 Source0:        http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
-Patch0:         debconf-1.5.32-no-utf8-to-pod2man.patch
-Patch1:         debconf-1.5.42-python_version_support.patch
+Patch1:         debconf-1.5.49-python_version_support.patch
+Patch2:         debconf-1.5.49-double-encoding.patch
+Patch3:         debconf-1.5.49-fix-find.patch
 BuildArch:      noarch
 
 BuildRequires:  python
@@ -63,17 +64,18 @@ This package contains some small utilities for debconf developers.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
 make %{?_smp_mflags}
 
 %install
-make install prefix=%{buildroot}
-make install-i18n prefix=%{buildroot}
 make install-utils prefix=%{buildroot}
+make install-rest prefix=%{buildroot}
+make install-i18n prefix=%{buildroot}
 
 mkdir -p \
         %{buildroot}/%{perl_vendorlib} \
@@ -212,6 +214,12 @@ done
 %{_mandir}/man1/debconf-mergetemplate.1*
 
 %changelog
+* Wed Apr  3 2013 Oron Peled <oron at actcom.co.il> - 1.5.49-1
+- Bump to version used by Debian/wheezy
+- Fix 'find ... -perm' in Makefile to modern format. The deprecated
+  format (+100) caused problems with find version >= 4.5.11
+- Split 'make install' as is done in debian/rules for consistency
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.42-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

More information about the scm-commits mailing list