merged heads

diff --git a/Makefile b/Makefile
index 3b25f0f..acf4270 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ endif
 
 # clean up
 clean: distclean
-       [ -e Doxyfile ] && rm Doxyfile
+       if [ -e Doxyfile ]; then rm Doxyfile; fi;
 
 distclean:
        $(RM) doc/source

diff --git a/debian/changelog b/debian/changelog
index 4e97b83..f5e2609 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+iserv-mod-error-reporter (9.10.23-1) unstable; urgency=low
+
+  * FIX: comment function was broken: Change button had no name
+  * FIX: since postgresql-8.3, sequences are not allowed to have INSERT and 
+    DELETE rights, results in warning
+  * debian/control: added fields for IServ "app store"
+
+ -- Roland Hieber (Package Signing Key) <roland.hieber@wilhelm-gym.net>  Fri, 23 Oct 2009 02:23:05 +0200
+
 iserv-mod-error-reporter (9.08.25-1) unstable; urgency=low
 
   * fixed update script: could not authenticate as root in psql

diff --git a/debian/rules b/debian/rules
index c8b5c3d..e8b4a1d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ build:
        dh_testdir
 
 binary-indep: 
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
        dh_clean
 
        dh_testdir
@@ -21,27 +21,9 @@ binary-indep:
        dh_testroot
        dh_installchangelogs 
        dh_installdocs doc/changelog.old.html doc/TODO doc/source/
-       #dh_installexamples
-       ##dh_install
-       ##dh_installmenu
-       ##dh_installdebconf     
-       ##dh_installlogrotate
-       ##dh_installemacsen
-       ##dh_installpam
-       ##dh_installmime
-       ##dh_python
-       #dh_installinit
-       #dh_installcron
-       #dh_installinfo
-       #dh_installman
-       #dh_link
-       #dh_strip
        dh_compress
        dh_fixperms
-       ##dh_perl
-       ##dh_makeshlibs
        dh_installdeb
-       #dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb
@@ -54,7 +36,7 @@ binary: binary-indep
 clean:
        dh_testdir
        dh_testroot
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
        dh_clean 
 
 .PHONY: build clean binary-indep binary install

diff --git a/src/detail.php b/src/detail.php
index 6561b8f..b091f8f 100644 (file)
--- a/src/detail.php
+++ b/src/detail.php
@@ -65,7 +65,8 @@ $er = $doc->getErrorReportByID($getUid);
 $strOldComment = $er->getComment();
 
 // Probably we have to update an error report
-if($getAction == "update" and $postSubmit == _c("Change"))
+echo "PostSubmit: $postSubmit";
+if($getAction == "update" and $postSubmit == _("Change"))
 {
   if($cfgErrors->userIsAdmin()) {
     $postComment = stripslashes(@$_POST["comment"]);
@@ -124,8 +125,8 @@ if($cfgErrors->userIsAdmin()) {
       "Comment written by:"), erGetRealUserName($er->getCommentOwner()));
   }
 }
-echo sprintf("<tr><td /><td><{$GLOBALS["smlbtn"]} value='%s' /></td></tr>\n",
-  _("Change"));
+echo sprintf("<tr><td /><td><{$GLOBALS["smlbtn"]} name='submit' value='%s' ".
+  "/></td></tr>\n", _("Change"));
 echo "</table></form><p />\n";
 _PageBlue();
 ?>