New Upstream Snapshot - phppgadmin

• QA Page
• Maintainer email: team+postgresql@tracker.debian.org
• Automatic publish policy: main: push-derived , pristine-tar: push-derived , upstream: push-derived
• Last processed: 2023-11-06T00:50 (took 20m2s)
• Branch URL: https://salsa.debian.org/postgresql/phppgadmin.git -b debian/sid (taken from version 7.14.7+dfsg-1)
• Queue position: 127997 (a 54w0d wait)

Schedule a new run

Ready changes

Publish now

Summary

Merged new upstream version: 7.13.0+git20210217.2.f3171e9+dfsg (was: 7.13.0+git20210217.1.f3171e9+dfsg).

Resulting package

Built on 2022-12-17T00:54 (took 5m38s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots phppgadmin

Diff

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 31e2ac7..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/tests export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index afa3529..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-selenium/tests/config.inc.php
-tests/selenium/config.test.php
diff --git a/CREDITS b/CREDITS
index d8ef3ae..1f870b8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -21,15 +21,15 @@ Translators
 - Tadashi Jokagi (Japanese)
 - Rafal Slubowski (Polish)
 - Alexander Khodorisky (Russian)
-- Martin Marqu�s (Spanish)
+- Martin Marqués (Spanish)
 - Andrej Misovic (Slovak)
 - Devrim Gunduz (Turkish)
 - Libor Vanek (Czech)
-- Marek Cernock� (Czech)
+- Marek Černocký (Czech)
 - Stefan Malmqvist (Swedish)
 - Nicola Soranzo (Italian)
 - Petri Jooste (Afrikaans)
-- Sulyok P�ter (Hungarian)
+- Sulyok Péter (Hungarian)
 - Zaki Almuallim (Arabic)
 - Erdenemandal Bat-Erdene (Mongolian)
 - Alex Rootoff (Ukrainian)
@@ -40,9 +40,8 @@ Translators
 - Bernat Pegueroles (Catalan)
 - Fernando Wendt (Brazilan Portuguese)
 - Adamantios Diamantidis (Greek)
-- Marek �ernock� (Czech)
 - Alexey Baturin (Russian UTF8)
-- Adri�n Chaves Fern�ndez (Galician)
+- Adrián Chaves Fernández (Galician)
 
 Look & Feel
 
@@ -79,7 +78,7 @@ Contributors
 - Leonardo Augusto Sapiras (Improve phpPgAdmin ergonomy during the GSoC 2010, with ioguix as mentor)
 - Julien Rouhaud, aka. rjuju (nested groups)
 - Felipe Figueroa aka. amenadiel
-- Jean-Michel Vourg�re (nirgal)
+- Jean-Michel Vourgère (nirgal)
 
 Third Party Libraries
 
diff --git a/HISTORY b/HISTORY
index 3ff9775..3748ec4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -15,7 +15,7 @@ Features:
 Bugs:
 * Fix bug where sorting on selects dumped you to the table screen (MichaMEG)
 
-Incompatabilities:
+Incompatibilities:
 * This release drops support for PHP 7.1
 * This will be the last release to support PHP 7.2
 
diff --git a/classes/database/Postgres94.php b/classes/database/Postgres94.php
index 908825e..913ea04 100644
--- a/classes/database/Postgres94.php
+++ b/classes/database/Postgres94.php
@@ -5,9 +5,9 @@
  *
  */
 
-include_once('./classes/database/Postgres.php');
+include_once('./classes/database/Postgres95.php');
 
-class Postgres94 extends Postgres {
+class Postgres94 extends Postgres95 {
 
 	var $major_version = 9.4;
 
diff --git a/debian/changelog b/debian/changelog
index 4dd0196..952093b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-phppgadmin (7.13.0+dfsg-3) UNRELEASED; urgency=medium
+phppgadmin (7.13.0+git20210217.2.f3171e9+dfsg-1) UNRELEASED; urgency=medium
 
   * Remove constraints unnecessary since buster:
     + Build-Depends: Drop versioned constraint on pkg-php-tools.
     + Remove 1 maintscript entries from 1 files.
+  * New upstream snapshot.
+  * Drop patch credit-utf8, present upstream.
+  * New upstream snapshot.
 
- -- Debian Janitor <janitor@jelmer.uk>  Sun, 24 Jul 2022 07:31:44 -0000
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 17 Dec 2022 00:50:48 -0000
 
 phppgadmin (7.13.0+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/patches/credit-utf8 b/debian/patches/credit-utf8
deleted file mode 100644
index c3c8a1e..0000000
--- a/debian/patches/credit-utf8
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Fix CREDITS file encoding
-Author: Jean-Michel Vourgère <nirgal@debian.org>
-Applied-Upstream: commit:e2aa8f687573104d492311b5853c25a5dce71973
-Last-Update: 2020-12-26
-
---- phppgadmin-7.13.0+dfsg.orig/CREDITS
-+++ phppgadmin-7.13.0+dfsg/CREDITS
-@@ -21,15 +21,15 @@ Translators
- - Tadashi Jokagi (Japanese)
- - Rafal Slubowski (Polish)
- - Alexander Khodorisky (Russian)
--- Martin Marqu�s (Spanish)
-+- Martin Marqués (Spanish)
- - Andrej Misovic (Slovak)
- - Devrim Gunduz (Turkish)
- - Libor Vanek (Czech)
--- Marek Cernock� (Czech)
-+- Marek Černocký (Czech)
- - Stefan Malmqvist (Swedish)
- - Nicola Soranzo (Italian)
- - Petri Jooste (Afrikaans)
--- Sulyok P�ter (Hungarian)
-+- Sulyok Péter (Hungarian)
- - Zaki Almuallim (Arabic)
- - Erdenemandal Bat-Erdene (Mongolian)
- - Alex Rootoff (Ukrainian)
-@@ -40,9 +40,8 @@ Translators
- - Bernat Pegueroles (Catalan)
- - Fernando Wendt (Brazilan Portuguese)
- - Adamantios Diamantidis (Greek)
--- Marek �ernock� (Czech)
- - Alexey Baturin (Russian UTF8)
--- Adri�n Chaves Fern�ndez (Galician)
-+- Adrián Chaves Fernández (Galician)
- 
- Look & Feel
- 
-@@ -79,7 +78,7 @@ Contributors
- - Leonardo Augusto Sapiras (Improve phpPgAdmin ergonomy during the GSoC 2010, with ioguix as mentor)
- - Julien Rouhaud, aka. rjuju (nested groups)
- - Felipe Figueroa aka. amenadiel
--- Jean-Michel Vourg�re (nirgal)
-+- Jean-Michel Vourgère (nirgal)
- 
- Third Party Libraries
- 
diff --git a/debian/patches/hide-selenium-tests b/debian/patches/hide-selenium-tests
index 8e38cb2..f184f8b 100644
--- a/debian/patches/hide-selenium-tests
+++ b/debian/patches/hide-selenium-tests
@@ -5,8 +5,10 @@ Origin: https://github.com/phppgadmin/project/blob/master/release.sh
 Last-Update: 2019-12-27
 Forwarded: not-needed
 
---- phppgadmin-7.12.1+dfsg.orig/intro.php
-+++ phppgadmin-7.12.1+dfsg/intro.php
+Index: phppgadmin.git/intro.php
+===================================================================
+--- phppgadmin.git.orig/intro.php
++++ phppgadmin.git/intro.php
 @@ -62,7 +62,6 @@
  	<li><a href="<?php echo $lang['strpgsqlhome_url'] ?>"><?php echo $lang['strpgsqlhome'] ?></a></li>
  	<li><a href="http://sourceforge.net/tracker/?group_id=37132&amp;atid=418980"><?php echo $lang['strreportbug'] ?></a></li>
diff --git a/debian/patches/localhost.patch b/debian/patches/localhost.patch
index 9e78653..e4b49dc 100644
--- a/debian/patches/localhost.patch
+++ b/debian/patches/localhost.patch
@@ -2,10 +2,10 @@ Go through localhost instead of Unix-domain socket because localhost allows
 password access by default on Debian; Unix-domain socket uses ident, which
 doesn't work through the web server.
 
-Index: phppgadmin/conf/config.inc.php-dist
+Index: phppgadmin.git/conf/config.inc.php-dist
 ===================================================================
---- phppgadmin.orig/conf/config.inc.php-dist
-+++ phppgadmin/conf/config.inc.php-dist
+--- phppgadmin.git.orig/conf/config.inc.php-dist
++++ phppgadmin.git/conf/config.inc.php-dist
 @@ -15,7 +15,7 @@
  
  	// Hostname or IP address for server.  Use '' for UNIX domain socket.
diff --git a/debian/patches/php8 b/debian/patches/php8
index 796d1d5..622acd5 100644
--- a/debian/patches/php8
+++ b/debian/patches/php8
@@ -4,8 +4,10 @@ Author: Jean-Michel Vourgère <nirgal@debian.org>
 Forwarded: https://github.com/phppgadmin/phppgadmin/pull/126
 Last-Update: 2020-12-26
 
---- phppgadmin-7.13.0+dfsg.orig/all_db.php
-+++ phppgadmin-7.13.0+dfsg/all_db.php
+Index: phppgadmin.git/all_db.php
+===================================================================
+--- phppgadmin.git.orig/all_db.php
++++ phppgadmin.git/all_db.php
 @@ -199,7 +199,7 @@
  		echo "\t\t<td class=\"data1\">\n";
  		echo "\t\t\t<select name=\"formEncoding\">\n";
diff --git a/debian/patches/sequence_priviledge b/debian/patches/sequence_priviledge
index 690de2f..ad0519d 100644
--- a/debian/patches/sequence_priviledge
+++ b/debian/patches/sequence_priviledge
@@ -3,8 +3,10 @@ Author: Jean-Michel Vourgère <nirgal@debian.org>
 Forwarded: https://github.com/phppgadmin/phppgadmin/pull/127
 Last-Update: 2020-12-26
 
---- phppgadmin-7.13.0+dfsg.orig/classes/database/Postgres.php
-+++ phppgadmin-7.13.0+dfsg/classes/database/Postgres.php
+Index: phppgadmin.git/classes/database/Postgres.php
+===================================================================
+--- phppgadmin.git.orig/classes/database/Postgres.php
++++ phppgadmin.git/classes/database/Postgres.php
 @@ -2629,9 +2629,9 @@ class Postgres extends ADODB_base {
  		$this->fieldClean($sequence);
  		$this->clean($sequence);
diff --git a/debian/patches/series b/debian/patches/series
index f0137e9..bb40608 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 localhost.patch
 hide-selenium-tests
-credit-utf8
 versionning-adodb5.21
 php8
 sequence_priviledge
diff --git a/debian/patches/versionning-adodb5.21 b/debian/patches/versionning-adodb5.21
index aacac9e..33d2783 100644
--- a/debian/patches/versionning-adodb5.21
+++ b/debian/patches/versionning-adodb5.21
@@ -10,8 +10,10 @@ Author: Jean-Michel Vourgère <nirgal@debian.org>
 Forwarded: https://github.com/phppgadmin/phppgadmin/pull/125
 Last-Update: 2020-12-26
 
---- phppgadmin-7.13.0+dfsg.orig/classes/Misc.php
-+++ phppgadmin-7.13.0+dfsg/classes/Misc.php
+Index: phppgadmin.git/classes/Misc.php
+===================================================================
+--- phppgadmin.git.orig/classes/Misc.php
++++ phppgadmin.git/classes/Misc.php
 @@ -494,7 +494,7 @@
  				exit;
  			}
@@ -21,8 +23,10 @@ Last-Update: 2020-12-26
  
  			// Create a database wrapper class for easy manipulation of the
  			// connection.
---- phppgadmin-7.13.0+dfsg.orig/libraries/lib.inc.php
-+++ phppgadmin-7.13.0+dfsg/libraries/lib.inc.php
+Index: phppgadmin.git/libraries/lib.inc.php
+===================================================================
+--- phppgadmin.git.orig/libraries/lib.inc.php
++++ phppgadmin.git/libraries/lib.inc.php
 @@ -236,7 +236,7 @@
  		$_server_info = $misc->getServerInfo();
  
diff --git a/tests/simpletests/data/CFunction/euc_jp_and_sjis.so b/tests/simpletests/data/CFunction/euc_jp_and_sjis.so
new file mode 100644
index 0000000..65ceb2a
Binary files /dev/null and b/tests/simpletests/data/CFunction/euc_jp_and_sjis.so differ

Debdiff

File lists identical (after any substitutions)

No differences were encountered in the control files

More details

Full run details