Index: openacs-4/packages/news/sql/postgresql/news-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/sql/postgresql/news-drop.sql,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/news/sql/postgresql/news-drop.sql	15 Mar 2019 17:14:34 -0000	1.11.2.1
+++ openacs-4/packages/news/sql/postgresql/news-drop.sql	29 Nov 2019 15:14:38 -0000	1.11.2.2
@@ -140,11 +140,26 @@
 select inline_0 ();
 drop function inline_0 ();
 
+-- *** Drop News Notification Type ***
+--
+select notification_type__delete((
+       select type_id from notification_types
+        where short_name = 'one_news_item_notif'));
 
--- *** Search contract de-registration ***
+-- *** Service contract de-registration ***
 --
 select acs_sc_impl__delete(
 	   'FtsContentProvider',		-- impl_contract_name
            'news'				-- impl_name
 );
 
+select acs_sc_impl__delete(
+	   'RssGenerationSubscriber',		-- impl_contract_name
+           'news'				-- impl_name
+);
+
+select acs_sc_impl__delete(
+	   'NotificationType',          -- impl_contract_name
+           'news_item_notif_type'	-- impl_name
+);
+
Index: openacs-4/packages/news/tcl/news-apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-apm-callback-procs.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/news/tcl/news-apm-callback-procs.tcl	29 Nov 2019 14:44:41 -0000	1.6.2.1
+++ openacs-4/packages/news/tcl/news-apm-callback-procs.tcl	29 Nov 2019 15:14:38 -0000	1.6.2.2
@@ -101,13 +101,13 @@
 	    5.2.0d4 5.2.0d5 {
 
        		# Create the impl and aliases for a news item
-	        set impl_id [create_news_item_impl]
+	        set impl_id [::news::install::create_news_item_impl]
 
     		# Create the notification type for a news item
-                set type_id [create_news_item_type $impl_id]
+                set type_id [::news::install::create_news_item_type $impl_id]
 
                 # Enable the delivery intervals and delivery methods for a news item
-                enable_intervals_and_methods $type_id
+                ::news::install::enable_intervals_and_methods $type_id
 	    }
 	}
 }
@@ -131,7 +131,7 @@
     rss_support::del_subscription -summary_context_id $package_id -owner news -impl_name news
 }
 
-ad_proc -public create_news_item_impl {
+ad_proc -public ::news::install::create_news_item_impl {
 
 } {
     Register the service contract implementation and return the impl_id
@@ -148,7 +148,7 @@
          }]
 }
 
-ad_proc -public create_news_item_type {
+ad_proc -public ::news::install::create_news_item_type {
 	impl_id
 } {
     Create the notification type for one news item
@@ -162,7 +162,7 @@
 }
 
 
-ad_proc -public enable_intervals_and_methods {type_id} {
+ad_proc -public ::news::install::enable_intervals_and_methods {type_id} {
     Enable the intervals and delivery methods of a specific type
 } {
     # Enable the various intervals and delivery method