Package: genpower
Version: 1.0.5-2.1
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu intrepid ubuntu-patch

In Ubuntu, we've applied the attached patch to achieve the following:

  * postinst should mention /usr/share/docs not /usr/docs
  * Remove -DNEWINIT from make call in debian/rules
  * Bumped Standards-Version to 3.8.0

We thought you might be interested in doing the same.
diff -u genpower-1.0.5/debian/control genpower-1.0.5/debian/control
--- genpower-1.0.5/debian/control
+++ genpower-1.0.5/debian/control
@@ -2,7 +2,7 @@
 Section: admin
 Priority: extra
 Maintainer: Brian White <[EMAIL PROTECTED]>
-Standards-Version: 3.1.1.1
+Standards-Version: 3.8.0
 
 Package: genpower
 Architecture: any
diff -u genpower-1.0.5/debian/changelog genpower-1.0.5/debian/changelog
--- genpower-1.0.5/debian/changelog
+++ genpower-1.0.5/debian/changelog
@@ -1,3 +1,12 @@
+genpower (1.0.5-2.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #238959):
+    - postinst should mention /usr/share/docs not /usr/docs
+    - Remove -DNEWINIT from make call in debian/rules
+  * Bumped Standards-Version to 3.8.0
+
+ -- Nathan Handler <[EMAIL PROTECTED]>  Tue, 24 Jun 2008 09:15:26 -0500
+
 genpower (1.0.5-2.1) unstable; urgency=low
 
   * Non-maintainer upload to solve release goal.
@@ -5,6 +14,29 @@
 
  -- Petter Reinholdtsen <[EMAIL PROTECTED]>  Sat, 29 Mar 2008 12:21:42 +0100
 
+genpower (1.0.5-2ubuntu3) intrepid; urgency=low
+
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification. (LP: #230350)
+
+ -- Andrea Colangelo <[EMAIL PROTECTED]>  Fri, 23 May 2008 10:07:16 +0200
+
+genpower (1.0.5-2ubuntu2) gutsy; urgency=low
+
+  * Cleaned up source.
+  * Cleaned up debian directory.
+  * postrm should mention /usr/share/docs not /usr/docs 
+    (closes: LP #134611)
+
+ -- Chuck Short <[EMAIL PROTECTED]>  Sat, 25 Aug 2007 09:21:36 -0400
+
+genpower (1.0.5-2ubuntu1) feisty; urgency=low
+
+  * Re-sync with Debian
+  * Remove -DNEWINIT from make call in debian/rules
+
+ -- Barry deFreese <[EMAIL PROTECTED]>  Thu, 25 Jan 2007 20:54:01 -0500
+
 genpower (1.0.5-2) unstable; urgency=low 
 
   * Remove "upsstat" file on purge (closes: #330799)
@@ -14,14 +46,12 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Mon,  4 Dec 2006 15:09:27 -0500
 
-  
 genpower (1.0.5-1) unstable; urgency=low 
 
   * Fixed problem with kill-inverter time being 1/100 of specified time (closes: #280731)
 
  -- Brian White <[EMAIL PROTECTED]>  Tue,  4 Jan 2005 17:18:24 -0500
 
-  
 genpower (1.0.4-1) unstable; urgency=low 
 
   * Corrected problem copying strings from config file (closes: #190206)
@@ -31,28 +61,24 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Sat, 17 Jan 2004 23:09:35 -0500
 
-  
 genpower (1.0.3-1) unstable; urgency=low 
 
   * Finally got around to getting new source from sf.net (closes: #107511)
 
  -- Brian White <[EMAIL PROTECTED]>  Sun, 23 Feb 2003 13:27:20 -0500
 
-  
 genpower (1.0.1-14) unstable; urgency=low 
 
   * Added new APC-ES cable (closes: 107511)
 
  -- Brian White <[EMAIL PROTECTED]>  
 
-  
 genpower (1.0.1-13) unstable; urgency=low 
 
   * Fixed install syntax errors (closes: 82756)
 
  -- Brian White <[EMAIL PROTECTED]>  Thu, 18 Jan 2001 22:57:15 -0500
 
-  
 genpower (1.0.1-12) unstable; urgency=low 
 
   * Added "apc-23A" UPS cable description (closes: #67817)
@@ -62,7 +88,6 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Sat, 13 Jan 2001 21:14:56 -0500
 
-
 genpower (1.0.1-11) unstable; urgency=low
 
   * Fixed start priority to be after kerneld (Bug#47505)
@@ -72,7 +97,6 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Wed, 27 Oct 1999 16:21:31 -0400
 
-
 genpower (1.0.1-10) unstable; urgency=low
 
   * Added "blackout-buster" UPS cable description
@@ -80,14 +104,12 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Mon, 30 Aug 1999 10:57:26 -0400
 
-
 genpower (1.0.1-9) unstable; urgency=low
 
   * Fixed syntax error for "now" shutdown times (Bug#35150,#39695)
 
  -- Brian White <[EMAIL PROTECTED]>  Fri, 27 Aug 1999 14:16:53 -0400
 
-
 genpower (1.0.1-8) unstable; urgency=low
 
   * Now uses initreq (Bug#23007)
@@ -95,7 +117,6 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Tue, 13 Oct 1998 12:04:14 -0400
 
-
 genpower (1.0.1-7) unstable; urgency=low
 
   * Wrote new copyright file (Bug#17925)
@@ -103,7 +124,6 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Wed, 11 Mar 1998 12:25:32 -0500
 
-
 genpower (1.0.1-6) unstable; urgency=low
 
   * Added cable for TrippLite OminiSmart PNP 675
@@ -111,7 +131,6 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Tue, 13 Jan 1998 19:09:14 -0500
 
-
 genpower (1.0.1-5) unstable; urgency=low
 
   * Fixed documentation bugs (bug#11973)
@@ -119,21 +138,18 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Mon, 15 Sep 1997 20:00:29 -0400
 
-
 genpower (1.0.1-4) unstable; urgency=low
 
   * Added new APC Plug-n-Play cable from Chris Hansen!
 
  -- Brian White <[EMAIL PROTECTED]>  Sat, 31 May 1997 13:51:36 -0400
 
-
 genpower (1.0.1-3) unstable; urgency=low
 
   * fixed location of man page (Bug#6581)
 
  -- Brian White <[EMAIL PROTECTED]>  Tue, 14 Jan 1997 12:41:41 -0500
 
-
 genpower (1.0.1-2) unstable; urgency=low
 
   * improved install & remove scripts
@@ -142,7 +158,6 @@
 
  -- Brian White <[EMAIL PROTECTED]>  Fri,  8 Nov 1996 10:17:40 -0500
 
-
 genpower (1.0.1-1) unstable; urgency=low
 
   * first Debian package
@@ -153,4 +168,4 @@
-
 Local variables:
 mode: debian-changelog
 End:
+
diff -u genpower-1.0.5/debian/postinst genpower-1.0.5/debian/postinst
--- genpower-1.0.5/debian/postinst
+++ genpower-1.0.5/debian/postinst
@@ -32,7 +32,7 @@
 echo "- Note that genpower will not work with the smart-signalling mode supported by"
 echo "  most UPS systems.  You will likely have to build a special cable to make use"
 echo "  of the UPS's dumb-signalling mode (if it has one).  Information on this can"
-echo "  can be found in the /usr/doc/genpower/cables directory.  If you have an APC,"
+echo "  can be found in the /usr/share/doc/genpower/cables directory.  If you have an APC,"
 echo "  unit you should be able to use the 'apc-pnp' cable type with the Windows-95"
 echo "  PNP (plug-n-play) cable that came with your UPS.  This cable should come"
 echo "  with all APC Backups Pro, Smart-Ups, and Matrix-Ups systems."
only in patch2:
unchanged:
--- genpower-1.0.5.orig/debian/rules
+++ genpower-1.0.5/debian/rules
@@ -20,7 +20,7 @@
 
 build:
 # Builds the binary package.
-	make CFLAGS='-O2 -g -fomit-frame-pointer -DNEWINIT' all
+	make CFLAGS='-O2 -g -fomit-frame-pointer' all
 	touch stamp-build
 
 clean:

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to