[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Moving f-prot-installer into volatile.d.n



Martin Zobel-Helas schrieb:

>Hi Johannes,
>
>On Tuesday, 25 Oct 2005, you wrote:
>  
>
>>Hello Volatile team!
>>
>>The f-prot-installer package has recently been broken two times due to
>>vendor-side changes. Getting the package updated in stable is a
>>nightmare. Therefore I have been contemplating the idea of moving it
>>into volatile.debian.net.
>>    
>>
>
>in general i have no problem with it. I think your package is a valid
>candidate. Andi, others, any opinion about it?
>
>Johannes, it would help if you could either post a link to a diff of the
>package or post the diff to the list.
>  
>
See attached diff. The actual change is a one-liner. (two one-liners,
actually, because since sarge was release, the package was broken two
times by upstream changes)

>  
>
>>Please let me know your thoughts about this. Is there any policy
>>document available, decribing the procedure? I am not a DD, the package
>>    
>>
>
>http://lists.debian.org/debian-volatile/2005/08/msg00008.html
>  
>
Thanks.

>  
>
>>is sponsored, if that makes any difference for the volatile archive.
>>    
>>
>
>Who is your sponsor? doko? seb128?
>  
>
Officially doko. He is also the original author of the package.
Sebastien, however has been very supportive with GNOME related packages
that I helped maintainig and therefore I asked him a number of times to
upload f-prot-installer for me. In fact, he has been doing most of the
uploads.

Thanks,

Johannes
diff -urN f-prot-installer-0.5.14/debian/changelog f-prot-installer-0.5.14.sarge.2/debian/changelog
--- f-prot-installer-0.5.14/debian/changelog	2005-03-01 21:57:35.000000000 +0100
+++ f-prot-installer-0.5.14.sarge.2/debian/changelog	2005-10-23 18:05:57.000000000 +0200
@@ -1,3 +1,21 @@
+f-prot-installer (0.5.14.sarge.2) stable; urgency=low
+
+  * Sigh. Vendor has modified check-updates.pl, making it incompatible
+    with our wonderful update-f-prot script. To solve this, when patching
+    check-updates.pl, we have to delete the line containing the string
+    "Couldn't determine signature file directory".
+
+ -- Johannes Rohr <jr.debian@rohr.org>  Sun, 23 Oct 2005 18:05:56 +0200
+
+f-prot-installer (0.5.14.sarge.1) stable; urgency=medium
+
+  * Package was rendered unusable by external changes. Fix: Instead of
+    patching, install f-prot.sh into /usr/lib/f-prot and create symlink
+    /usr/bin/f-prot. (closes: #323930)
+  * Update my email. Old one will stop working soon.
+
+ -- Johannes Rohr <jr.debian@rohr.org>  Sat, 10 Sep 2005 20:34:24 +0200
+
 f-prot-installer (0.5.14) unstable; urgency=low
 
   * Correct debconf message concerning download size (both in templates as
diff -urN f-prot-installer-0.5.14/debian/control f-prot-installer-0.5.14.sarge.2/debian/control
--- f-prot-installer-0.5.14/debian/control	2004-04-01 09:55:32.000000000 +0200
+++ f-prot-installer-0.5.14.sarge.2/debian/control	2005-09-10 20:32:39.000000000 +0200
@@ -1,7 +1,7 @@
 Source: f-prot-installer
 Section: contrib/utils
 Priority: optional
-Maintainer: Johannes Rohr <j.rohr@comlink.org>
+Maintainer: Johannes Rohr <jr.debian@rohr.org>
 Uploaders: Matthias Klose <doko@debian.org>
 Build-Depends: debhelper (>= 4.1.68),docbook-to-man
 Standards-Version: 3.6.1.0
diff -urN f-prot-installer-0.5.14/debian/update-f-prot f-prot-installer-0.5.14.sarge.2/debian/update-f-prot
--- f-prot-installer-0.5.14/debian/update-f-prot	2005-02-14 13:21:23.000000000 +0100
+++ f-prot-installer-0.5.14.sarge.2/debian/update-f-prot	2005-10-23 21:03:01.000000000 +0200
@@ -139,7 +139,7 @@
     available.
 
     I'm going to download the new version now. 
-    Download size is approximately 1.8 MByte.
+    Download size is approximately 3.4 MByte.
 
 EOF
 
@@ -238,6 +238,7 @@
 	sed \
 	    -e "s,^my \$signatureDirectory = .*,my \$signatureDirectory = \'/var/lib/f-prot/\';,g" \
 	    -e 's,/usr/local/f-prot,/usr/lib/f-prot,g' \
+	    -e "/or die..Couldn.t determine signature file directory/d" \
 	    -e 's,check-updates\.pl,check-updates,g' \
 	    $f > $f.new
 	if cmp --silent $f $f.new; then
@@ -274,15 +275,13 @@
 # 	mkdir -p $UNPACK_DIR/man8
 # 	mv -f *.8 $UNPACK_DIR/man8/
 #     fi
-
-    sed 's,/usr/local,/usr/lib,' $UNPACK_DIR/f-prot/f-prot.sh > /usr/bin/f-prot
-    chmod 755 /usr/bin/f-prot
-    rm -f $UNPACK_DIR/f-prot/f-prot.sh
-
+#
 
     do_patch
 
     cp -pr $UNPACK_DIR/f-prot/* $FPROT_DIR/
+    # Necessary with f-prot 4.6.X
+    ln -sf /usr/lib/f-prot/f-prot.sh /usr/bin/f-prot
     chmod 755 $FPROT_DIR/tools
     chmod 755 $FPROT_DIR/tools/check-updates
     cp -f $MD5SUM_NEW $MD5SUM_STORED

Reply to: