[med-svn] r2556 - trunk/packages/agdbnet/trunk/debian/patches

[tille at alioth.debian.org]

Author: tille
Date: 2008-09-29 13:00:08 +0000 (Mon, 29 Sep 2008)
New Revision: 2556

Removed:
   trunk/packages/agdbnet/trunk/debian/patches/20_metainfo.patch
Modified:
   trunk/packages/agdbnet/trunk/debian/patches/series
Log:
Applied upstream


Deleted: trunk/packages/agdbnet/trunk/debian/patches/20_metainfo.patch
===================================================================
--- trunk/packages/agdbnet/trunk/debian/patches/20_metainfo.patch	2008-09-29 12:56:43 UTC (rev 2555)
+++ trunk/packages/agdbnet/trunk/debian/patches/20_metainfo.patch	2008-09-29 13:00:08 UTC (rev 2556)
@@ -1,68 +0,0 @@
-This patch is a feature addition which might be incorporated upstream.
-
-A web page should feature some meta information for search engines etc.
-If your institution really asks you for inclusion of this information if
-you want to publish a web page you can use this patch which adds the
-feature of reading an additional configuration file "meta.html".
-The following syntax has to be used in this file:
-  <meta name="name_of_metatag" content="content of meta tag" />
-and you can also add a favicon by using
-  <link rel="shortcut icon" href="/agdbnet/dbname/imgs/favicon.gif" type="image/gif" />
-This is documented in README.Debian.
-Forewarded upstream.
---- agdbnet_v1.0.0.orig/cgi-bin/agdbnet.pl
-+++ agdbnet_v1.0.0/cgi-bin/agdbnet.pl
-@@ -196,6 +196,25 @@
- 	}
- 	my $stylesheet = "$system{'webroot'}/$system{'longcode'}/stylesheet.css";
- 	print $q->header( -expires => '+1d' );
-+        my $metafile = "$ENV{'DOCUMENT_ROOT'}$system{'webroot'}/$system{'longcode'}/meta.html";
-+        my %metacontent;
-+        my %shortcuticon;
-+        if ( -e $metafile ) {
-+		if ( open( FILE, $metafile ) ) {
-+                	while ( <FILE> ) {
-+				if ( $_ =~ /<meta\s+name="([^"]+)"\s+content="([^"]+)"\s*\/?>/ ) {
-+					$metacontent{$1} = $2;
-+				}
-+				if ( $_ =~ /<link\s+rel="shortcut icon"\s+href="([^"]+)"\s+type="([^"]+)"\s*\/?>/ ) {
-+					$shortcuticon{'-rel'}  = 'shortcut icon';
-+                                        $shortcuticon{'-href'} = $1;
-+                                        $shortcuticon{'-type'} = $2;
-+				}
-+                        }
-+                        close FILE;
-+                }
-+	}
-+
- 	if ( $page eq 'version' ) {
- 		print $q->start_html( -title => "agdbNet version $version" );
- 		print "<h1>agdbNet</h1>";
-@@ -229,11 +248,22 @@
- 		print $q->end_html;
- 		return;
- 	} else {
--		print $q->start_html(
--			-title    => $system{'description'},
--			-encoding => 'UTF-8',
--			-style    => { 'src' => $stylesheet }
--		);
-+		if ( %shortcuticon ) {
-+			print $q->start_html(
-+				-title    => $system{'description'},
-+				-encoding => 'UTF-8',
-+				-meta     => { %metacontent },
-+				-style    => { -src => $stylesheet },
-+				-head     => CGI->Link({ %shortcuticon })
-+			);
-+		} else {
-+			print $q->start_html(
-+				-title    => $system{'description'},
-+				-encoding => 'UTF-8',
-+				-meta     => { %metacontent },
-+				-style    => { -src => $stylesheet }
-+			);
-+		}
- 	}
- 
- 	#Check if header file exists, if so print it

Modified: trunk/packages/agdbnet/trunk/debian/patches/series
===================================================================
--- trunk/packages/agdbnet/trunk/debian/patches/series	2008-09-29 12:56:43 UTC (rev 2555)
+++ trunk/packages/agdbnet/trunk/debian/patches/series	2008-09-29 13:00:08 UTC (rev 2556)
@@ -3,4 +3,3 @@
 11_moreinfo.patch
 12_apache_is_web-data.patch
 13_ident_authentication.patch
-20_metainfo.patch