Control: tags -1 -moreinfo
On 24/03/15 16:05, Niels Thykier wrote:
> Control: tags -1 moreinfo
>
> On 2015-03-23 08:55, Daniel Pocock wrote:
>> Package: release.debian.org
>> User: release.debian....@packages.debian.org
>> UserTags: unblock
>>
>>
>> I'm proposing to update the simpleid package using the patch contained
>> in this bug:
>>
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718483
>>
>> Direct link to the patch:
>>
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;filename=718483.diff;att=1;bug=718483
>>
>>
>> I would also propose a couple of other small fixes,
>>
>> - uploader email address s/pocock.com.au/pocock.pro
>>
>> - home page URL http://www.simpleid.org
>>
>>
>> Please let me know if all of the above is likely to be accepted at this
>> stage in the freeze and if so I will build a package and send a debdiff
>> for approval.
>>
>>
>
> Hi Daniel,
>
> Can you please provide a full debdiff all the changes you wish to include.
>
Attached - please tell me if I should upload 0.8.1-14 to unstable
diff -u simpleid-0.8.1/debian/README.Debian simpleid-0.8.1/debian/README.Debian
--- simpleid-0.8.1/debian/README.Debian
+++ simpleid-0.8.1/debian/README.Debian
@@ -9,7 +9,7 @@
To start quickly, you MUST:
- a) edit /etc/simpleid/config.php and
+ a) edit /etc/simpleid/config.inc and
set SIMPLEID_BASE_URL to YOUR domain name
b) copy the sample identity to /var/lib/simpleid/identities
diff -u simpleid-0.8.1/debian/simpleid.install
simpleid-0.8.1/debian/simpleid.install
--- simpleid-0.8.1/debian/simpleid.install
+++ simpleid-0.8.1/debian/simpleid.install
@@ -3 +3 @@
-debian/conf/* etc/simpleid
+debian/conf/config.inc etc/simpleid
diff -u simpleid-0.8.1/debian/simpleid.links
simpleid-0.8.1/debian/simpleid.links
--- simpleid-0.8.1/debian/simpleid.links
+++ simpleid-0.8.1/debian/simpleid.links
@@ -1,3 +1,2 @@
etc/simpleid/config.inc usr/share/simpleid/www/config.inc
-etc/simpleid/apache.conf etc/apache2/conf.d/simpleid.conf
usr/share/javascript/jquery/jquery.min.js usr/share/simpleid/www/html/jquery.js
diff -u simpleid-0.8.1/debian/changelog simpleid-0.8.1/debian/changelog
--- simpleid-0.8.1/debian/changelog
+++ simpleid-0.8.1/debian/changelog
@@ -1,3 +1,13 @@
+simpleid (0.8.1-14) unstable; urgency=low
+
+ * Apache 2.4 transition. (Closes: #718483)
+ * Update uploader email address.
+ * Update home page URL.
+ * Update VCS URLs.
+ * Correct config filename in README.Debian.
+
+ -- Daniel Pocock <dan...@pocock.pro> Tue, 24 Mar 2015 17:14:40 +0100
+
simpleid (0.8.1-13) unstable; urgency=low
* Revert to 1.0 source format
diff -u simpleid-0.8.1/debian/control simpleid-0.8.1/debian/control
--- simpleid-0.8.1/debian/control
+++ simpleid-0.8.1/debian/control
@@ -2,17 +2,20 @@
Section: web
Priority: extra
Maintainer: Debian Authentication Maintainers
<pkg-auth-maintain...@lists.alioth.debian.org>
-Uploaders: Daniel Pocock <dan...@pocock.com.au>
-Build-Depends: debhelper (>= 8), cdbs (>= 0.4.89)
+Uploaders: Daniel Pocock <dan...@pocock.pro>
+Build-Depends: debhelper (>= 8), cdbs (>= 0.4.89), dh-apache2 | apache2-dev
Standards-Version: 3.9.3
-Homepage: http://simpleid.sourceforge.net/
-Vcs-Git: git://git.debian.org/pkg-auth/simpleid.git
-Vcs-Browser: http://git.debian.org/?p=pkg-auth/simpleid.git;a=summary
+Homepage: http://www.simpleid.org/
+Vcs-Git: git://anonscm.debian.org/pkg-auth/simpleid.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-auth/simpleid.git
Package: simpleid
Architecture: all
-Depends: debconf | debconf-2.0, apache2 | lighttpd | httpd,
- libapache2-mod-php5, libjs-jquery, ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.7.2)
+Depends: debconf | debconf-2.0,
+ libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
php5,
+ libjs-jquery, ${misc:Depends}
+Recommends: ${misc:Recommends}
Description: simple OpenID provider implemented in PHP
SimpleID is a simple, personal OpenID provider written in PHP. OpenID
is a way to provide for a single digital identity across the Internet.
diff -u simpleid-0.8.1/debian/rules simpleid-0.8.1/debian/rules
--- simpleid-0.8.1/debian/rules
+++ simpleid-0.8.1/debian/rules
@@ -8,7 +8,7 @@
DEB_INSTALL_CHANGELOGS_ALL = simpleid/CHANGELOG.txt
-SIMPLEID_WEB_CONF = etc/simpleid/apache.conf
+SIMPLEID_WEB_CONF = etc/apache2/conf-available/simpleid.conf
binary-install/simpleid::
echo -n "<?php define('SIMPLEID_VERSION', '"$(DEB_VERSION)"'); ?>" >
debian/simpleid/usr/share/simpleid/www/version.inc.php
@@ -18,6 +18,7 @@
chmod 0750 debian/simpleid/var/lib/simpleid/identities
chown www-data.www-data debian/simpleid/var/lib/simpleid/cache
debian/simpleid/var/lib/simpleid/store
chmod 0770 debian/simpleid/var/lib/simpleid/cache
debian/simpleid/var/lib/simpleid/store
+ dh_apache2
echo '<Directory "/usr/share/simpleid/www">' >>
debian/simpleid/$(SIMPLEID_WEB_CONF)
cat simpleid/www/.htaccess.dist >> debian/simpleid/$(SIMPLEID_WEB_CONF)
echo '</Directory>' >> debian/simpleid/$(SIMPLEID_WEB_CONF)
reverted:
--- simpleid-0.8.1/debian/conf/apache.conf
+++ simpleid-0.8.1.orig/debian/conf/apache.conf
@@ -1,3 +0,0 @@
-
-Alias /simpleid /usr/share/simpleid/www
-
only in patch2:
unchanged:
--- simpleid-0.8.1.orig/debian/conf/simpleid.conf
+++ simpleid-0.8.1/debian/conf/simpleid.conf
@@ -0,0 +1,3 @@
+
+Alias /simpleid /usr/share/simpleid/www
+
only in patch2:
unchanged:
--- simpleid-0.8.1.orig/debian/simpleid.apache2
+++ simpleid-0.8.1/debian/simpleid.apache2
@@ -0,0 +1 @@
+conf debian/conf/simpleid.conf lighttpd
only in patch2:
unchanged:
--- simpleid-0.8.1.orig/debian/simpleid.maintscript
+++ simpleid-0.8.1/debian/simpleid.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/simpleid/apache.conf
/etc/apache2/conf-available/simpleid.conf 0.8.3-1~
