[debian-edu-commits] debian-edu/slbackup-php.git (#7) - master (branch) updated: upstream/0.3-5-gc42f607
Mike Gabriel
sunweaver at alioth.debian.org
Fri Jun 7 15:41:36 UTC 2013
The branch, master has been updated
discards 05cefa34b21187b6e3578c4e9938fcda9bbb66dc (commit)
discards 3300037859bea57ae9938e0fcf4563a7c9b46025 (commit)
discards d90ef6bbd3d13323b7b06c16f35ef9e6b34ea104 (commit)
discards 4eb15e0f7603a049e8f3ee30d0be1c0d09d40ecc (commit)
discards 679daadcd89f12fe659785654f1040ddfded57b1 (commit)
discards 78e9ed297e32b08f757add038a1b312f596243ee (commit)
discards 03cd4f06f0e0bda34dfe8f97f13e94f0213414c9 (commit)
discards e9c873518e7c1256d404bf168c51467c1f1f0cf4 (commit)
discards aaf5e8f81131f5a3a2891620eecd73105bb15492 (commit)
discards cb50b6449e755f066f1b05b115ef4255fb337a26 (commit)
discards dd7843559716097e631490c2c82678feecc72b9c (commit)
discards 2d7c2614a17abb13c53122e56b13f7bb191925a6 (commit)
discards cae0aebef30eecff02692e1bbea7799328556306 (commit)
discards 73a0eb04eeef6830fe2d3866673f32a62b397509 (commit)
discards 3d356545469762ee3e27e8449594544c0204288c (commit)
discards 9bb6de770e577e1339dc37d7d1a0a1ed791517bb (commit)
discards 7a5a5f11e77ea3a70cf3ac73b8c17a35545af543 (commit)
discards 0c00cd9129f27b0ad826f9fa91d32879923f8e10 (commit)
discards 4dcca94c6dc674c96f1e269a97d5fbf0ab24b1c6 (commit)
discards bad30518cf32c3fe9920ec849fb4133ac701c580 (commit)
discards 56f9741557277575e2da5e18be094fa46522a292 (commit)
discards d0018f21fa38a64ee3fe791554dc3b13db2e8b51 (commit)
discards facd5edcfc6fc759c4d383c793d1b8df523de64e (commit)
discards 9816c6b30ee26ffa39170b09ddcdf42a6895c684 (commit)
discards 6356389f43a9d5384bbfc5543e8c1cde2d8522af (commit)
discards 92ecfe069cfcb4c5a8d3879f8ad3715d2e15c447 (commit)
discards 938cdede0f7558dfb02c9c52e9b1dfd926120f41 (commit)
discards 2af45469d85fd9bd5aa3515dee0b63e9075575aa (commit)
discards 48545c78dd71f0e64fa3ba74e6268c1000053c07 (commit)
discards 520632ab4b1772f2fd313c63750e3fdf7cfa489f (commit)
discards cfe02548646fc321cfaa35e395dfa1fd120ac2a4 (commit)
discards 4bc9892c33e170dad39753487e72d1be0c24301e (commit)
discards cb752eb378bb8deeb74a3a8171e440d1bbc3a2af (commit)
discards ddae78ddd37cd09d4f9a22c808c80320f537cab7 (commit)
discards 4ae4d1940f03d983b7735d62eb522ed154f6a699 (commit)
discards 2c437560e5db352fa63cf203ea2d732e29f03f8e (commit)
discards 43b8b7bb30dde14aa3ee9c4dbab4fa6d4c4c0cce (commit)
discards b485d30be7cca2e8d639b95faf58371ec0531813 (commit)
discards ad0beba3586cbb887fa0728d31851ecc93f256e4 (commit)
discards 6bf0dcfd1d7d02be06a41358841f236b320900c9 (commit)
discards 601f13c780add72382cb3f47c9f486035c2b7f0f (commit)
discards 0a134ae89f71035c271e064cae9d3fafd33a06c9 (commit)
discards eefe33e23d0691a8c7c222b9f01c723f0675b5d4 (commit)
discards fba9ea406c75b2e88578f6b09c53c2194d58d085 (commit)
discards ccc46f6a03c8a1c68174d45a029f5d5d5ffa51ef (commit)
discards 0a3634a7af569f21d184413c22104d2ca1e13860 (commit)
discards ecb8f44c8d600699a10aeab7716b9fd4b1e55c73 (commit)
discards 72fe08243473f9df4fa0cf4cff88471955aa9a5a (commit)
discards c54a0417454ee8519db880bb07104951c5e0c082 (commit)
discards 0e8ca51727aa8098a1cbb89fbbd31238c6692f84 (commit)
discards fb963e548a3cffd16dd05a8da7396cfe5bd7f35c (commit)
discards 89b4c949a9cd83b3192df7317b8f7101cf7c3a87 (commit)
discards 3c77169dfdf82059bbe5269593dfdd52c10581b0 (commit)
discards 1bb5972f1d51735c43b22b15a7717a6ea8a7c89b (commit)
discards 96208813c483e0bdc93f6cf8d21da0bcda7d62d0 (commit)
discards f68a79e11b90426d7baee08d90dd246c84c6de54 (commit)
discards 5461a7ae35195fb837a98d3ded1b0e2f95b272a1 (commit)
discards b60a89e8a9f1ccd8ddc9c4562c9f0f2bff2b456b (commit)
discards c17e25b597b425083ed4204a07278c5b23cdb466 (commit)
discards 3b16f711e65e802bee6679f0408dacec76e6a4e6 (commit)
discards 40e1d2689abfe531dc029e9c397c9e508ce136d1 (commit)
discards aa63f1c6303f313e748c1666e91dec1ea636617a (commit)
discards d199838b5b4130334ded50a65a6cca81a41b076c (commit)
discards c801d0dd88e86f810d66157e6be4891ebb8fa838 (commit)
discards 5a046126feae0662bb12948de6188e31d8d29991 (commit)
discards b2d37c7fddaeb66e8d8eda7c856adce300724145 (commit)
discards a81b1cb699b1e3e5f0e518392f7361180e11470f (commit)
discards 001683bbec269e774dd565d46f9f677fe01b4f3d (commit)
discards 8a69349218f145567e68c4db59ba7dc95050ed78 (commit)
discards 9664a72c2768ea2094d1bc22627b01b0c64d6370 (commit)
discards a54f4452bff65d249a6aa74c7be1fd2356f37788 (commit)
discards 03468a78bfd13e9d2a4285b49789c79979f60e9a (commit)
discards 2271e54879de3377e5a37571d2a69098669607be (commit)
discards 943f01c8b738108f46c90b00ca328e5b355b49a6 (commit)
discards d069319abc7c68711657dcf812678c2f95425ce6 (commit)
discards cda362d8e3a2bc7439199eb0aba8bbc0e43b372a (commit)
discards 43a591f89390c751012342f107dfd222dcee4434 (commit)
discards ab9aa39055c84d6b718e1d3919a223d9349e0262 (commit)
discards 846a5c60389ee4ce4c9d961650b261715f238100 (commit)
discards 67facac926750228225f284135f446330dbe8ac8 (commit)
discards f2afa3de72d037b25a6c50948137bca76068ae12 (commit)
discards e7001061ed9b4dc127d98029dbcfa8d5e5b1e70f (commit)
discards 071d5628436190c4aa195a5ea5baa70554275e42 (commit)
discards 23b07069ae6acf7bfa9a31a0ebba52da29b999be (commit)
discards 43aa8f4a6b18f84e91780123eb7f9684c8852d4b (commit)
discards 336d035df77055eabff6053c16d5e6aeed8dc3bd (commit)
discards c40e4ba7b210cd584dd6c687cd0d048b40815de9 (commit)
discards 07f35188631c681057bcef6c2e94675397d359a0 (commit)
discards 3953607810f8c71ca2ea16ea3e7fd44f767f3c9a (commit)
discards 9ab516944fb5f4f6121a1e93bd12c6207e92312e (commit)
discards 6774adb0c275f342029ed4dec3d7807304e4d6e9 (commit)
discards 23e6c7e825ef7570de4a7840d6dd7f517fa4d8de (commit)
discards ff0c8b84f95720de80843446a60e96f39cc10dfe (commit)
discards 547c4cdc50b7b5c40b56960268d8f3fdf207821c (commit)
discards 7521db53f58e3417c578b3661d4a351ee4729dc8 (commit)
discards 240d2026ec45a985bfd189d3cf6223eceb8adde2 (commit)
discards bca97967eda799865459e655cd5ab45c843fd0d9 (commit)
discards a0a5f5a53caca23171cc9195fd61f702816fc877 (commit)
discards 31032c7cacb59e3e953813ed31061f1b0bb3db1c (commit)
discards a4fea16dc8659abab018f528450076b73d62e3f5 (commit)
discards 5feb87d4b7ec6b2c94d8c56beb98cbfd2e6433bf (commit)
discards 199215d2693c2942b277e049ac741b8e4553e74c (commit)
discards c2b2f15c180b93adfdd283089fda737bcdea14af (commit)
discards e17123b5eabae6e71e172ed9026d106466cabdaa (commit)
discards ddb32c09d53265ca2d86ac9d44e60c05301b63ad (commit)
discards b4fc1ab45e7b2325174cb4aaaa2741a8f5736bf2 (commit)
discards fce18f6c4e9bce18349c6549577fd9b37670d0e6 (commit)
discards e9832183dcf01c7a995f8ec87c1eadffc28e5762 (commit)
discards a5c51d349273836949e355fa4879612f127b643f (commit)
discards 2e0b78e7153bed70a5a900c000b2684141d1d7f5 (commit)
discards 3b70aa65f3ae241a23d3feeca310265c00124570 (commit)
discards 7f6a8ca36f0894578856a6f0233a257bfbdbdb04 (commit)
discards e3e0bd07629fe65ee67a56badba34b15ad925a12 (commit)
discards 23b8026285b4e02192d90872edb9a7aee3f70183 (commit)
discards aa4335d7000facc21179f428f0acfd4f6f6b6871 (commit)
discards 399e8e1f07db0356581fa99d6b58b947d2cb01cf (commit)
discards 7e1e7e5f516668d9118e2b294b6cec19a53c2e2a (commit)
discards 730316e8db53c1254e9db8430c484284e9b833ec (commit)
discards ee23f46f15af9a632b6af9850617261221c8560c (commit)
discards 4e2f2da9fc7944564a630c0373cfa1af7d451de2 (commit)
discards 384263dddc63f8845f26a146723256b87b5acba3 (commit)
discards f114e740eef2245b9a07612c9177f62f1ea98d7a (commit)
discards 011f272d5c6ddfb4a74b81d7ec34446cfdb76b59 (commit)
discards 58c1ece89f692f4a30d6558cc1ba6c62bcfca97d (commit)
discards c02b453a62120364cc0c20f6b11a2e5918833c0f (commit)
discards d43efc72d662da0af31c558e300a339a035656b8 (commit)
via c42f60786d9465d8c0adb442b84e5cf3020f45dc (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (05cefa34b21187b6e3578c4e9938fcda9bbb66dc)
\
N -- N -- N (c42f60786d9465d8c0adb442b84e5cf3020f45dc)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 ++
debian/changelog | 187 ++++++++-------------
debian/control | 7 +-
debian/patches/001_nonhttps-failure.patch | 13 --
debian/patches/series | 1 -
debian/{slbackup-php.desktop => slbackup.desktop} | 4 +-
debian/source/format | 2 +-
debian/watch | 4 -
src/functions.php | 4 +-
src/index.php | 3 +
10 files changed, 94 insertions(+), 142 deletions(-)
delete mode 100644 debian/patches/001_nonhttps-failure.patch
delete mode 100644 debian/patches/series
copy debian/{slbackup-php.desktop => slbackup.desktop} (62%)
delete mode 100644 debian/watch
The diff of changes is:
diff --git a/ChangeLog b/ChangeLog
index 2f301cb..6aed580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri, 06 Jun 2013 Mike Gabriel
+
+ * Release 0.4.4:
+ - Fix installation/usage on non-Debian-Edu
+ (i.e. vanilla Debian) systems. Esp. do not
+ hard-code the host 'backup' as default backup host.
+ - Add two more break statements when evaluating
+ session arguments.
+ - Store changes to the nonhttps session parameter back
+ to the client-side session cookie if changes occur.
+
Thu, 12 Jul 2012 Mike Gabriel
* Release 0.4.3:
diff --git a/debian/changelog b/debian/changelog
index c9d4d9b..0b2414c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,113 +1,70 @@
-slbackup-php (0.4.3-3) UNRELEASED; urgency=low
+slbackup-php (0.4.4-0) unstable; urgency=low
+
+ * Upstream version (0.4.4):
+ - Add 'break' statements after evaluating the nonhttps option
+ and the selected option. Patch from Wolfgang Schweer. Thanks!
+ - Write changes to nonhttps _SESSION option back to cookie.
+ - As a host default use 'localhost', not 'backup'. The hostname
+ 'backup' is set up on the Debian Edu mainserver by default,
+ but not on vanilla Debian systems. The generic approach is:
+ -> use 'localhost' in src/functions.php
+ -> provide alternative backup hostname via /etc/slbackup-php/config.php.
+ * Pick packaging files from debian/0.4.3-1.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 07 Jun 2013 17:30:30 +0200
+
+slbackup-php (0.4.3-0) unstable; urgency=low
+
+ * Upstream version (0.4.3):
+ - Formal release, upstream ChangeLog was not up-to-date for 0.4.2.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 12 Jul 2012 14:36:15 +0200
+
+slbackup-php (0.4.2-0) unstable; urgency=low
+
+ * New upstream version (0.4.2):
+ - Avoid empty $bindir directory.
+ - Fix building of .mo files.
+ - Fix nonhttps URL parameter.
+ * Pick packaging files from debian/0.4.1-1 (prep. uploaded to
+ mentors.debian.net).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 12 Jul 2012 00:10:52 +0200
+
+slbackup-php (0.4.1-0) unstable; urgency=low
+
+ * New upstream version (0.4.1):
+ - Drop smarty-gettext code, use the plugin provided in Debian or other
+ distro.
+ - Do not recreate .po files during make mo-files. Provide po-files stanza
+ in Makefile for recreating .po files manually.
+ * /debian/po/svn.po:
+ + Replace sv.po for php GUI translations with svn.po for debconf template
+ translations.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 08 Jul 2012 16:31:52 +0200
+
+slbackup-php (0.4.0-0) unstable; urgency=low
[ Mike Gabriel ]
- * /debian/control:
- + Use my DD mail address in Uploaders: field.
- + Bump Standards: to 3.9.4 after some changes as documented below.
- + Add home page and VCS URL (Closes: #711495).
- * /debian/rules:
- + Add rules build-arch and build-indep.
- * Install slbackup-php.desktop into bin:package.
- * Add patch: 001_nonhttps-failure.patch. Add missing 'break' in
- handling of PHP argument nonhttps, causing login to fail (Closes:
- #700257). Patch from Wolfgang Schweer.
-
- [ Petter Reinholdtsen ]
- * Remove no longer active uploaders Patrick Winnertz, Morten Werner
- Olsen, Finn-Arne Johansen. A huge thank you to all of them for
- past help and effort.
-
- -- Mike Gabriel <sunweaver at debian.org> Fri, 22 Mar 2013 22:46:06 +0100
-
-slbackup-php (0.4.3-2) unstable; urgency=low
-
- * Rebuild package based on Debian version 0.3-3, only cherry-picking
- minimal changes from Debian version 0.4.3-1 of this package, as
- requested by the Debian release team. This reduction of changes is
- to make a transition of slbackup-php 0.4.3 into wheezy possible.
- * Drop of complete patch series which was needed for 0.3-3.
- * Cherry-picks from 0.4.3-1:
- + New maintainer, package becomes team-maintained: Debian Edu Packaging
- Team.
- + New upstream version. (Closes: #646537, #670095)
- + Run debconf-updatepo during /debian/rules build, not clean. Makes
- slbackup-php buildable with git-buildpackage.
- + Let URL in /debian/slbackup-php.desktop point to
- http://localhost/slbackup-php.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 01 Sep 2012 21:54:58 +0200
-
-slbackup-php (0.4.3-1) unstable; urgency=low
-
- * New maintainer, package becomes team-maintained: Debian Edu Packaging Team.
- * New upstream version. (Closes: #646537, #670095)
- * /debian/source/format:
- + Switch to "3.0 (quilt)".
- * /debian/rules:
- + Run debconf-updatepo during /debian/rules build, not clean. Makes
- slbackup-php buildable with git-buildpackage.
- + Fix lintian warnings: debian-rules-missing-recommended-target build-arch,
- debian-rules-missing-recommended-target build-indep.
- + Remove dh_quilt_(un)patch calls.
- * Lintian issues fixed:
- + I: slbackup-php: package-contains-empty-directory usr/bin/
- + P: slbackup-php source: unneeded-build-dep-on-quilt
- + P: slbackup-php: no-homepage-field
- + W: slbackup-php source: dh-clean-k-is-deprecated
- * /debian/control:
- + Bump Standards to 3.9.3.
- + Add Vcs-Git and Vcs-Browser.
- * /debian/watch (new):
- + Provide watch file for upstream source versions.
- * /debian/compat:
- + Raise compat level to 7.
- * /debian/README.Source:
- + Add upstream Vcs-Browser location to README.Source.
- * /debian/slbackup-php.desktop:
- + Let URL point to http://localhost/slbackup-php.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 12 Jul 2012 14:43:54 +0200
-
-slbackup-php (0.3-3) unstable; urgency=low
-
- * Mike Gabriel becomes Debian package maintainer.
- * Enable quilt patch system. Bump Standards-Version from 3.7.3 to 3.9.2.
- * Add generic README.source that explains the usage of quilt.
- * Add patch: 001_slbackup-php_cookie+request-merge.patch. Fixes reappearing
- login page on every click (closes: #655832).
- * Add patch: 002_slbackup-php_restore-paths-with-blanks.patch. Allows restore
- of files with blanks in their name. Closes: #565181.
- Patch provided by Cyril ETCHEVERRIA <cyril.e at wanadoo.fr> -> thanks!
- * Add patch: 003_slbackup-php_fix-failed-in-status-template.patch,
- for last failed backup really show timestamp of the last failed backup
- and not erroneously the timestamp of the last successful backup.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 18 Jan 2012 17:05:14 +0100
-
-slbackup-php (0.3-2.2) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix encoding for Danish debconf translation.
-
- -- Christian Perrier <bubulle at debian.org> Wed, 12 Jan 2011 07:30:19 +0100
-
-slbackup-php (0.3-2.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Explicitly use 1.0 as source format
- * Explicitly point to version 2 of the GPL in debian/copyright
- * Don't hardcode path to a2enmode and invoke-rc.d in postinst script
- * Complete copyright in debian/copyright
- * Add ${misc:Depends} in dependencies to properly deal with
- dependencies triggerred by debhelper utilities
- * Drop useless call to dh_desktop in debian/rules (this command
- does nothing now)
- * Fix pending l10n issues. Debconf translations:
- - Japanese (Hideki Yamane (Debian-JP)). Closes: #555695
- - Spanish (Omar Campagne). Closes: #578139
- - Danish (Joe Hansen). Closes: #581041
-
- -- Christian Perrier <bubulle at debian.org> Fri, 21 May 2010 07:07:57 +0200
+ * New upstream version (0.4.0):
+ - Accept patch slbackup-php_cookie+request-merge.patch from Debian.
+ - Accept patch slbackup-php_restore-paths-with-blanks.patch from Debian.
+ - Accept patch slbackup-php_fix-failed-in-status-template.patch from Debian.
+ - Accept patch slbackup-php_translate-status-for.patch from Debian.
+ - Accept patch slbackup-php_i18n-pot-po-update.patch from Debian.
+ - Accept patch slbackup-php_fix-language-detection.patch from Debian.
+ - Accept patch slbackup-php_i18n-de.patch from Debian.
+ - Accept patch slbackup-php_chmod-cron-file.patch from Debian.
+ - Accept patch slbackup-php_i18n-fr.patch from Debian.
+ - Use smarty3.
+ - Split up smarty3-gettext code from functions.php.
+ * Bump standards to 3.9.3.
+ * Fix lintian warnings: debian-rules-missing-recommended-target build-arch,
+ debian-rules-missing-recommended-target build-indep.
+ * Accept more packaging files from Debian package.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 01 Jul 2012 12:06:11 +0200
slbackup-php (0.3-2) unstable; urgency=low
@@ -115,14 +72,7 @@ slbackup-php (0.3-2) unstable; urgency=low
* Make the list of snapshots sorted
[ Patrick Winnertz ]
- * Changed my maintainer address to winnie at debian.org.
- * Added debian/po/nl.po . Thanks to Bart Cornelis (Closes: #450972)
- * Added debian/po/fi.po . Thanks to Esko Arajärvi (Closes: #468844)
- * Added smarty-gettext as build-dep (Closes: #452769)
- * Bumped Standards-Version to 3.7.3 no other changes needed.
- * Fixed some lintian errors:
- - don't ignore errors of make clean in clean target
- - call dh_desktop in rules
+ * Added debian/po/nl.po . Thanks to Bart Cornelis
-- Patrick Winnertz <winnie at debian.org> Mon, 17 Dec 2007 09:10:29 +0100
@@ -147,10 +97,11 @@ slbackup-php (0.3-1) unstable; urgency=low
[Patrick Winnertz]
* Packaging new upstream release.
- * Merging changes from the l10n-Team into slbackup.php.
+ * Merging changes from the l10n-Team into slbackup.php.
Thanks to everybody who provided a translation!
- * Added translation of slbackup-php itself.
+ * Added translation of slbackup-php itself.
Thanks to Daniel Nylander.
+ *
-- Patrick Winnertz <patrick.winnertz at skolelinux.org> Fri, 13 Jul 2007 21:16:33 +0200
diff --git a/debian/control b/debian/control
index aefe6e5..599bf3e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,10 @@ Section: misc
Priority: optional
Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
Uploaders:
- Mike Gabriel <sunweaver at debian.org>
+ Mike Gabriel <sunweaver at debian.org>,
+ Patrick Winnertz <winnie at debian.org>,
+ Morten Werner Olsen <werner at debian.org>,
+ Finn-Arne Johansen <faj at bzz.no>
Standards-Version: 3.9.4
Build-Depends:
debhelper (>= 7.0.50~),
@@ -22,6 +25,8 @@ Depends:
php5-cli,
smarty3,
smarty-gettext (>= 1.0b1-7),
+Suggests:
+ x-www-browser,
Description: Web-based administration tool for slbackup
Slbackup-php provides the necessary functions to maintain a slbackup
repository.
diff --git a/debian/patches/001_nonhttps-failure.patch b/debian/patches/001_nonhttps-failure.patch
deleted file mode 100644
index c29ee81..0000000
--- a/debian/patches/001_nonhttps-failure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix non-https access on slbackup-php.
-Author: Wolfgang Schweer <schweer at arcor.de>
-Forwarded: http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=commitdiff;h=8ca937578aeb706ffb531fb451734ade66fef3d4
---- a/src/index.php
-+++ b/src/index.php
-@@ -620,6 +620,7 @@
- break ;
- case "nonhttps":
- $nonhttps = $value ;
-+ break ;
- case "Passwd":
- $passwd = $value ;
- $submit = "status" ;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1c84548..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-001_nonhttps-failure.patch
diff --git a/debian/slbackup-php.desktop b/debian/slbackup.desktop
similarity index 62%
copy from debian/slbackup-php.desktop
copy to debian/slbackup.desktop
index 0fe733f..718be69 100644
--- a/debian/slbackup-php.desktop
+++ b/debian/slbackup.desktop
@@ -4,8 +4,8 @@ Name=slbackup-php
GenericName=SLBackup configuration tool
Comment=Webpage for configuring slbackup
Version=1.0
-TryExec=x-www-browser http://localhost/slbackup-php/?nonhttps=warn
-Exec=x-www-browser http://localhost/slbackup-php/?nonhttps=warn
+TryExec=x-www-browser https://tjener/slbackup-php/
+Exec=x-www-browser https://tjener/slbackup-php/
Terminal=false
Type=Application
Categories=Application;Network;System;Security
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index b06bbc3..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-version=3
-http://alioth.debian.org/frs/?group_id=30229 \
- /frs/download.php/.*/slbackup-php-(.*)\.tar\.gz
-
diff --git a/src/functions.php b/src/functions.php
index 3eb90c6..7f52734 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -22,13 +22,13 @@ function loadConfig () {
global $backuphost, $backupuser, $backupconf, $backupcron,
$ssh_options, $logfile, $nonhttps, $smarty_templ, $smarty_compile ;
- @include_once ("/etc/slbackup/config.php") ;
+ @include_once ("/etc/slbackup-php/config.php") ;
if (empty ($nonhttps)) $nonhttps = $_COOKIE ['nonhttps'] ;
if (empty ($smarty_templ)) $smarty_templ = $_COOKIE ['smarty_templ'] ;
if (empty ($smarty_compile)) $smarty_compile = $_COOKIE ['smarty_compile'] ;
- if (empty ($backuphost)) $backuphost="backup" ;
+ if (empty ($backuphost)) $backuphost="localhost" ;
if (empty ($backupuser)) $backupuser="root" ;
if (empty ($backupconf)) $backupconf="/etc/slbackup/slbackup.conf" ;
if (empty ($backupcron)) $backupcron="/etc/cron.d/slbackup" ;
diff --git a/src/index.php b/src/index.php
index af2fad9..8a2e248 100644
--- a/src/index.php
+++ b/src/index.php
@@ -620,6 +620,7 @@ foreach ($arguments as $key => $value) {
break ;
case "nonhttps":
$nonhttps = $value ;
+ break ;
case "Passwd":
$passwd = $value ;
$submit = "status" ;
@@ -654,6 +655,7 @@ foreach ($arguments as $key => $value) {
break ;
case "selected":
$selected=$value ;
+ break ;
case "snapshot":
$snapshot=$value ;
break ;
@@ -684,6 +686,7 @@ if (isset ($passwd))
if (empty ($config)) {
if (empty ($_SERVER["HTTPS"])) {
$smarty->assign ('nonhttps', $nonhttps) ;
+ if ($nonhttps != $_COOKIE['nonhttps']) setcookie ('nonhttps', $nonhttps);
}
$smarty->assign ('backupuser', $backupuser) ;
$smarty->assign ('backuphost', $backuphost) ;
hooks/post-receive
--
slbackup-php.git (Debian package slbackup-php)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).
More information about the debian-edu-commits
mailing list