r11709 - in /packages/experimental/update-notifier/debian: changelog patches/03_detect_debian_cd.diff
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Thu Jun 28 00:15:28 UTC 2007
Author: kov
Date: Thu Jun 28 00:15:28 2007
New Revision: 11709
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11709
Log:
updated to 0.57.3; had to update the cd patch because of
the adition of handling for aptoncd by ubuntu
Modified:
packages/experimental/update-notifier/debian/changelog
packages/experimental/update-notifier/debian/patches/03_detect_debian_cd.diff
Modified: packages/experimental/update-notifier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-notifier/debian/changelog?rev=11709&op=diff
==============================================================================
--- packages/experimental/update-notifier/debian/changelog (original)
+++ packages/experimental/update-notifier/debian/changelog Thu Jun 28 00:15:28 2007
@@ -1,4 +1,4 @@
-update-notifier (0.57.1-1) UNRELEASED; urgency=low
+update-notifier (0.57.3-1) UNRELEASED; urgency=low
[ Alan Baghumian ]
* New upstream release (Closes: #422507).
@@ -18,7 +18,11 @@
[ Sven Arvidsson ]
* Add a man page (Closes: #404814).
- -- Alan Baghumian <alan at technotux.org> Wed, 20 Jun 2007 08:46:55 +0330
+ [ Gustavo Noronha Silva ]
+ * debian/03_detect_debian_cd.diff:
+ - reupdated for 0.57.3 (Alan had updated this for 0.57.1)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 27 Jun 2007 21:11:05 -0300
update-notifier (0.42.12-3) unstable; urgency=low
Modified: packages/experimental/update-notifier/debian/patches/03_detect_debian_cd.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-notifier/debian/patches/03_detect_debian_cd.diff?rev=11709&op=diff
==============================================================================
--- packages/experimental/update-notifier/debian/patches/03_detect_debian_cd.diff (original)
+++ packages/experimental/update-notifier/debian/patches/03_detect_debian_cd.diff Thu Jun 28 00:15:28 2007
@@ -1,20 +1,25 @@
-diff -urpN update-notifier-0.57.1/src/hal.c update-notifier-0.57.1.new/src/hal.c
---- update-notifier-0.57.1/src/hal.c 2007-05-14 13:44:33.000000000 +0330
-+++ update-notifier-0.57.1.new/src/hal.c 2007-06-20 08:57:04.000000000 +0330
-@@ -307,12 +307,12 @@ hal_property_modified(LibHalContext *ctx
+--- src/hal.c.orig 2007-06-26 08:00:12.000000000 -0300
++++ src/hal.c 2007-06-27 21:09:29.000000000 -0300
+@@ -325,15 +325,15 @@
NULL);
//g_print("mounted: %s on %s\n", udi, mount_point);
- char *ubuntu_dir = g_strdup_printf("%s/ubuntu",mount_point);
-- if(!g_file_test (ubuntu_dir, G_FILE_TEST_IS_SYMLINK)) {
++ char *debian_dir = g_strdup_printf("%s/debian",mount_point);
+ char *aptoncd_file = g_strdup_printf("%s/aptoncd.info",mount_point);
+- if(! (g_file_test (ubuntu_dir, G_FILE_TEST_IS_SYMLINK) ||
+- g_file_test (aptoncd_file, G_FILE_TEST_IS_REGULAR) )) {
- g_free(ubuntu_dir);
-+ char *debian_dir = g_strdup_printf("%s/debian",mount_point);
-+ if(!g_file_test (debian_dir, G_FILE_TEST_IS_SYMLINK)) {
-+ g_free(debian_dir);
- return;
+- g_free(aptoncd_file);
+- return;
++ if(! (g_file_test (debian_dir, G_FILE_TEST_IS_SYMLINK) ||
++ g_file_test (aptoncd_file, G_FILE_TEST_IS_REGULAR)) ) {
++ g_free(debian_dir);
++ g_free(aptoncd_file);
++ return;
}
- g_free(ubuntu_dir);
+ g_free(debian_dir);
+ g_free(aptoncd_file);
/* this looks like a ubuntu CD, run the checker script to verify
- * this. We expect the following return codes:
More information about the pkg-gnome-commits
mailing list