[debian-edu-commits] debian-edu/slbackup-php.git (#5) - edu-wheezy (branch) updated: upstream/0.4.2

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  4f24c2d657b5ad7ffe479386eee60459e7214a93 (commit)
      from  90d69abfb1bc6695aeb329c436614743234cebd9 (commit)

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:
 Makefile         |    4 ++--
 debian/changelog |   11 +++++++++++
 debian/compat    |    2 +-
 debian/control   |   22 ++++++++++++++++++----
 debian/rules     |    2 +-
 src/index.php    |    2 ++
 6 files changed, 35 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 904dc3d..415685f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ po/*.po: po/slbackup-php.pot
 	msgmerge $@.bak $^ > $@ 
 
 locales/mo-stamp:
-	for po in $^ ; do \
+	for po in po/*.po ; do \
 	    locale=$$(basename $$po .po) ; \
 	    echo $$locale ; \
 	    mkdir -p locales/$$locale/LC_MESSAGES ; \
@@ -67,7 +67,7 @@ install: all
 	install -d $(DESTDIR)$(scriptdir)
 	install -d $(DESTDIR)$(templatedir)
 	install -d $(DESTDIR)$(localedir)
-	install -d $(DESTDIR)$(bindir)
+	#install -d $(DESTDIR)$(bindir)
 
 
 	for locale in $$(find locales -type f -name $(PACKAGE).mo -printf "%P ") ; do \
diff --git a/debian/changelog b/debian/changelog
index d98c1dd..012f7f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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):
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 2a69238..566a0e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,31 @@
 Source: slbackup-php
 Section: misc
 Priority: optional
-Maintainer: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
 Uploaders:
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
  Patrick Winnertz <winnie at debian.org>,
  Morten Werner Olsen <werner at debian.org>,
  Finn-Arne Johansen <faj at bzz.no>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli, quilt (>= 0.46-7~)
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ po-debconf,
+Homepage: http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=summary
+Vcs-Git: git://git.debian.org/debian-edu/slbackup-php.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/slbackup-php.git;a=summary
 
 Package: slbackup-php
 Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty3, ssh, php5-cli, smarty-gettext
-Description: web-based administration tool for slbackup
+Depends:
+ ${misc:Depends},
+ libapache2-mod-php5,
+ apache2,
+ smarty3,
+ ssh,
+ php5-cli,
+ smarty-gettext (>= 1.0b1-7)
+Description: Web-based administration tool for slbackup
  Slbackup-php provides the necessary functions to maintain a slbackup
  repository.
  .
@@ -22,3 +35,4 @@ Description: web-based administration tool for slbackup
   - verifying SSH keys and successful backups;
   - restoring from backups;
   - removing old backups from the repository.
+
diff --git a/debian/rules b/debian/rules
index e515c99..deb9373 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_clean
 	dh_quilt_patch
 	-$(MAKE) mo-files
 	dh_installdirs
diff --git a/src/index.php b/src/index.php
index c337711..af2fad9 100644
--- a/src/index.php
+++ b/src/index.php
@@ -618,6 +618,8 @@ foreach ($arguments as $key => $value) {
         case "locale": 
         case "PHPSESSID": 
             break ;
+        case "nonhttps":
+            $nonhttps = $value ;
         case "Passwd": 
             $passwd = $value ; 
             $submit = "status" ; 


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).