Bug#736040: prima: diff for NMU version 1.28-1.3

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Bug#736040: prima: diff for NMU version 1.28-1.3

Tobias Frost-3
tags 736040 + patch
tags 736040 + pending
tags 752805 + pending
thanks

Dear maintainer,

I've prepared an NMU for prima (versioned as 1.28-1.3) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u prima-1.28/debian/changelog prima-1.28/debian/changelog
--- prima-1.28/debian/changelog
+++ prima-1.28/debian/changelog
@@ -1,3 +1,12 @@
+prima (1.28-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not hardcode /usr/lib/perl5 (Closes: #752805), taking the patch from the
+    BTS (authored by Gregor Herrmann)
+  * Do not B-D on libtiff4-dev, but on libtiff-dev (Closes: #736040)
+
+ -- Tobias Frost <[hidden email]>  Sat, 02 Aug 2014 17:03:18 +0200
+
 prima (1.28-1.2) unstable; urgency=medium
 
   * Non-maintainer upload. Announced with this bug: (Closes: #734974)
diff -u prima-1.28/debian/control prima-1.28/debian/control
--- prima-1.28/debian/control
+++ prima-1.28/debian/control
@@ -2,7 +2,7 @@
 Section: perl
 Priority: extra
 Maintainer: Bas Zoetekouw <[hidden email]>
-Build-Depends:
+Build-Depends:
  debhelper (>= 5),
  perl (>= 5.8),
  libx11-dev,
@@ -14,7 +14,7 @@
  libpng-dev,
  libxpm-dev,
  libjpeg-dev,
- libtiff4-dev
+ libtiff-dev
 Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/Prima/
 
diff -u prima-1.28/debian/rules prima-1.28/debian/rules
--- prima-1.28/debian/rules
+++ prima-1.28/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 DEST = $(CURDIR)/debian/libprima-perl
+VENDORARCH := $(shell perl -MConfig -e 'print substr($$Config{vendorarch}, 1)')
+SITEARCH   := $(shell perl -MConfig -e 'print substr($$Config{sitearch}, 5)')
 
 ifneq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
   PARALLEL = -j$(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -64,21 +66,21 @@
  # Fix the messed up paths
  #
  cd $(DEST) && \
- mkdir -p usr/share/doc/prima usr/lib/perl5 usr/share/perl5/Prima/VB  && \
- mv local/lib/perl/*/Prima/*.pod     usr/share/perl5/Prima/           && \
- mv local/lib/perl/*/Prima/*.gif     usr/share/perl5/Prima/           && \
- mv local/lib/perl/*/Prima/VB/*.gif  usr/share/perl5/Prima/VB/        && \
- mv local/lib/perl/*/*               usr/lib/perl5/                   && \
+ mkdir -p usr/share/doc/prima $(VENDORARCH) usr/share/perl5/Prima/VB  && \
+ mv $(SITEARCH)/Prima/*.pod     usr/share/perl5/Prima/                && \
+ mv $(SITEARCH)/Prima/*.gif     usr/share/perl5/Prima/                && \
+ mv $(SITEARCH)/Prima/VB/*.gif  usr/share/perl5/Prima/VB/             && \
+ mv $(SITEARCH)/*               $(VENDORARCH)/                        && \
  mv bin                              usr/                             && \
- mv usr/lib/perl5/man                usr/share/                       && \
- mv usr/lib/perl5/Prima/tutorial     usr/share/doc/prima/             && \
- mv usr/lib/perl5/Prima/examples     usr/share/doc/prima/             && \
- mv usr/lib/perl5/Prima/VB/examples  usr/share/doc/prima/examples/VB
+ mv $(VENDORARCH)/man                usr/share/                       && \
+ mv $(VENDORARCH)/Prima/tutorial     usr/share/doc/prima/             && \
+ mv $(VENDORARCH)/Prima/examples     usr/share/doc/prima/             && \
+ mv $(VENDORARCH)/Prima/VB/examples  usr/share/doc/prima/examples/VB
 
  cd $(DEST) && \
- rmdir local/lib/perl/* local/lib/perl local/lib/ local/              && \
- rm usr/lib/perl5/auto/Prima/.packlist                                && \
- rm -r usr/lib/perl5/Prima/sys/win32
+ rmdir --ignore-fail-on-non-empty --parents $(SITEARCH)               && \
+ rm $(VENDORARCH)/auto/Prima/.packlist                                && \
+ rm -r $(VENDORARCH)/Prima/sys/win32
 
  #######################################################################
  # Fix overly generic names of binaries


--
To UNSUBSCRIBE, email to [hidden email]
with a subject of "unsubscribe". Trouble? Contact [hidden email]

Reply | Threaded
Open this post in threaded view
|

Processed: prima: diff for NMU version 1.28-1.3

Debian Bug Tracking System
Processing commands for [hidden email]:

> tags 736040 + patch
Bug #736040 [src:prima] please build-depend on libtiff-dev, not libtiff4-dev
Added tag(s) patch.
> tags 736040 + pending
Bug #736040 [src:prima] please build-depend on libtiff-dev, not libtiff4-dev
Added tag(s) pending.
> tags 752805 + pending
Bug #752805 [src:prima] prima: hardcodes /usr/lib/perl5
Added tag(s) pending.
> thanks
Stopping processing here.

Please contact me if you need assistance.
--
736040: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736040
752805: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752805
Debian Bug Tracking System
Contact [hidden email] with problems


--
To UNSUBSCRIBE, email to [hidden email]
with a subject of "unsubscribe". Trouble? Contact [hidden email]