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

Re: Bug#310077: glui: Wrong package name in control file.



This bug has been fixed in an NMU I uploaded a short while ago.  The
final diff is as detailed below.

The changes are the same as in Torsten's last patch, but I've
corrected the problems with the discrepancies between debian/control
and debian/control.in by merging the changes (incorrectly) made to
control some time in the past back into control.in.  This was
necessary in order to fix cleanly.

Release Team: please could you approve this for sarge?  It could
equally be removed, since I can't see any packages actually using it.


Regards,
Roger



--- glui.orig/glui-2.2/debian/control.in	2005-05-23 20:51:58.014040024 +0100
+++ glui.new/glui-2.2/debian/control.in	2005-05-23 20:58:17.106409224 +0100
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Marcelo E. Magallon <mmagallo@debian.org>
-Standards-Version: 3.5.6
-Build-Depends: libstdc++-dev, glutg3-dev, debhelper (>= 3)
+Standards-Version: 3.6.1
+Build-Depends: libstdc++-dev, glutg3-dev, debhelper (>= 4), g++ (>= 2:3.2)
 
 Package: libglui-dev
 Architecture: any
-Depends: libglui%MAJOR% (= ${Source-Version}), libstdc++-dev, glutg3-dev
+Depends: libglui%MAJOR%c102 (= ${Source-Version}), libstdc++-dev, glutg3-dev
 Description: A GLUT-based C++ user interface library
  GLUI provides controls such as buttons, checkboxes, radio buttons, and
  spinners to OpenGL applications.  It is window-system independent, relying
@@ -38,8 +38,9 @@
   - Controls can be grouped into columns
   - User can cycle through controls using Tab key
 
-Package: libglui%MAJOR%
+Package: libglui%MAJOR%c102
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libglui2
 Description: GLUI, a C++ GLUT based GUI library - runtime support
  For a complete description of GLUI please see the libglui-dev package
--- glui.orig/glui-2.2/debian/control	2005-05-23 20:51:58.014040024 +0100
+++ glui.new/glui-2.2/debian/control	2005-05-23 20:58:40.807806064 +0100
@@ -9,7 +9,7 @@
 Architecture: any
 Depends: libglui2c102 (= ${Source-Version}), libstdc++-dev, glutg3-dev
 Description: A GLUT-based C++ user interface library
- GLUI provides controls such as buttons, check boxes, radio buttons, and
+ GLUI provides controls such as buttons, checkboxes, radio buttons, and
  spinners to OpenGL applications.  It is window-system independent, relying
  on GLUT to handle all system-dependent issues, such as window and mouse
  management. Features of the GLUI User Interface Library include:
@@ -19,7 +19,7 @@
   - Support for multiple user interface windows
   - Standard user interface controls such as:
        - Buttons
-       - Check boxes for boolean variables
+       - Checkboxes for boolean variables
        - Radio Buttons for mutually-exclusive options
        - Editable text boxes for inputting text, integers, and floating-point
          values
@@ -39,8 +39,8 @@
   - User can cycle through controls using Tab key
 
 Package: libglui2c102
-Conflicts: libglui2
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libglui2
 Description: GLUI, a C++ GLUT based GUI library - runtime support
  For a complete description of GLUI please see the libglui-dev package
--- glui.orig/glui-2.2/debian/changelog	2005-05-23 20:51:58.013040176 +0100
+++ glui.new/glui-2.2/debian/changelog	2005-05-23 21:02:55.963016576 +0100
@@ -1,3 +1,14 @@
+glui (2.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Torsten Werner to correct package names in
+    debian/control.in (closes: bug#310077).
+  * Merge changes incorrectly made to debian/control back into
+    debian/control.in to prevent them being lost.
+  * Regenerate debian/control from debian/control.in.
+
+ -- Roger Leigh <rleigh@debian.org>  Mon, 23 May 2005 21:01:46 +0100
+
 glui (2.2-2) unstable; urgency=low
 
   * Makefile: VERSION = 2.2, thanks to Colin Macdonald (closes: bug#294068)

-- 
Roger Leigh
                Printing on GNU/Linux?  http://gimp-print.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.



Reply to: